Skip to content

Commit 6502bfa

Browse files
committed
Disable parallel restore for BuildAfterTargetingPack projects (#65107)
* Revert "Disable parallel restore for Grpc JsonTranscoding (#65040)" This reverts commit d3f0774. * Disable parallel build for delayed build projects
1 parent 2687318 commit 6502bfa

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
Condition=" '$(DotNetBuildFromSource)' != 'true' "
4545
Returns="@(TargetPathWithTargetPlatformMoniker)">
4646
<MSBuild Projects="@(RequiresDelayedBuild)"
47-
BuildInParallel="$(BuildInParallel)"
48-
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
47+
BuildInParallel="false"
48+
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreDisableParallel=true"
4949
Targets="Restore" />
5050
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Build">
5151
<Output TaskParameter="TargetOutputs" ItemName="TargetPathWithTargetPlatformMoniker" />

src/Framework/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport/src/Microsoft.Internal.Aspnetcore.DotNetApiDocs.Transport.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
<BuildHelixPayload>false</BuildHelixPayload>
1717
<EnablePackageValidation>false</EnablePackageValidation>
18-
<!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
19-
<RestoreDisableParallel>true</RestoreDisableParallel>
2018
</PropertyGroup>
2119

2220
<ItemGroup>

src/Grpc/JsonTranscoding/Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<!-- Required because Swashbuckle.AspNetCore uses shared runtime -->
99
<UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
1010

11-
<!-- Work around https://github.com/dotnet/aspnetcore/issues/61178 -->
12-
<RestoreDisableParallel>true</RestoreDisableParallel>
13-
1411
<!-- Workaround lack of Linux MUSL x64 support. -->
1512
<ExcludeFromBuild
1613
Condition=" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' == 'x64' ">true</ExcludeFromBuild>

0 commit comments

Comments
 (0)