Skip to content

Commit fb77dc3

Browse files
authored
Only apply DotNetBuildMT on core msbuild (#9230)
1 parent de49a15 commit fb77dc3

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎repo-projects/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@
111111

112112
<CommonArgs Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(CommonArgs) $(FlagParameterPrefix)ci</CommonArgs>
113113

114-
<!-- MSBuild's multi-threaded mode is opt-in for now, so it's off unless it's explicitly requested.
115-
Set DotNetBuildMT to explicitly opt in or out for all repo builds. -->
116-
<CommonArgs Condition="'$(DotNetBuildMT)' == 'true'">$(CommonArgs) $(FlagParameterPrefix)mt 1</CommonArgs>
117-
<CommonArgs Condition="'$(DotNetBuildMT)' == 'false'">$(CommonArgs) $(FlagParameterPrefix)mt 0</CommonArgs>
118-
119114
<!-- MSBuild node reuse is on by default for local builds and isn't used on CI.
120115
Set DotNetBuildNodeReuse to explicitly opt in or out for all repo builds. -->
121116
<CommonArgs Condition="'$(DotNetBuildNodeReuse)' == 'true'">$(CommonArgs) $(FlagParameterPrefix)nodeReuse 1</CommonArgs>

‎repo-projects/Directory.Build.targets‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<DiskUsageCommand Condition="'$(BuildOS)' == 'windows'">powershell -NoProfile "Get-PSDrive -PSProvider FileSystem -Name (Get-Item "$(RepoRoot.TrimEnd('\'))").PSDrive.Name"</DiskUsageCommand>
99
<DiskUsageCommand Condition="'$(BuildOS)' != 'windows'">df -h $(RepoRoot)</DiskUsageCommand>
1010

11-
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless ForceDotNetMSBuildEngine is explicitly set in the repo project. -->
12-
<CommonArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(CommonArgs) $(FlagParameterPrefix)msbuildEngine dotnet</CommonArgs>
13-
1411
<!-- Pass down configuration properties -->
1512
<CommonArgs Condition="'$(SkipSetTargetArchitecture)' != 'true'">$(CommonArgs) /p:TargetArchitecture=$(TargetArchitecture)</CommonArgs>
1613
<CommonArgs Condition="'$(SkipSetTargetOS)' != 'true'">$(CommonArgs) /p:TargetOS=$(TargetOS)</CommonArgs>
@@ -46,6 +43,16 @@
4643
<BuildArgs Condition="'$(EnableDefaultRidSpecificArtifacts)' == 'true'">$(BuildArgs) /p:AllowEmptySignList=true</BuildArgs>
4744
</PropertyGroup>
4845

46+
<PropertyGroup>
47+
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless ForceDotNetMSBuildEngine is explicitly set in the repo project. -->
48+
<CommonArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(CommonArgs) $(FlagParameterPrefix)msbuildEngine dotnet</CommonArgs>
49+
50+
<!-- MSBuild's multi-threaded mode is opt-in for now, so it's off unless it's explicitly requested.
51+
Set DotNetBuildMT to explicitly opt in or out for all repo builds. Disable on VS msbuild for now. -->
52+
<CommonArgs Condition="'$(DotNetBuildMT)' == 'true' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(CommonArgs) $(FlagParameterPrefix)mt 1</CommonArgs>
53+
<CommonArgs Condition="'$(DotNetBuildMT)' == 'false'">$(CommonArgs) $(FlagParameterPrefix)mt 0</CommonArgs>
54+
</PropertyGroup>
55+
4956
<PropertyGroup>
5057
<!-- MinimalConsoleLogOutput determines if the repository build should be logged to a separate file or directly to the console.
5158
Enable it by default as with prallel repository builds the log becomes non-readable. -->

0 commit comments

Comments
 (0)