From 94c7fada4a475121a921956ab7c7cea7fcff25d9 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 09:53:14 -0800
Subject: [PATCH 1/6] Disable parallel restore for linker tests

---
 eng/testing/linker/project.csproj.template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index ea368a6caa54..698bb897ec57 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -16,6 +16,8 @@
     <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
     <!-- Ensure individual warnings are shown when publishing -->
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
+    <!-- Should mitigate https://github.com/dotnet/dotnet/issues/4558 -->
+    <RestoreDisableParallel>true</RestoreDisableParallel>
     {AdditionalProperties}
   </PropertyGroup>
 

From e9e94cd2d6933baff4ed2f41c5df1dfec353fbe6 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 09:59:00 -0800
Subject: [PATCH 2/6] Disable parallel restore for trimming tests

---
 eng/testing/linker/trimmingTests.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets
index 1018b14a641b..ddd2253f33e4 100644
--- a/eng/testing/linker/trimmingTests.targets
+++ b/eng/testing/linker/trimmingTests.targets
@@ -105,7 +105,7 @@
     <MSBuild Projects="@(TestConsoleApps)"
              Targets="Restore"
              Condition="'$(SkipTrimmingProjectsRestore)' != 'true'"
-             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());Configuration=$(Configuration)" />
+             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());Configuration=$(Configuration);RestoreDisableParallel=true" />
 
     <MSBuild Projects="@(TestConsoleApps)"
              Targets="Publish"

From 7f7bc237eaad81e5381e4da8ebdd922b72d3ba8e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 09:59:42 -0800
Subject: [PATCH 3/6] Update comment to reference new GitHub issue

---
 eng/testing/linker/project.csproj.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index 698bb897ec57..311125a47c43 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -16,7 +16,7 @@
     <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
     <!-- Ensure individual warnings are shown when publishing -->
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
-    <!-- Should mitigate https://github.com/dotnet/dotnet/issues/4558 -->
+    <!-- Should mitigate https://github.com/dotnet/aspnetcore/issues/61178 -->
     <RestoreDisableParallel>true</RestoreDisableParallel>
     {AdditionalProperties}
   </PropertyGroup>

From 1306fd81e4e788380ff7230a98b4508322e34d95 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 11:50:31 -0800
Subject: [PATCH 4/6] Add property group to disable parallel restore

Added a property group to disable parallel restore for trimming test projects to mitigate a specific issue.
---
 Directory.Build.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 499cf17df265..6b1c170c0258 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -95,6 +95,11 @@
      <DisableLogTaskParameterItemMetadata_Csc_References>$(TrimTaskParameters)</DisableLogTaskParameterItemMetadata_Csc_References>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IsTrimmingTestProject)' == 'true'">
+    <!-- Should mitigate https://github.com/dotnet/aspnetcore/issues/61178 -->
+    <RestoreDisableParallel>true</RestoreDisableParallel>
+  </PropertyGroup
+
   <Import Project="eng\QuarantinedTests.BeforeArcade.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\QuarantinedTests.AfterArcade.props" />

From fd96e597f124f6f9db1c1d5e5d933649ed704d23 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 11:53:32 -0800
Subject: [PATCH 5/6] Update PublishTrimmedProjects target for parallel build

---
 eng/testing/linker/trimmingTests.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets
index ddd2253f33e4..cd07fb6d43b4 100644
--- a/eng/testing/linker/trimmingTests.targets
+++ b/eng/testing/linker/trimmingTests.targets
@@ -103,6 +103,7 @@
           DependsOnTargets="GenerateProjects">
 
     <MSBuild Projects="@(TestConsoleApps)"
+             BuildInParallel="false"
              Targets="Restore"
              Condition="'$(SkipTrimmingProjectsRestore)' != 'true'"
              Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());Configuration=$(Configuration);RestoreDisableParallel=true" />

From dd680a240b5d1430edceb3db9c6a26e7cdfe9b84 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 9 Feb 2026 12:55:36 -0800
Subject: [PATCH 6/6] Fix closing tag for PropertyGroup in
 Directory.Build.props

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6b1c170c0258..996c2be9577b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -98,7 +98,7 @@
   <PropertyGroup Condition="'$(IsTrimmingTestProject)' == 'true'">
     <!-- Should mitigate https://github.com/dotnet/aspnetcore/issues/61178 -->
     <RestoreDisableParallel>true</RestoreDisableParallel>
-  </PropertyGroup
+  </PropertyGroup>
 
   <Import Project="eng\QuarantinedTests.BeforeArcade.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />