Fix regex to recognize prerelease version string

github · Apr 17, 2024 · 5a5fc79 · 5a5fc79
1 parent 9926c81
commit 5a5fc79
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
@@ -491,14 +491,10 @@ private RestoreResult TryRestorePackageManually(string package, string? nugetCon
             if (!res.Success && tryPrereleaseVersion && res.HasNugetNoStablePackageVersionError)
             {
                 logger.LogDebug($"Failed to restore nuget package {package} because no stable version was found.");
-                try
-                {
-                    TryChangePackageVersion(tempDir.DirInfo, "*-*");
+                TryChangePackageVersion(tempDir.DirInfo, "*-*");
 
-                    res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true));
-                    return res;
-                }
-                finally
+                res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig, ForceReevaluation: true));
+                if (!res.Success)
                 {
                     TryChangePackageVersion(tempDir.DirInfo, "*");
                 }
@@ -729,7 +725,7 @@ private IEnumerable<string> GetFeeds(Func<IList<string>> getNugetFeeds)
         [GeneratedRegex(@"<TargetFramework>.*</TargetFramework>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex TargetFramework();
 
-        [GeneratedRegex(@"Version=""[*|*-*]""", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        [GeneratedRegex(@"Version=""(\*|\*-\*)""", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex PackageReferenceVersion();
 
         [GeneratedRegex(@"^(.+)\.(\d+\.\d+\.\d+(-(.+))?)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]