From d1b998612c6b8830a1909096cc739a46d474054a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 17 Mar 2026 09:29:48 +0000
Subject: [PATCH 1/6] Initial plan


From 08a9e84f8403241387438ff54acdd5a05bc441f8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 17 Mar 2026 09:44:47 +0000
Subject: [PATCH 2/6] Enable UsingToolNuGetRepack to produce exact version
 dependencies for inter-package references

Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com>
---
 eng/Versions.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 73b9d71a37..5d6fcbf50a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,6 +5,8 @@
     <!-- Testing Platform version -->
     <TestingPlatformVersionPrefix>2.2.0</TestingPlatformVersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <!-- Repack NuGet packages to use exact version dependencies (see https://github.com/NuGet/Home/issues/7213) -->
+    <UsingToolNuGetRepack>true</UsingToolNuGetRepack>
   </PropertyGroup>
   <PropertyGroup Label="MSTest prod dependencies - darc updated">
     <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26163.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>

From 077350b4453c5f055f184f64966265179da67551 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 17 Mar 2026 12:40:08 +0000
Subject: [PATCH 3/6] Override PackageReleasePackages to split MTP and MSTest
 packages into separate repack batches

Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com>
---
 eng/AfterSolutionBuild.targets | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
index 967ec43137..14f1f425b5 100644
--- a/eng/AfterSolutionBuild.targets
+++ b/eng/AfterSolutionBuild.targets
@@ -4,4 +4,33 @@
     <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(RepositoryEngineeringDir)\verify-nupkgs.ps1 -configuration $(Configuration)" />
   </Target>
 
+  <!--
+    Override the Arcade SDK's PackageReleasePackages target (from BuildReleasePackages.targets) to split
+    packages into separate batches:
+    - MTP packages (Microsoft.Testing.*): use exact version dependencies for inter-package references (IVT safety)
+    - MSTest packages (MSTest.*): keep >= version dependencies on MTP to allow users to update independently
+    The UpdatePackageVersionTask only rewrites dependency versions for packages present in the same batch,
+    so MSTest packages' deps on MTP packages will remain as >= (since MTP is in a different batch).
+  -->
+  <Target Name="PackageReleasePackages" AfterTargets="Pack" Condition="'$(DotNetFinalVersionKind)' == ''">
+    <Message Text="Building release versions of NuGet packages (split batches for MTP vs MSTest)" Importance="high" />
+
+    <Error Text="PreReleaseVersionLabel must be non-empty when using NuGet Repack tool." Condition="'$(PreReleaseVersionLabel)' == ''" />
+
+    <ItemGroup>
+      <_MTPPackages Include="$(ArtifactsShippingPackagesDir)Microsoft.Testing.*.nupkg" />
+      <_MSTestPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" Exclude="@(_MTPPackages)" />
+    </ItemGroup>
+
+    <!-- MTP packages: force exact versions for inter-package references -->
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
+
+    <!-- MSTest packages: version translation only, MTP deps stay as >= (not in this batch) -->
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
+  </Target>
+
 </Project>

From 1bf2cbcb768f7fceb95df5f4759ed0ea67881262 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 17 Mar 2026 12:41:02 +0000
Subject: [PATCH 4/6] Clarify comment about ExactVersions behavior in split
 batch repack

Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com>
---
 eng/AfterSolutionBuild.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
index 14f1f425b5..e2dc73a3e6 100644
--- a/eng/AfterSolutionBuild.targets
+++ b/eng/AfterSolutionBuild.targets
@@ -27,7 +27,8 @@
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
 
-    <!-- MSTest packages: version translation only, MTP deps stay as >= (not in this batch) -->
+    <!-- MSTest packages: ExactVersions applies only to deps on other packages in this batch (MSTest-internal),
+         so MSTest deps on MTP packages remain as >= since MTP packages are in a separate batch above -->
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />

From 83d72b4b95712cbdcd1211fdd62484994407d341 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 17 Mar 2026 13:36:28 +0000
Subject: [PATCH 5/6] Replace PackageReleasePackages override with rename-based
 before/after targets

Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com>
---
 eng/AfterSolutionBuild.targets | 41 ++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
index e2dc73a3e6..a5da49724b 100644
--- a/eng/AfterSolutionBuild.targets
+++ b/eng/AfterSolutionBuild.targets
@@ -5,30 +5,33 @@
   </Target>
 
   <!--
-    Override the Arcade SDK's PackageReleasePackages target (from BuildReleasePackages.targets) to split
-    packages into separate batches:
-    - MTP packages (Microsoft.Testing.*): use exact version dependencies for inter-package references (IVT safety)
-    - MSTest packages (MSTest.*): keep >= version dependencies on MTP to allow users to update independently
-    The UpdatePackageVersionTask only rewrites dependency versions for packages present in the same batch,
-    so MSTest packages' deps on MTP packages will remain as >= (since MTP is in a different batch).
-  -->
-  <Target Name="PackageReleasePackages" AfterTargets="Pack" Condition="'$(DotNetFinalVersionKind)' == ''">
-    <Message Text="Building release versions of NuGet packages (split batches for MTP vs MSTest)" Importance="high" />
-
-    <Error Text="PreReleaseVersionLabel must be non-empty when using NuGet Repack tool." Condition="'$(PreReleaseVersionLabel)' == ''" />
+    Prevent the Arcade SDK's PackageReleasePackages target (from BuildReleasePackages.targets) from
+    applying exact version dependencies to MSTest packages' MTP references. MSTest packages should
+    keep >= deps on MTP to allow users to update MTP independently.
 
+    We temporarily rename MSTest packages before the Arcade target runs so they're excluded from
+    its *.nupkg glob, then restore and process them in a separate batch afterwards. Since
+    UpdatePackageVersionTask only rewrites deps for packages present in the same batch, MSTest deps
+    on MTP packages remain as >= while MSTest-internal deps still get exact versions.
+  -->
+  <Target Name="_HideMSTestPackagesBeforeRepack" BeforeTargets="PackageReleasePackages" Condition="'$(DotNetFinalVersionKind)' == ''">
     <ItemGroup>
-      <_MTPPackages Include="$(ArtifactsShippingPackagesDir)Microsoft.Testing.*.nupkg" />
-      <_MSTestPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" Exclude="@(_MTPPackages)" />
+      <_MSTestPackagesToHide Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg" />
     </ItemGroup>
+    <Move SourceFiles="@(_MSTestPackagesToHide)" DestinationFiles="@(_MSTestPackagesToHide->'%(FullPath).bak')" Condition="'@(_MSTestPackagesToHide)' != ''" />
+  </Target>
 
-    <!-- MTP packages: force exact versions for inter-package references -->
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MTPPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MTPPackages)' != ''" />
+  <Target Name="_RestoreAndProcessMSTestPackages" AfterTargets="PackageReleasePackages" Condition="'$(DotNetFinalVersionKind)' == ''">
+    <!-- Restore MSTest packages to their original names -->
+    <ItemGroup>
+      <_MSTestPackagesToRestore Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg.bak" />
+    </ItemGroup>
+    <Move SourceFiles="@(_MSTestPackagesToRestore)" DestinationFiles="@(_MSTestPackagesToRestore->'%(RootDir)%(Directory)%(Filename)')" Condition="'@(_MSTestPackagesToRestore)' != ''" />
 
