From 59b298c0a2a8f902101913f813895abd3a7ac12e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 13 Jan 2026 09:14:52 -0800
Subject: [PATCH 1/3] Disable parallel restore for Grpc JsonTranscoding

---
 src/Grpc/JsonTranscoding/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Grpc/JsonTranscoding/Directory.Build.props b/src/Grpc/JsonTranscoding/Directory.Build.props
index 0d223bf7fb95..8cb782411996 100644
--- a/src/Grpc/JsonTranscoding/Directory.Build.props
+++ b/src/Grpc/JsonTranscoding/Directory.Build.props
@@ -8,6 +8,9 @@
     <!-- Required because Swashbuckle.AspNetCore uses shared runtime -->
     <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
 
+    <!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
+    <RestoreDisableParallel>true</RestoreDisableParallel>
+
     <!-- Workaround lack of Linux MUSL x64 support. -->
     <ExcludeFromBuild
         Condition=" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' == 'x64' ">true</ExcludeFromBuild>

From 14461a499fb8818ae8ae1c6fc5347c7ab789c9f0 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 13 Jan 2026 18:22:06 -0800
Subject: [PATCH 2/3] Update
 Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj

---
 ...Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj b/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
index 0fc86ce5f0f8..d4e45be41ba8 100644
--- a/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
+++ b/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
@@ -15,6 +15,8 @@
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
     <BuildHelixPayload>false</BuildHelixPayload>
     <EnablePackageValidation>false</EnablePackageValidation>
+    <!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
+    <RestoreDisableParallel>true</RestoreDisableParallel>
   </PropertyGroup>
 
   <ItemGroup>

From c13e10869757950328f4dde1029ea133f5a0bdc1 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 16 Jan 2026 17:53:58 -0800
Subject: [PATCH 3/3] Disable parallel restore for BuildAfterTargetingPack
 projects (#65107)

* Revert "Disable parallel restore for Grpc JsonTranscoding (#65040)"

This reverts commit d3f0774d2e9a7bdbd6e4d3de2b7f683483804a4e.

* Disable parallel build for delayed build projects
---
 src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj    | 4 ++--
 ...crosoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj | 2 --
 src/Grpc/JsonTranscoding/Directory.Build.props                | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index c7d6da260af9..ffb0350cd669 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -44,8 +44,8 @@
       Condition=" '$(DotNetBuild)' != 'true' "
       Returns="@(TargetPathWithTargetPlatformMoniker)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
-        BuildInParallel="$(BuildInParallel)"
-        Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
+        BuildInParallel="false"
+        Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreDisableParallel=true"
         Targets="Restore" />
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Build">
       <Output TaskParameter="TargetOutputs" ItemName="TargetPathWithTargetPlatformMoniker" />
diff --git a/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj b/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
index d4e45be41ba8..0fc86ce5f0f8 100644
--- a/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
+++ b/src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj
@@ -15,8 +15,6 @@
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
     <BuildHelixPayload>false</BuildHelixPayload>
     <EnablePackageValidation>false</EnablePackageValidation>
-    <!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
-    <RestoreDisableParallel>true</RestoreDisableParallel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Grpc/JsonTranscoding/Directory.Build.props b/src/Grpc/JsonTranscoding/Directory.Build.props
index 8cb782411996..0d223bf7fb95 100644
--- a/src/Grpc/JsonTranscoding/Directory.Build.props
+++ b/src/Grpc/JsonTranscoding/Directory.Build.props
@@ -8,9 +8,6 @@
     <!-- Required because Swashbuckle.AspNetCore uses shared runtime -->
     <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
 
-    <!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
-    <RestoreDisableParallel>true</RestoreDisableParallel>
-
     <!-- Workaround lack of Linux MUSL x64 support. -->
     <ExcludeFromBuild
         Condition=" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' == 'x64' ">true</ExcludeFromBuild>