From f32b146b64ff9639675a40f7b6936c46edf83b4a Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 16 Jan 2026 15:52:23 -0800
Subject: [PATCH 1/2] Revert "Disable parallel restore for Grpc JsonTranscoding
 (#65040)"

This reverts commit d3f0774d2e9a7bdbd6e4d3de2b7f683483804a4e.
---
 ...icrosoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj | 2 --
 src/Grpc/JsonTranscoding/Directory.Build.props                 | 3 ---
 2 files changed, 5 deletions(-)

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 def3ee0deb22..893f274595e9 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>

From dd56b4922dc5f7fc87e84768f7c06906c6880b26 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 16 Jan 2026 15:58:41 -0800
Subject: [PATCH 2/2] Disable parallel build for delayed build projects

---
 src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index c3e857b0724e..98a332a1d4b2 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -49,8 +49,8 @@
       Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       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" />