mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Change BuildWithDesktopMSBuild to ForceDotNetMSBuildEngine (#19251)

Browse source
This commit is contained in:
Matt Mitchell 2024-04-01 22:05:58 -07:00 • committed by GitHub
parent b5e8ade5d5
commit 7107b04365
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/content/repo-projects/Directory.Build.targets
View file

@ -9,8 +9,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless BuildWithDesktopMSBuild is explicitly set in the repo project. -->
<BuildArgs Condition="'$(BuildOS)' == 'windows' and '$(BuildWithDesktopMSBuild)' != 'true'">$(BuildArgs) $(FlagParameterPrefix)msbuildEngine dotnet</BuildArgs>
<!-- Force use of dotnet msbuild (ignoring global.json contents) unless ForceDotNetMSBuildEngine is explicitly set in the repo project. -->
<BuildArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(BuildArgs) $(FlagParameterPrefix)msbuildEngine dotnet</BuildArgs>
</PropertyGroup>
<PropertyGroup>

2
src/SourceBuild/content/repo-projects/aspnetcore.proj
View file

@ -11,7 +11,7 @@
<BuildActions Condition="'$(BuildOS)' != 'windows'">$(BuildActions) $(FlagParameterPrefix)no-build-java</BuildActions>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
<BuildWithDesktopMSBuild>true</BuildWithDesktopMSBuild>
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
</PropertyGroup>

2
src/SourceBuild/content/repo-projects/wpf.proj
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<BuildWithDesktopMSBuild>true</BuildWithDesktopMSBuild>
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>