From 7107b04365a668388c3759ba003cb7dba9352dd5 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 1 Apr 2024 22:05:58 -0700
Subject: [PATCH] Change BuildWithDesktopMSBuild to ForceDotNetMSBuildEngine
 (#19251)

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 4 ++--
 src/SourceBuild/content/repo-projects/aspnetcore.proj         | 2 +-
 src/SourceBuild/content/repo-projects/wpf.proj                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 590a4826c..9c3299282 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -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>
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 6fa87fb0f..3b1fa6180 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -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>
diff --git a/src/SourceBuild/content/repo-projects/wpf.proj b/src/SourceBuild/content/repo-projects/wpf.proj
index e5ee42cc7..5f01dc057 100644
--- a/src/SourceBuild/content/repo-projects/wpf.proj
+++ b/src/SourceBuild/content/repo-projects/wpf.proj
@@ -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>