Skip to content
Snippets Groups Projects
Unverified Commit 7dbeccc4 authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix: don’t evaluate versions during extract (#7802)

parent 2e72efde
No related branches found
No related tags found
No related merge requests found
...@@ -154,7 +154,6 @@ Array [ ...@@ -154,7 +154,6 @@ Array [
"datasource": "nuget", "datasource": "nuget",
"depName": "Stateless", "depName": "Stateless",
"depType": "nuget", "depType": "nuget",
"skipReason": "not-a-version",
}, },
Object { Object {
"currentValue": "1.2.3", "currentValue": "1.2.3",
...@@ -183,51 +182,6 @@ Array [ ...@@ -183,51 +182,6 @@ Array [
] ]
`; `;
exports[`lib/manager/nuget/extract extractPackageFile() extracts package version dependency 1`] = `
Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
},
]
`;
exports[`lib/manager/nuget/extract extractPackageFile() extracts registry URLs independently 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
"registryUrls": Array [
"https://api.nuget.org/v3/index.json",
"https://example.org/one",
],
},
],
}
`;
exports[`lib/manager/nuget/extract extractPackageFile() extracts registry URLs independently 2`] = `
Object {
"deps": Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
"registryUrls": Array [
"https://api.nuget.org/v3/index.json",
"https://example.org/two",
],
},
],
}
`;
exports[`lib/manager/nuget/extract extractPackageFile() extracts all dependencies from global packages file 1`] = ` exports[`lib/manager/nuget/extract extractPackageFile() extracts all dependencies from global packages file 1`] = `
Array [ Array [
Object { Object {
...@@ -307,7 +261,6 @@ Array [ ...@@ -307,7 +261,6 @@ Array [
"datasource": "nuget", "datasource": "nuget",
"depName": "Stateless", "depName": "Stateless",
"depType": "nuget", "depType": "nuget",
"skipReason": "not-a-version",
}, },
Object { Object {
"currentValue": "1.2.3", "currentValue": "1.2.3",
...@@ -336,6 +289,51 @@ Array [ ...@@ -336,6 +289,51 @@ Array [
] ]
`; `;
exports[`lib/manager/nuget/extract extractPackageFile() extracts package version dependency 1`] = `
Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
},
]
`;
exports[`lib/manager/nuget/extract extractPackageFile() extracts registry URLs independently 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
"registryUrls": Array [
"https://api.nuget.org/v3/index.json",
"https://example.org/one",
],
},
],
}
`;
exports[`lib/manager/nuget/extract extractPackageFile() extracts registry URLs independently 2`] = `
Object {
"deps": Array [
Object {
"currentValue": "4.5.0",
"datasource": "nuget",
"depName": "Autofac",
"depType": "nuget",
"registryUrls": Array [
"https://api.nuget.org/v3/index.json",
"https://example.org/two",
],
},
],
}
`;
exports[`lib/manager/nuget/extract extractPackageFile() handles NuGet.config without package sources 1`] = ` exports[`lib/manager/nuget/extract extractPackageFile() handles NuGet.config without package sources 1`] = `
Object { Object {
"deps": Array [ "deps": Array [
......
import { XmlDocument } from 'xmldoc'; import { XmlDocument } from 'xmldoc';
import * as datasourceNuget from '../../datasource/nuget'; import * as datasourceNuget from '../../datasource/nuget';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { SkipReason } from '../../types';
import { get } from '../../versioning';
import * as semverVersioning from '../../versioning/semver';
import { ExtractConfig, PackageDependency, PackageFile } from '../common'; import { ExtractConfig, PackageDependency, PackageFile } from '../common';
import { DotnetToolsManifest } from './types'; import { DotnetToolsManifest } from './types';
import { determineRegistries } from './util'; import { determineRegistries } from './util';
...@@ -61,7 +58,6 @@ export async function extractPackageFile( ...@@ -61,7 +58,6 @@ export async function extractPackageFile(
config: ExtractConfig config: ExtractConfig
): Promise<PackageFile | null> { ): Promise<PackageFile | null> {
logger.trace({ packageFile }, 'nuget.extractPackageFile()'); logger.trace({ packageFile }, 'nuget.extractPackageFile()');
const versioning = get(config.versioning || semverVersioning.id);
const registries = await determineRegistries(packageFile, config.localDir); const registries = await determineRegistries(packageFile, config.localDir);
const registryUrls = registries const registryUrls = registries
...@@ -109,9 +105,6 @@ export async function extractPackageFile( ...@@ -109,9 +105,6 @@ export async function extractPackageFile(
deps = extractDepsFromXml(parsedXml).map((dep) => ({ deps = extractDepsFromXml(parsedXml).map((dep) => ({
...dep, ...dep,
...(registryUrls && { registryUrls }), ...(registryUrls && { registryUrls }),
...(!versioning.isVersion(dep.currentValue) && {
skipReason: SkipReason.NotAVersion,
}),
})); }));
return { deps }; return { deps };
} catch (err) { } catch (err) {
......
...@@ -18,13 +18,11 @@ Object { ...@@ -18,13 +18,11 @@ Object {
"currentValue": null, "currentValue": null,
"depName": "baz", "depName": "baz",
"depType": "dependencies", "depType": "dependencies",
"skipReason": "not-a-version",
}, },
Object { Object {
"currentValue": null, "currentValue": null,
"depName": "qux", "depName": "qux",
"depType": "dependencies", "depType": "dependencies",
"skipReason": "not-a-version",
}, },
Object { Object {
"currentValue": "^0.1", "currentValue": "^0.1",
......
import { safeLoad } from 'js-yaml'; import { safeLoad } from 'js-yaml';
import * as datasourceDart from '../../datasource/dart'; import * as datasourceDart from '../../datasource/dart';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { SkipReason } from '../../types';
import { PackageDependency, PackageFile } from '../common'; import { PackageDependency, PackageFile } from '../common';
function getDeps( function getDeps(
...@@ -31,9 +30,6 @@ function getDeps( ...@@ -31,9 +30,6 @@ function getDeps(
} }
const dep: PackageDependency = { ...preset, depName, currentValue }; const dep: PackageDependency = { ...preset, depName, currentValue };
if (!currentValue) {
dep.skipReason = SkipReason.NotAVersion;
}
return [...acc, dep]; return [...acc, dep];
}, []); }, []);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment