dependabot-nuget 0.361.2 → 0.362.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c411faba9d94582218dd8fea9921fb6a751deac6bcf3ad1fdfe5e91dac29ef
-  data.tar.gz: 9a2bb899e293e1bf5706645bc7dc7acf770c4f266b7adb82e4f292bc723307ff
+  metadata.gz: d0ffb6a9bd24802888ecd885336ebc5b54e10b351dd9af39b37ac76ba3cde4ca
+  data.tar.gz: b623440d284b905846bfde41dd41f8b189964cbb048769c5d0d1926a3541e322
 SHA512:
-  metadata.gz: f8a307f7b223fbac2dced0d2945f643bba1e76b1efd637b5fe031d6ac8f12c1d57f0e4f9d5b076617957f8e6cba0702f5889c5c421f8c1620d4914fc317896ef
-  data.tar.gz: c41af6129c806d282c92c300d62d29581a46c40ac812df0b5b26c3e691f6a935b37a74392d764caec8608f3c807b1968cfaa4d5fe6e23b6289fa9d601d419b9e
+  metadata.gz: db7e141cd27b415270816c892fdc7cb78de228701a861ab1b7d4e2eae5581fb0325ae1fa7149587e7f14666d8e424d09586080f0b95cc655f1ec408d140314b0
+  data.tar.gz: 4c97e20a7ef7ee48aa2d2701bc11dae853f2c5a513d1f9c4c45590cac77cce963f6a8e0170bafd6bfed74669b2ba58db820984384512f38a50111fcaf0a40955

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/FileWriters/XmlFileWriter.cs

@@ -611,7 +611,61 @@ public class XmlFileWriter : IFileWriter
         // e.g., "[2.0.0, )" => "2.0.0"
         if (newRange.MaxVersion is null)
         {
-            return requiredVersion.ToString();
+            var requiredVersionString = requiredVersion.ToString();
+            var isWildcardVersion = existingRange.OriginalString?.Contains('*') == true;
+            if (isWildcardVersion)
+            {
+                var oldRangeParts = existingRange.OriginalString!.Split('.');
+                var newRangeParts = requiredVersion.ToFullString().Split('.');
+                var rebuiltParts = new List<string>();
+                for (int i = 0; i < oldRangeParts.Length; i++)
+                {
+                    if (oldRangeParts[i].Contains('*'))
+                    {
+                        var dashIndex = oldRangeParts[i].IndexOf('-');
+                        var starIndex = oldRangeParts[i].IndexOf('*');
+                        if (dashIndex >= 0 && dashIndex < starIndex)
+                        {
+                            // prerelease wildcard (e.g., "3-*")
+                            if (i < newRangeParts.Length)
+                            {
+                                var newDashIndex = newRangeParts[i].IndexOf('-');
+                                if (newDashIndex >= 0)
+                                {
+                                    var beforeDash = newRangeParts[i][..newDashIndex];
+                                    var fromDash = oldRangeParts[i][dashIndex..];
+                                    rebuiltParts.Add(beforeDash + fromDash);
+                                    rebuiltParts.AddRange(oldRangeParts.Skip(i + 1));
+                                }
+                                else
+                                {
+                                    // new version is stable, drop prerelease wildcard
+                                    rebuiltParts.Add(newRangeParts[i]);
+                                }
+                            }
+                            else
+                            {
+                                rebuiltParts.Add("0");
+                            }
+                        }
+                        else
+                        {
+                            // version wildcard (e.g., "*", "*-*", "*-preview*")
+                            rebuiltParts.AddRange(oldRangeParts.Skip(i));
+                        }
+
+                        break;
+                    }
+                    else
+                    {
+                        rebuiltParts.Add(i < newRangeParts.Length ? newRangeParts[i] : "0");
+                    }
+                }
+
+                requiredVersionString = string.Join(".", rebuiltParts);
+            }
+
+            return requiredVersionString;
         }
 
         return newRange.ToString();

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/FileWriterWorkerTests.cs

@@ -927,6 +927,52 @@ public class FileWriterWorkerTests : TestBase
         );
     }
 
