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

Makefile

@@ -121,11 +121,15 @@ 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 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/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"

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/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,7 +15,7 @@ protected Scenario_AndroidTestDependencies (string name, string description)
 
 		protected override void AddSteps (Context context)
 		{
-			Steps.Add (new Step_InstallDotNetPreview ());
+			Steps.Add (new Step_PrepareDotNetWorkloads ());
 
 			// disable installation of missing programs...
 			context.SetCondition (KnownConditions.AllowProgramInstallation, false);

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

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