[release/9.0] Update NuGetRepack to only update version of dependencies from the build (#15811)

github-actions[bot] · JoeRobich · web-flow · commit 1cfa39f82d00 · 2025-05-05T15:45:43.000-07:00
Since merging roslyn-analyzers into the roslyn repo, Roslyn packages have been generated that include a dependency on Microsoft.CodeAnalysis.Analyzers (a roslyn-analyzer package) with the wrong version. The packages should depend on version 3.11.0 of the M.CA.Analyzers package but the nuspec is being rewritten to require a M.CA.Analyzers package from the same build. This behavior is due to NuGetRepack only using the package name to determine whether to update a dependency version. This PR additionally validates that the dependency version is from the current build prior to updating.

Co-authored-by: Joey Robichaud &lt;jorobich@microsoft.com&gt;
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs
@@ -240,7 +240,7 @@ private static void LoadPackages(IEnumerable<string> packagePaths, Dictionary<st
                     {
                         package.PackageProperties.Version = newPackageVersion.ToFullString();
                     }
-                    
+
                     packageInfo = new PackageInfo(package, packageId, packageVersion, newPackageVersion, tempPathOpt, nuspecStream, nuspecXml, nuspecXmlns);
                 }
                 finally
@@ -319,6 +319,16 @@ private static void UpdateDependencies(Dictionary<string, PackageInfo> packages,
                             throw new InvalidDataException($"Unexpected dependency version range: '{id}, {versionRangeAttribute.Value}'");
                         }
 
+                        var dependencyVersion = versionRange.MinVersion ?? versionRange.MaxVersion;
+                        var oldVersion = ToNuGetVersion(dependentPackage.OldVersion);
+
+                        if (dependencyVersion != oldVersion)
+                        {
+                            // The dependency version being referenced was not from
+                            // this build so it does not need to be updated.
+                            continue;
+                        }
+
                         var newVersion = ToNuGetVersion(dependentPackage.NewVersion);
 
                         var newRange = exactVersions ?
@@ -356,7 +366,7 @@ private static void SavePackages(Dictionary<string, PackageInfo> packages, strin
                 package.SpecificationXml.Save(package.SpecificationStream);
 
                 package.Package.Close();
-                
+
                 string finalPath = Path.Combine(outDirectory, package.Id + "." + package.NewVersion + ".nupkg");
 
                 try
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
@@ -29,6 +29,9 @@
     <EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.12345.1.nupkg">
       <LogicalName>TestPackageF.1.0.0-beta.12345.1.nupkg</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\TestPackageG.1.0.0-beta-12345-01.nupkg">
+      <LogicalName>TestPackageG.1.0.0-beta-12345-01.nupkg</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-final.nupkg">
       <LogicalName>TestPackageA.1.0.0-beta-final.nupkg</LogicalName>
     </EmbeddedResource>
@@ -47,6 +50,9 @@
     <EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.final.nupkg">
       <LogicalName>TestPackageF.1.0.0-beta.final.nupkg</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\TestPackageG.1.0.0-beta-final.nupkg">
+      <LogicalName>TestPackageG.1.0.0-beta-final.nupkg</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\TestPackageA.1.0.0.nupkg">
       <LogicalName>TestPackageA.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
@@ -65,6 +71,9 @@
     <EmbeddedResource Include="Resources\TestPackageF.1.0.0.nupkg">
       <LogicalName>TestPackageF.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\TestPackageG.1.0.0.nupkg">
+      <LogicalName>TestPackageG.1.0.0.nupkg</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Signed.1.2.3.nupkg">
       <LogicalName>Signed.1.2.3.nupkg</LogicalName>
     </EmbeddedResource>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs
@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Tests
 {
     public class ReplacePackagePartsTests
     {
-        [Fact(Skip = "https://github.com/dotnet/arcade/issues/3794")]
+        [Fact()]
         public static void ReplaceFile()
         {
             var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-12345-01.nupkg
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-final.nupkg
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0.nupkg
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>TestPackageG</id>
+    <version>1.0.0-beta-12345-01</version>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>G</description>
+    <dependencies>
+      <group targetFramework="portable-net45+win8">
+        <dependency id="TestPackageA" version="0.9.0-beta1" />
+        <dependency id="TestPackageB" version="[1.0.0-beta-12345-01,)" />
+        <dependency id="TestPackageC" version="(,1.0.0-beta-12345-01]" />
+      </group>
+      <group targetFramework="netstandard1.1">
+        <dependency id="TestPackageA" version="0.9.0-beta1" />
+        <dependency id="TestPackageB" version="1.0.0-beta-12345-01" />
+        <dependency id="TestPackageC" version="[0.9.0-beta1]" />
+      </group>
+    </dependencies>
+  </metadata>
+</package>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs
@@ -30,6 +30,10 @@ public static class ReleasePackages
         private static byte[] s_F;
         public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
         public const string NameF = nameof(TestPackageF) + "." + Version + ".nupkg";
+
+        private static byte[] s_G;
+        public static byte[] TestPackageG => ResourceLoader.GetOrCreateResource(ref s_G, NameG);
+        public const string NameG = nameof(TestPackageG) + "." + Version + ".nupkg";
     }
 
     public static class PreReleasePackages
@@ -60,6 +64,10 @@ public static class PreReleasePackages
         private static byte[] s_F;
         public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
         public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
+
+        private static byte[] s_G;
+        public static byte[] TestPackageG => ResourceLoader.GetOrCreateResource(ref s_G, NameG);
+        public const string NameG = nameof(TestPackageG) + "." + SemVer1 + ".nupkg";
     }
 
     public static class DailyBuildPackages
@@ -90,6 +98,10 @@ public static class DailyBuildPackages
         private static byte[] s_F;
         public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
         public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
+
+        private static byte[] s_G;
+        public static byte[] TestPackageG => ResourceLoader.GetOrCreateResource(ref s_G, NameG);
+        public const string NameG = nameof(TestPackageG) + "." + SemVer1 + ".nupkg";
     }
 
     public static class MiscPackages
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs
@@ -52,46 +52,51 @@ private static void AssertPackagesEqual(byte[] expected, byte[] actual)
         // change to match the platform that is executing. The reference packages that we use to validate
         // the SemVer tests were built on Windows which makes these test only valid for Windows.
         //
-        // This can be removed when https://github.com/dotnet/corefx/issues/39931 is fixed. 
-        [WindowsOnlyFact(Skip = "https://github.com/dotnet/arcade/issues/3794")]
+        // This can be removed when https://github.com/dotnet/corefx/issues/39931 is fixed.
+        [WindowsOnlyFact()]
         public void TestPackagesSemVer1()
         {
             var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
             Directory.CreateDirectory(dir);
 
-            string a_daily, b_daily, c_daily, d_daily;
+            string a_daily, b_daily, c_daily, d_daily, g_daily;
             File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.TestPackageA);
             File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB);
             File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.TestPackageC);
             File.WriteAllBytes(d_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameD), TestResources.DailyBuildPackages.TestPackageD);