+    [Fact]
+    public async Task EndToEnd_WildcardVersionShapeIsRetained()
+    {
+        await TestAsync(
+            dependencyName: "Some.Dependency",
+            oldDependencyVersion: "1.3.4",
+            newDependencyVersion: "2.5.6",
+            files: [
+                ("src/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.*" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("Directory.Build.props", "<Project />"),
+                ("Directory.Build.targets", "<Project />"),
+            ],
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Dependency", "1.3.4", "net9.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Dependency", "2.5.6", "net9.0"),
+            ],
+            discoveryWorker: null, // use real worker
+            dependencySolver: null, // use real worker
+            fileWriter: null, // use real worker
+            expectedFiles: [
+                ("src/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="2.*" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+            ],
+            expectedOperations: [
+                new DirectUpdate() { DependencyName = "Some.Dependency", NewVersion = NuGetVersion.Parse("2.5.6"), UpdatedFiles = ["/src/project.csproj"] }
+            ]
+        );
+    }
+
     private static async Task TestAsync(
         string dependencyName,
         string oldDependencyVersion,

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/XmlFileWriterTests.cs

@@ -361,7 +361,7 @@ public class XmlFileWriterTests : FileWriterTestsBase
                     <Project Sdk="Microsoft.NET.Sdk">
                       <ItemGroup>
                         <PackageReference Include="Ignored.Dependency" Version="7.0.0" />
-                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                        <PackageReference Include="Some.Dependency" Version="2.*" />
                         <PackageReference Include="Some.Other.Dependency" Version="8.0.0" />
                       </ItemGroup>
                     </Project>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/XmlFileWriterTests_CreateUpdatedVersionRangeTests.cs

@@ -12,11 +12,24 @@ public class XmlFileWriterTests_CreateUpdatedVersionRangeTests
     [InlineData("[1.0.0]", "1.0.0", "2.0.0", "[2.0.0]")] // single exact version
     [InlineData("[1.0.0, 3.0.0)", "1.0.0", "2.0.0", "[2.0.0, 3.0.0)")] // narrowing of range
     [InlineData("[1.0.0, 2.0.0)", "1.0.0", "2.0.0", "2.0.0")] // narrowing of range to simple version string
+    [InlineData("*", "1.0.1", "2.0.0", "*")] // wildcard is retained at major level
+    [InlineData("1.*", "1.0.1", "2.0.0", "2.*")] // wildcard is retained at minor level
+    [InlineData("1.0.*", "1.0.1", "2.0.0", "2.0.*")] // wildcard is retained at patch level
+    [InlineData("1.0.0.*", "1.0.1.0", "2.0.0", "2.0.0.*")] // wildcard is retained at revision level
+    [InlineData("1.0.0.*", "1.0.1", "2.0", "2.0.0.*")] // wildcard is retained at revision level with a shorter updated version
+    [InlineData("10.*-*", "10.0-beta1", "11.0-beta2", "11.*-*")] // wildcard with prerelease
+    [InlineData("10.*-preview*", "10.0-preview1", "11.0-preview4", "11.*-preview*")] // wildcard with specific prerelease
+    [InlineData("10.0.0-preview.*", "10.0.0-preview.1", "11.0.0-preview.2", "11.0.0-preview.*")] // wildcard in prerelease
+    [InlineData("1.2.3-*", "1.2.3-beta", "2.0.0-beta", "2.0.0-*")] // wildcard only in prerelease
+    [InlineData("1.2.3-*", "1.2.3-beta", "2.0.0", "2.0.0")] // wildcard in prerelease superseded by stable
     public void CreateUpdatedVersionRange(string existingRangeString, string existingVersionString, string newVersionString, string expectedNewRangeString)
     {
         var existingRange = VersionRange.Parse(existingRangeString);
         var existingVersion = NuGetVersion.Parse(existingVersionString);
         var newVersion = NuGetVersion.Parse(newVersionString);
+        var newRange = VersionRange.Parse(expectedNewRangeString);
+
+        Assert.True(newRange.Satisfies(newVersion));
 
         var actualNewRangeString = XmlFileWriter.CreateUpdatedVersionRangeString(existingRange, existingVersion, newVersion);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.361.2
+  version: 0.362.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.361.2
+        version: 0.362.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.361.2
+        version: 0.362.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -553,7 +553,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.361.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.362.0
 rdoc_options: []
 require_paths:
 - lib