[build] Provision .NET SDK via standard scripts, drop xaprepare's installer

Makefile

@@ -121,11 +121,16 @@ list-nunit-tests:
 include build-tools/scripts/runtime-helpers.mk
 
 .PHONY: prepare
-prepare:
+prepare: install-dotnet
 	$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
 	$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
+	$(call SYSTEM_DOTNET_BINLOG,prepare-workloads) src/workloads/workloads.csproj
 	$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop
 
+.PHONY: install-dotnet
+install-dotnet:
+	bash ./eng/install-dotnet.sh
+
 .PHONY: prepare-help
 prepare-help:
 	$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h

build-tools/automation/azure-pipelines-nightly.yaml

@@ -118,7 +118,6 @@ stages:
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
-        xaprepareScenario: EmulatorTestDependencies
         jdkMajorVersion: $(LatestJavaSdkMajorVersion)
 
     - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
@@ -194,7 +193,6 @@ stages:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
         installTestSlicer: true
-        xaprepareScenario: EmulatorTestDependencies
         useAgentJdkPath: false
         jdkMajorVersion: $(LatestJavaSdkMajorVersion)
 
@@ -247,7 +245,6 @@ stages:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
         installTestSlicer: true
-        xaprepareScenario: EmulatorTestDependencies
         useAgentJdkPath: false
         jdkMajorVersion: $(LatestJavaSdkMajorVersion)
 

build-tools/automation/azure-pipelines-public.yaml

@@ -379,7 +379,6 @@ stages:
       parameters:
         installTestSlicer: true
         installApkDiff: false
-        xaprepareScenario: EmulatorTestDependencies
         use1ESTemplate: false
 
     - task: DownloadPipelineArtifact@2

build-tools/automation/yaml-templates/run-emulator-tests.yaml

@@ -26,7 +26,6 @@ jobs:
 
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
-        xaprepareScenario: EmulatorTestDependencies
         jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
         useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
         use1ESTemplate: ${{ parameters.use1ESTemplate }}

build-tools/automation/yaml-templates/setup-test-environment-public.yaml

@@ -14,7 +14,6 @@ parameters:
   androidSdkPlatforms: $(DefaultTestSdkPlatforms)
   repositoryAlias: 'self'
   commit: ''
-  xaprepareScenario: AndroidTestDependencies        # Use 'EmulatorTestDependencies' for agents that need the emulator installed
   use1ESTemplate: false
 
 steps:
@@ -36,5 +35,4 @@ steps:
     installTestSlicer: ${{ parameters.installTestSlicer }}
     installApkDiff: ${{ parameters.installApkDiff }}
     androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
-    xaprepareScenario: ${{ parameters.xaprepareScenario }}
     use1ESTemplate: false

build-tools/automation/yaml-templates/setup-test-environment-steps.yaml

@@ -12,7 +12,6 @@ parameters:
   installTestSlicer: false
   installApkDiff: true
   androidSdkPlatforms: $(DefaultTestSdkPlatforms)
-  xaprepareScenario: AndroidTestDependencies        # Use 'EmulatorTestDependencies' for agents that need the emulator installed
   use1ESTemplate: true
 
 steps:
@@ -50,10 +49,25 @@ steps:
     displayName: Install p7zip on macOS
     condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
 
-- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
-  parameters:
-    arguments: --s=${{ parameters.xaprepareScenario }}
-    xaSourcePath: ${{ parameters.xaSourcePath }}
+- pwsh: |
+    & "${{ parameters.xaSourcePath }}/eng/install-dotnet.ps1" -configuration ${{ parameters.configuration }}
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+  displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
+  condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
+
+- bash: |
+    set -e
+    bash "${{ parameters.xaSourcePath }}/eng/install-dotnet.sh"
+  displayName: install .NET SDK to bin/${{ parameters.configuration }}/dotnet
+  condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
+  env:
+    CONFIGURATION: ${{ parameters.configuration }}
+
+- task: DotNetCoreCLI@2
+  displayName: prepare .NET workloads
+  inputs:
+    projects: ${{ parameters.xaSourcePath }}/src/workloads/workloads.csproj
+    arguments: -c ${{ parameters.configuration }} -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/workloads.binlog
 
 - task: DotNetCoreCLI@2
   displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -11,7 +11,6 @@ parameters:
   androidSdkPlatforms: $(DefaultTestSdkPlatforms)
   repositoryAlias: 'self'
   commit: ''
-  xaprepareScenario: AndroidTestDependencies        # Use 'EmulatorTestDependencies' for agents that need the emulator installed
   use1ESTemplate: true
 
 steps:
@@ -41,5 +40,4 @@ steps:
     installTestSlicer: ${{ parameters.installTestSlicer }}
     installApkDiff: ${{ parameters.installApkDiff }}
     androidSdkPlatforms: ${{ parameters.androidSdkPlatforms }}
-    xaprepareScenario: ${{ parameters.xaprepareScenario }}
     use1ESTemplate: ${{ parameters.use1ESTemplate }}

build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

@@ -41,7 +41,6 @@ stages:
         xaSourcePath: ${{ parameters.xaSourcePath }}
         repositoryAlias: ${{ parameters.repositoryAlias }}
         commit: ${{ parameters.commit }}
-        xaprepareScenario: EmulatorTestDependencies
         use1ESTemplate: ${{ parameters.use1ESTemplate }}
 
     - task: DownloadPipelineArtifact@2