+            File.WriteAllBytes(g_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameG), TestResources.DailyBuildPackages.TestPackageG);
 
             var a_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameA);
             var b_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameB);
             var c_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameC);
             var d_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameD);
+            var g_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameG);
 
             var a_rel = Path.Combine(dir, TestResources.ReleasePackages.NameA);
             var b_rel = Path.Combine(dir, TestResources.ReleasePackages.NameB);
             var c_rel = Path.Combine(dir, TestResources.ReleasePackages.NameC);
             var d_rel = Path.Combine(dir, TestResources.ReleasePackages.NameD);
+            var g_rel = Path.Combine(dir, TestResources.ReleasePackages.NameG);
 
-            NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.Release, exactVersions: false);
-            NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.PreRelease, exactVersions: false);
+            NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily, g_daily }, dir, VersionTranslation.Release, exactVersions: false);
+            NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily, g_daily }, dir, VersionTranslation.PreRelease, exactVersions: false);
 
             AssertPackagesEqual(TestResources.ReleasePackages.TestPackageA, File.ReadAllBytes(a_rel));
             AssertPackagesEqual(TestResources.ReleasePackages.TestPackageB, File.ReadAllBytes(b_rel));
             AssertPackagesEqual(TestResources.ReleasePackages.TestPackageC, File.ReadAllBytes(c_rel));
             AssertPackagesEqual(TestResources.ReleasePackages.TestPackageD, File.ReadAllBytes(d_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageG, File.ReadAllBytes(g_rel));
 
             AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageA, File.ReadAllBytes(a_pre));
             AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageB, File.ReadAllBytes(b_pre));
             AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageC, File.ReadAllBytes(c_pre));
             AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageD, File.ReadAllBytes(d_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageG, File.ReadAllBytes(g_pre));
 
             Directory.Delete(dir, recursive: true);
         }
 
-        [WindowsOnlyFact(Skip = "https://github.com/dotnet/arcade/issues/3794")]
+        [WindowsOnlyFact()]
         public void TestPackagesSemVer2()
         {
             var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
@@ -119,7 +124,7 @@ public void TestPackagesSemVer2()
             Directory.Delete(dir, recursive: true);
         }
 
-        [WindowsOnlyFact(Skip = "https://github.com/dotnet/arcade/issues/3794")]
+        [WindowsOnlyFact()]
         public void TestValidation()
         {
             var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
@@ -158,7 +163,7 @@ public void TestValidation()
             Directory.Delete(dir, recursive: true);
         }
 
-        [WindowsOnlyFact(Skip = "https://github.com/dotnet/arcade/issues/3794")]
+        [WindowsOnlyFact()]
         public void TestDotnetToolValidation()
         {
             var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Tests`
`12`	`12`	`{`
`13`	`13`	`public class ReplacePackagePartsTests`
`14`	`14`	`{`
`15`		`- [Fact(Skip = "https://github.com/dotnet/arcade/issues/3794")]`
	`15`	`+ [Fact()]`
`16`	`16`	`public static void ReplaceFile()`
`17`	`17`	`{`
`18`	`18`	`var dir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());`