From dfb2c6db0d42b79d78dd2e01ba1f1975675745b6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 23 Apr 2025 21:33:31 +0200
Subject: [PATCH 1/4] [release/9.0] Allow passing additional args to the
 source-build job (#15770)

---
 eng/common/core-templates/job/source-build.yml   | 2 ++
 eng/common/core-templates/steps/source-build.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index c4713c8b6ed..d47f09d58fd 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -26,6 +26,8 @@ parameters:
   #   Specifies the build script to invoke to perform the build in the repo. The default
   #   './build.sh' should work for typical Arcade repositories, but this is customizable for
   #   difficult situations.
+  # buildArguments: ''
+  #   Specifies additional build arguments to pass to the build script.
   # jobProperties: {}
   #   A list of job properties to inject at the top level, for potential extensibility beyond
   #   container and pool.
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 2915d29bb7f..37133b55b75 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -79,6 +79,7 @@ steps:
     ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
       --configuration $buildConfig \
       --restore --build --pack $publishArgs -bl \
+      ${{ parameters.platform.buildArguments }} \
       $officialBuildArgs \
       $internalRuntimeDownloadArgs \
       $internalRestoreArgs \

From bfbc858ba868b60fffaf7b2150f1d2165b01e786 Mon Sep 17 00:00:00 2001
From: Missy Messa <47990216+missymessa@users.noreply.github.com>
Date: Fri, 25 Apr 2025 11:45:16 -0700
Subject: [PATCH 2/4] Update Source Indexer version (#15783)

---
 eng/common/core-templates/job/source-index-stage1.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
index 205fb5b3a39..8b833332b3e 100644
--- a/eng/common/core-templates/job/source-index-stage1.yml
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -1,7 +1,7 @@
 parameters:
   runAsPublic: false
-  sourceIndexUploadPackageVersion: 2.0.0-20240522.1
-  sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
+  sourceIndexUploadPackageVersion: 2.0.0-20250425.2
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []

From dba26274ff5a0906a1880443fc3c0466d1a298ae Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 5 May 2025 19:28:15 +0200
Subject: [PATCH 3/4] [release/9.0] Allow disabling SB intermediate restore and
 prebuilt reporting (#15810)

---
 .../tools/SourceBuild/AfterSourceBuild.proj   |  2 ++
 .../SourceBuildArcadeTools.targets            | 20 ++++++++++++-------
 .../tools/Tools.proj                          |  3 +--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
index 6a1fd449dc3..fea978709a5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
@@ -7,6 +7,7 @@
 
   <PropertyGroup>
     <MicrosoftDotNetSourceBuildTasksBuildDir>$(NuGetPackageRoot)microsoft.dotnet.sourcebuild.tasks\$(MicrosoftDotNetSourceBuildTasksVersion)\build\</MicrosoftDotNetSourceBuildTasksBuildDir>
+    <ReportPrebuiltUsage Condition="'$(ReportPrebuiltUsage)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</ReportPrebuiltUsage>
   </PropertyGroup>
 
   <Import Project="$(MicrosoftDotNetSourceBuildTasksBuildDir)Microsoft.DotNet.SourceBuild.Tasks.props" />
@@ -62,6 +63,7 @@
   </Target>
 
   <Target Name="ReportPrebuiltUsage"
+          Condition="'$(ReportPrebuiltUsage)' == 'true'"
           DependsOnTargets="WritePrebuiltUsageData">
     <PropertyGroup>
       <FailOnPrebuiltBaselineError Condition="'$(FailOnPrebuiltBaselineError)' == ''">true</FailOnPrebuiltBaselineError>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets
index ed8e7dfe820..fedd7157a5b 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeTools.targets
@@ -11,6 +11,10 @@
     <PackageReference Include="Microsoft.DotNet.SourceBuild.Tasks" Version="$(MicrosoftDotNetSourceBuildTasksVersion)" IsImplicitlyDefined="true" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <SetUpSourceBuildIntermediateNupkgCache Condition="'$(SetUpSourceBuildIntermediateNupkgCache)' == ''">true</SetUpSourceBuildIntermediateNupkgCache>
+  </PropertyGroup>
+
   <!-- Because the condition here is rather complex, it should read as the following:
       - Don't collect intermediates if running the product build
       - Otherwise, collect if we're forcing it using SetUpSourceBuildIntermediateNupkgCache
@@ -19,9 +23,10 @@
         - Building in DotNetBuild mode and we're in the inner repo and this is a source-only build -->
   <Target Name="CollectSourceBuildIntermediateNupkgDependencies"
           Condition="
-            '$(DotNetBuildFromSourceFlavor)' != 'Product' and '$(DotNetBuildOrchestrator)' != 'true' and
-            ('$(SetUpSourceBuildIntermediateNupkgCache)' == 'true' or
-            ('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' == 'true') or
+            '$(DotNetBuildFromSourceFlavor)' != 'Product' and
+            '$(DotNetBuildOrchestrator)' != 'true' and
+            '$(SetUpSourceBuildIntermediateNupkgCache)' == 'true' and
+            (('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' == 'true') or
             ('$(DotNetBuildPhase)' == 'InnerRepo' and '$(DotNetBuildSourceOnly)' == 'true'))"
           DependsOnTargets="GetSourceBuildIntermediateNupkgNameConvention"
           BeforeTargets="CollectPackageReferences">
@@ -45,11 +50,12 @@
          - If building in DotNetBuild mode and we're in the inner repo and this is a source-only build -->
   <Target Name="SetUpSourceBuildIntermediateNupkgCache"
           Condition="
-            '$(DotNetBuildFromSourceFlavor)' != 'Product' and '$(DotNetBuildOrchestrator)' != 'true' and
-            ('$(SetUpSourceBuildIntermediateNupkgCache)' == 'true' or
-              ('@(SourceBuildIntermediateNupkgReference)' != '' and
+            '$(DotNetBuildFromSourceFlavor)' != 'Product' and
+            '$(DotNetBuildOrchestrator)' != 'true' and
+            '$(SetUpSourceBuildIntermediateNupkgCache)' == 'true' and
+            '@(SourceBuildIntermediateNupkgReference)' != '' and
                 (('$(ArcadeBuildFromSource)' == 'true' and '$(ArcadeInnerBuildFromSource)' == 'true') or
-                 ('$(DotNetBuildPhase)' == 'InnerRepo' and '$(DotNetBuildSourceOnly)' == 'true'))))"
+                 ('$(DotNetBuildPhase)' == 'InnerRepo' and '$(DotNetBuildSourceOnly)' == 'true'))"
           AfterTargets="Restore">
     <ItemGroup>
       <IntermediateNupkgSourceDir Include="$([MSBuild]::NormalizeDirectory(
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
index 345ee92f6dd..eac5b776507 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
@@ -93,8 +93,7 @@
   </Target>
 
   <Import Project="SourceBuild/SourceBuildArcadeTools.targets" Condition="'$(ArcadeBuildFromSource)' == 'true' or
-                                                                          '$(DotNetBuildRepo)' == 'true' or
-                                                                          '$(SetUpSourceBuildIntermediateNupkgCache)' == 'true'" />
+                                                                          '$(DotNetBuildRepo)' == 'true'" />
 
   <!-- Repository extensibility point -->
   <Import Project="$(RepositoryEngineeringDir)Tools.props" Condition="Exists('$(RepositoryEngineeringDir)Tools.props')" />

From 1cfa39f82d00b3659a3d367bc344241946e10681 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 15:45:43 -0700
Subject: [PATCH 4/4] [release/9.0] Update NuGetRepack to only update version
 of dependencies from the build (#15811)

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 <jorobich@microsoft.com>
---
 .../tasks/src/NuGetVersionUpdater.cs          |  14 +++++++++--
 .../Microsoft.DotNet.NuGetRepack.Tests.csproj |   9 +++++++
 .../tests/ReplacePackagePartsTests.cs         |   2 +-
 .../TestPackageG.1.0.0-beta-12345-01.nupkg    | Bin 0 -> 1812 bytes
 .../TestPackageG.1.0.0-beta-final.nupkg       | Bin 0 -> 1813 bytes
 .../tests/Resources/TestPackageG.1.0.0.nupkg  | Bin 0 -> 1799 bytes
 .../tests/Resources/TestPackageG.nuspec       |  23 ++++++++++++++++++
 .../tests/TestHelpers/TestResources.cs        |  12 +++++++++
 .../tests/VersionUpdaterTests.cs              |  21 ++++++++++------
 9 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-12345-01.nupkg
 create mode 100644 src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0-beta-final.nupkg
 create mode 100644 src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.1.0.0.nupkg
 create mode 100644 src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.nuspec

diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs
index e2dc7c007f4..bd92f54d76d 100644
--- 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
index 3eb2b0b7530..c202f2e3d6a 100644
--- 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
index c03085f75c2..028607aa751 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..6b91e8ff943b8f7994a57488975019b12ab20c51
GIT binary patch
literal 1812
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
KdhrM=hz9_uYv^SF

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..058ec8927ea178dd0e828a5444d9e85163c80389
GIT binary patch
literal 1813
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
K=*6R~ARYjG$K-eb

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..9649e2aad78e64dad9f66b5b36ec0fd078ac657c
GIT binary patch
literal 1799
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

literal 0
HcmV?d00001

diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageG.nuspec
new file mode 100644
index 00000000000..cda5c56f403
--- /dev/null
+++ 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
index 82ef8e8fe9d..5f6aa2d08da 100644
--- 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
index 900c55775a1..d4d76da2883 100644
--- 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());