build-tools/automation/yaml-templates/stage-package-tests.yaml

@@ -23,7 +23,6 @@ stages:
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
-        xaprepareScenario: EmulatorTestDependencies
         use1ESTemplate: ${{ parameters.use1ESTemplate }}
 
     - task: DownloadPipelineArtifact@2
@@ -120,7 +119,6 @@ stages:
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
       parameters:
-        xaprepareScenario: EmulatorTestDependencies
         use1ESTemplate: ${{ parameters.use1ESTemplate }}
 
     - task: DownloadPipelineArtifact@2

build-tools/scripts/PrepareWindows.targets

@@ -9,7 +9,13 @@
     <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
   </PropertyGroup>
   <Import Project="$(_TopDir)\Configuration.props" />
-  <Target Name="_BuildXAPrepare">
+  <Target Name="_InstallDotNet">
+    <Exec
+        Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
+        WorkingDirectory="$(_TopDir)"
+    />
+  </Target>
+  <Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
     <MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
   </Target>
   <Target Name="Prepare"
@@ -20,6 +26,7 @@
     />
     <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
     <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
+    <MSBuild Projects="$(_TopDir)\src\workloads\workloads.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
     <CallTarget Targets="PrepareJavaInterop" />
   </Target>
 </Project>

build-tools/xaprepare/xaprepare/Application/Context.cs

@@ -277,11 +277,6 @@ public string DebugFileExtension {
 			}
 		}
 
-		/// <summary>
-		///   Path to a local .NET SDK archive to use instead of downloading.
-		/// </summary>
-		public string? LocalDotNetSdkArchive { get; set; }
-
 		/// <summary>
 		///   Determines whether or not we are running on a hosted azure pipelines agent.
 		///   These agents have certain limitations, the most pressing being the amount of available storage.

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs

@@ -9,14 +9,5 @@ partial class Defaults
 		{
 			public const string DefaultCompiler = "cc";
 		}
-
-		partial class Urls
-		{
-			// This is the "public" url that we really should be using, but it keeps failing with:
-			// AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
-			// For now we'll grab it directly from GitHub
-			// public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
-			public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
-		}
 	}
 }

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

@@ -13,10 +13,5 @@ partial class Defaults
 		partial class Paths
 		{
 		}
-
-		partial class Urls
-		{
-			public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
-		}
 	}
 }

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -178,22 +178,6 @@ public static partial class Paths
 			public static string CoreClrAppRuntimeAndroidX86         => GetCachedPath (ref coreclrAppRuntimeAndroidX86, () => GetCoreClrAppRuntimePath (ctx, "x86"));
 			public static string CoreClrAppRuntimeAndroidX86_64      => GetCachedPath (ref coreclrAppRuntimeAndroidX86_64, () => GetCoreClrAppRuntimePath (ctx, "x64"));
 
-			public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
-				XAPackagesDir,
-				$"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
-				ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
-			);
-
-			public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");
-
-			public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
-				XAPackagesDir,
-				$"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
-				ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
-			);
-
-			public static string MicrosoftNETWorkloadEmscriptenDir => Path.Combine (MicrosoftNETWorkloadEmscriptenPackageDir, "data");
-
 			public static string DotNetPreviewPath => ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);
 
 			public static string DotNetPreviewTool => Path.Combine (DotNetPreviewPath, "dotnet");

build-tools/xaprepare/xaprepare/Main.cs

@@ -27,7 +27,6 @@ sealed class ParsedOptions
 			public string? Configuration       { get; set; }
 			public bool AutoProvision          { get; set; }
 			public bool AutoProvisionUsesSudo  { get; set; }
-			public string? LocalDotNetSdkArchive { get; set; }
 		}
 
 		public static int Main (string[] args)
@@ -98,7 +97,6 @@ static async Task<int> Run (string[] args)
 				"",
 				{"auto-provision=", $"Automatically install software required by .NET for Android", v => parsedOptions.AutoProvision = ParseBoolean (v)},
 				{"auto-provision-uses-sudo=", $"Allow use of sudo(1) when provisioning", v => parsedOptions.AutoProvisionUsesSudo = ParseBoolean (v)},
-				{"dotnet-sdk-archive=", "Path to a local .NET SDK archive (zip or tar.gz) to use instead of downloading from the internet.", v => parsedOptions.LocalDotNetSdkArchive = v?.Trim () },
 				"",
 				{"h|help", "Show this help message", v => parsedOptions.ShowHelp = true },
 			};
@@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
 			Context.Instance.DebugFileExtension    = parsedOptions.DebugFileExtension;
 			Context.Instance.AutoProvision         = parsedOptions.AutoProvision;
 			Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
-			Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;
 
 			if (!String.IsNullOrEmpty (parsedOptions.Configuration))
 				Context.Instance.Configuration = parsedOptions.Configuration!;

build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs

@@ -15,8 +15,6 @@ protected Scenario_AndroidTestDependencies (string name, string description)
 
 		protected override void AddSteps (Context context)
 		{
-			Steps.Add (new Step_InstallDotNetPreview ());
-
 			// disable installation of missing programs...
 			context.SetCondition (KnownConditions.AllowProgramInstallation, false);
 

build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

@@ -18,7 +18,6 @@ protected override void AddSteps (Context context)
 			if (context == null)
 				throw new ArgumentNullException (nameof (context));
 
-			Steps.Add (new Step_InstallDotNetPreview ());
 			Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 			Steps.Add (new Step_GenerateCGManifest ());
 		}