From b8bf6618a926417ed4df8cb9b53796c5c24cef41 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter.collins@xamarin.com>
Date: Wed, 27 Jan 2021 10:53:29 -0500
Subject: [PATCH] Don't rely on build temporarily

---
 .../automation/azure-pipelines-nightly.yaml   | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml
index f094023eb1f..64d8afb36a5 100644
--- a/build-tools/automation/azure-pipelines-nightly.yaml
+++ b/build-tools/automation/azure-pipelines-nightly.yaml
@@ -70,7 +70,7 @@ stages:
 
 - stage: test
   displayName: Test
-  dependsOn: mac_build
+  dependsOn: []
   jobs:
   - job: emulator_tests
     displayName: Emulator
@@ -101,9 +101,64 @@ stages:
       - group: Xamarin-Secrets
       - group: xamops-azdev-secrets
     steps:
-    - template: yaml-templates/setup-test-environment.yaml
+    - checkout: self
+      clean: true
+      submodules: recursive
+
+    - script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/Library/Android/$(XA.Jdk11.Folder)"
+      displayName: set JI_JAVA_HOME
+      condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
+
+    - template: yaml-templates/use-dot-net.yaml
+      parameters:
+        version: $(DotNet5Version)
+        remove_dotnet: true
+
+    - template: yaml-templates/use-dot-net.yaml
       parameters:
+        version: $(DotNetCoreVersion)
+
+    - task: MSBuild@1
+      displayName: build xaprepare
+      inputs:
+        solution: $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare.sln
+        configuration: $(XA.Build.Configuration)
+        msbuildArguments: /restore
+
+    - script: >
+        mono $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI &&
+        mono $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=AndroidTestDependencies --no-emoji --run-mode=CI
+      displayName: install test dependencies
+      condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
+
+    - script: >
+        $(System.DefaultWorkingDirectory)\build-tools\xaprepare\xaprepare\bin\$(XA.Build.Configuration)\xaprepare.exe --s=AndroidTestDependencies --no-emoji --run-mode=CI
+      displayName: install test dependencies
+      condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
+
+    # Restore solutions for Xamarin.Android.Tools.sln, Xamarin.Android.sln, and Xamarin.Android-Tests.sln
+    - task: NuGetToolInstaller@0
+      inputs:
+        versionSpec: 5.x
+
+    - task: NuGetCommand@2
+      displayName: nuget restore Xamarin.Android.Build.Tasks.sln
+      inputs:
+        command: custom
+        arguments: restore $(System.DefaultWorkingDirectory)/Xamarin.Android.Build.Tasks.sln -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Verbosity detailed
+
+    - task: NuGetCommand@2
+      displayName: nuget restore Xamarin.Android-Tests.sln
+      inputs:
+        command: custom
+        arguments: restore $(System.DefaultWorkingDirectory)/Xamarin.Android-Tests.sln -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Verbosity detailed
+
+    - task: MSBuild@1
+      displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
+      inputs:
+        solution: $(System.DefaultWorkingDirectory)/build-tools/xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
         configuration: $(XA.Build.Configuration)
+        msbuildArguments: /restore /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/BootstrapTasks.binlog
 
     - script: >
         mono $(System.DefaultWorkingDirectory)/build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe