From 3751ae2f522f61acfd567423ce38e2b94cb229ee Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Mon, 7 Nov 2022 13:46:03 -0500
Subject: [PATCH] [build] Make external build targets more consistent

The external builds of monodroid and java.interop prep have been made
more consistent.  They will both use an `<Exec/>` task to build with the
preview dotnet SDK that is installed into `bin/$(Configuration)/dotnet`.
---
 build-tools/scripts/BuildEverything.mk |  2 +-
 build-tools/scripts/DotNet.targets     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk
index 71604445d00..776e6f90b96 100644
--- a/build-tools/scripts/BuildEverything.mk
+++ b/build-tools/scripts/BuildEverything.mk
@@ -20,7 +20,7 @@ else
 endif
 ifneq ("$(wildcard $(topdir)/external/monodroid/Makefile)","")
 	cd $(topdir)/external/monodroid && ./configure --with-xamarin-android='$(topdir)'
-	$(call SYSTEM_DOTNET_BINLOG,build-commercial) $(SOLUTION) -t:BuildExternal --no-restore
+	$(call DOTNET_BINLOG,build-commercial) $(SOLUTION) -t:BuildExternal
 endif
 	$(MAKE) leeroy
 
diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets
index 1aae6db4c3e..e11b2042001 100644
--- a/build-tools/scripts/DotNet.targets
+++ b/build-tools/scripts/DotNet.targets
@@ -1,17 +1,17 @@
 <Project>
   <PropertyGroup>
     <_Root>$(MSBuildThisFileDirectory)..\..\</_Root>
-    <_BinlogDateTime>$([System.DateTime]::Now.ToString("yyyyMMddTHHmmss"))</_BinlogDateTime>
+    <_BinlogPathPrefix>$(_Root)bin/Build$(Configuration)/msbuild-$([System.DateTime]::Now.ToString("yyyyMMddTHHmmss"))</_BinlogPathPrefix>
   </PropertyGroup>
   <Target Name="BuildExternal">
-    <MSBuild
-        Projects="$(_Root)\external\monodroid\monodroid.proj"
-        Properties="DebuggingToolsOutputDirectory=$(MicrosoftAndroidSdkOutDir);CompatTargetsOutputDirectory=$(XAInstallPrefix)xbuild\Novell"
+    <Exec
+        Command="&quot;$(DotNetPreviewTool)&quot; build monodroid.proj -c $(Configuration) -p:DebuggingToolsOutputDirectory=$(MicrosoftAndroidSdkOutDir) -p:CompatTargetsOutputDirectory=$(XAInstallPrefix)xbuild/Novell -bl:$(_BinlogPathPrefix)-build-monodroid.binlog"
+        WorkingDirectory="$(_Root)external\monodroid"
     />
   </Target>
   <Target Name="PrepareJavaInterop">
     <Exec
-        Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -bl:$(_Root)bin/Build$(Configuration)/msbuild-$(_BinlogDateTime)-prepare-java-interop.binlog"
+        Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
         WorkingDirectory="$(_Root)external\Java.Interop"
     />
   </Target>