-    <!-- MSTest packages: ExactVersions applies only to deps on other packages in this batch (MSTest-internal),
-         so MSTest deps on MTP packages remain as >= since MTP packages are in a separate batch above -->
+    <!-- Process MSTest packages in their own batch so deps on MTP stay as >= -->
+    <ItemGroup>
+      <_MSTestPackages Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg" />
+    </ItemGroup>
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
     <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />

From 89964515561b168e0eff9513dd44743dda7ce93b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 20 Mar 2026 08:59:24 +0000
Subject: [PATCH 6/6] Revert to 08a9e84: remove split batch workaround from
 AfterSolutionBuild.targets

Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/testfx/sessions/12b79f7e-4515-4738-a805-696144730fd4
---
 eng/AfterSolutionBuild.targets | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
index a5da49724b..967ec43137 100644
--- a/eng/AfterSolutionBuild.targets
+++ b/eng/AfterSolutionBuild.targets
@@ -4,37 +4,4 @@
     <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(RepositoryEngineeringDir)\verify-nupkgs.ps1 -configuration $(Configuration)" />
   </Target>
 
-  <!--
-    Prevent the Arcade SDK's PackageReleasePackages target (from BuildReleasePackages.targets) from
-    applying exact version dependencies to MSTest packages' MTP references. MSTest packages should
-    keep >= deps on MTP to allow users to update MTP independently.
-
-    We temporarily rename MSTest packages before the Arcade target runs so they're excluded from
-    its *.nupkg glob, then restore and process them in a separate batch afterwards. Since
-    UpdatePackageVersionTask only rewrites deps for packages present in the same batch, MSTest deps
-    on MTP packages remain as >= while MSTest-internal deps still get exact versions.
-  -->
-  <Target Name="_HideMSTestPackagesBeforeRepack" BeforeTargets="PackageReleasePackages" Condition="'$(DotNetFinalVersionKind)' == ''">
-    <ItemGroup>
-      <_MSTestPackagesToHide Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg" />
-    </ItemGroup>
-    <Move SourceFiles="@(_MSTestPackagesToHide)" DestinationFiles="@(_MSTestPackagesToHide->'%(FullPath).bak')" Condition="'@(_MSTestPackagesToHide)' != ''" />
-  </Target>
-
-  <Target Name="_RestoreAndProcessMSTestPackages" AfterTargets="PackageReleasePackages" Condition="'$(DotNetFinalVersionKind)' == ''">
-    <!-- Restore MSTest packages to their original names -->
-    <ItemGroup>
-      <_MSTestPackagesToRestore Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg.bak" />
-    </ItemGroup>
-    <Move SourceFiles="@(_MSTestPackagesToRestore)" DestinationFiles="@(_MSTestPackagesToRestore->'%(RootDir)%(Directory)%(Filename)')" Condition="'@(_MSTestPackagesToRestore)' != ''" />
-
-    <!-- Process MSTest packages in their own batch so deps on MTP stay as >= -->
-    <ItemGroup>
-      <_MSTestPackages Include="$(ArtifactsShippingPackagesDir)MSTest.*.nupkg" />
-    </ItemGroup>
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_MSTestPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true" Condition="'@(_MSTestPackages)' != ''" />
-  </Target>
-
 </Project>