Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,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" />
Expand Down
2 changes: 2 additions & 0 deletions eng/testing/linker/project.csproj.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated;Microsoft.Extensions.Validation.Generated</InterceptorsPreviewNamespaces>
<!-- Ensure individual warnings are shown when publishing -->
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<!-- Should mitigate https://github.com/dotnet/aspnetcore/issues/61178 -->
<RestoreDisableParallel>true</RestoreDisableParallel>
{AdditionalProperties}
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion eng/testing/linker/trimmingTests.targets
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,10 @@
DependsOnTargets="GenerateProjects">

<MSBuild Projects="@(TestConsoleApps)"
BuildInParallel="false"
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"
Expand Down
Loading