refactor(nuget): Support skip-version during extract (renovatebot#3…

…3437)
ssams · Jan 8, 2025 · c043653 · c043653
1 parent 351d9ef
commit c043653
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 14 deletions.
diff --git a/lib/modules/manager/nuget/__fixtures__/sample.csproj b/lib/modules/manager/nuget/__fixtures__/sample.csproj
@@ -10,6 +10,7 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Version="1.2.3" />
     <PackageReference Include="Autofac" Version="4.5.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.2" />

diff --git a/lib/modules/manager/nuget/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/nuget/__snapshots__/extract.spec.ts.snap
@@ -14,6 +14,43 @@ exports[`modules/manager/nuget/extract extractPackageFile() extracts all depende
     "depName": "Microsoft.VisualStudio.Web.CodeGeneration.Tools",
     "depType": "nuget",
   },
+  {
+    "currentValue": "undefined",
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable2",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable1",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
   {
     "currentValue": "1.2.3",
     "datasource": "nuget",
@@ -115,6 +152,36 @@ exports[`modules/manager/nuget/extract extractPackageFile() extracts all depende
     "depName": "Microsoft.VisualStudio.Web.CodeGeneration.Tools",
     "depType": "nuget",
   },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable3",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable2",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
+  {
+    "datasource": "nuget",
+    "depName": "NotUpdatable1",
+    "depType": "nuget",
+    "skipReason": "invalid-version",
+  },
   {
     "currentValue": "1.2.3",
     "datasource": "nuget",

diff --git a/lib/modules/manager/nuget/extract.spec.ts b/lib/modules/manager/nuget/extract.spec.ts
@@ -57,7 +57,7 @@ describe('modules/manager/nuget/extract', () => {
       const sample = Fixtures.get(packageFile);
       const res = await extractPackageFile(sample, packageFile, config);
       expect(res?.deps).toMatchSnapshot();
-      expect(res?.deps).toHaveLength(17);
+      expect(res?.deps).toHaveLength(23);
     });
 
     it('extracts msbuild sdk from the Sdk attr of Project element', async () => {
@@ -157,7 +157,7 @@ describe('modules/manager/nuget/extract', () => {
       const sample = Fixtures.get(packageFile);
       const res = await extractPackageFile(sample, packageFile, config);
       expect(res?.deps).toMatchSnapshot();
-      expect(res?.deps).toHaveLength(17);
+      expect(res?.deps).toHaveLength(22);
     });
 
     it('extracts ContainerBaseImage', async () => {

diff --git a/lib/modules/manager/nuget/extract.ts b/lib/modules/manager/nuget/extract.ts
@@ -28,7 +28,7 @@ import { applyRegistries, findVersion, getConfiguredRegistries } from './util';
  * so we don't include it in the extracting regexp
  */
 const checkVersion = regEx(
-  `^\\s*(?:[[])?(?:(?<currentValue>[^"(,[\\]]+)\\s*(?:,\\s*[)\\]]|])?)\\s*$`,
+  /^\s*(?:[[])?(?:(?<currentValue>[^"(,[\]]+)\s*(?:,\s*[)\]]|])?)\s*$/,
 );
 const elemNames = new Set([
   'PackageReference',
@@ -58,23 +58,38 @@ function extractDepsFromXml(xmlNode: XmlDocument): NugetPackageDependency[] {
 
     if (elemNames.has(name)) {
       const depName = attr?.Include || attr?.Update;
-      const version =
+      if (!depName) {
+        continue;
+      }
+
+      const dep: NugetPackageDependency = {
+        datasource: NugetDatasource.id,
+        depType: 'nuget',
+        depName,
+      };
+
+      let currentValue: string | undefined =
         attr?.Version ??
         attr?.version ??
         child.valueWithPath('Version') ??
         attr?.VersionOverride ??
         child.valueWithPath('VersionOverride');
-      const currentValue = is.nonEmptyStringAndNotWhitespace(version)
-        ? checkVersion.exec(version)?.groups?.currentValue?.trim()
-        : undefined;
-      if (depName && currentValue) {
-        results.push({
-          datasource: NugetDatasource.id,
-          depType: 'nuget',
-          depName,
-          currentValue,
-        });
+
+      if (!is.nonEmptyStringAndNotWhitespace(currentValue)) {
+        dep.skipReason = 'invalid-version';
       }
+
+      currentValue = checkVersion
+        .exec(currentValue)
+        ?.groups?.currentValue?.trim();
+
+      if (currentValue) {
+        dep.currentValue = currentValue;
+      } else {
+        dep.skipReason = 'invalid-version';
+      }
+
+      results.push(dep);
     } else if (name === 'Sdk') {
       const depName = attr?.Name;
       const version = attr?.Version;