From da980071815ea2572223112f77bfd257115ceb97 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 14 Aug 2023 19:48:43 +0000 Subject: [PATCH] Remove more xabuild (#8263) This makes it possible to build locally with `make prepare all` Co-authored-by: Peter Collins --- Makefile | 2 -- build-tools/scripts/UpdateApkSizeReference.ps1 | 2 -- build.cmd | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e04b80c64fa..064b86f7005 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ _PREPARE_ARGS = all: $(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION) $(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj - $(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj -include bin/Build$(CONFIGURATION)/rules.mk @@ -95,7 +94,6 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo endif all-tests:: - $(call MSBUILD_BINLOG,build-xabuild) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) /restore $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln pack-dotnet:: diff --git a/build-tools/scripts/UpdateApkSizeReference.ps1 b/build-tools/scripts/UpdateApkSizeReference.ps1 index 7f357ef1e51..525c40f759b 100644 --- a/build-tools/scripts/UpdateApkSizeReference.ps1 +++ b/build-tools/scripts/UpdateApkSizeReference.ps1 @@ -5,8 +5,6 @@ if (-not (Test-Path bin/Release)) { exit 1 } -Write-Output "Building xabuild" -msbuild /p:Configuration=Release /restore .\tools\xabuild\xabuild.csproj Write-Output "Building legacy BuildReleaseArm64 tests" msbuild /p:Configuration=Release Xamarin.Android.sln /t:RunNunitTests /p:TEST="Xamarin.Android.Build.Tests.BuildTest2.BuildReleaseArm64" Write-Output "Building DotNet BuildReleaseArm64 tests" diff --git a/build.cmd b/build.cmd index a8420ae0b86..876d41149c8 100644 --- a/build.cmd +++ b/build.cmd @@ -28,4 +28,4 @@ IF ERRORLEVEL 1 CALL :DEFAULT_CASE echo "Failed to find an instance of Visual Studio. Please check it is correctly installed." GOTO END_CASE :END_CASE - GOTO :EOF \ No newline at end of file + GOTO :EOF