[xaprepare] Remove Mono as required component (#9144)

pjcollins · web-flow · commit 41b0124f2e62 · 2024-07-25T19:07:26.000-04:00
Mono is no longer needed to build, and it can be removed as a required
component. Mono can still be installed via the UpdateMono scenario if
needed:

    make prepare-update-mono PREPARE_AUTOPROVISION=1
diff --git a/Makefile b/Makefile
@@ -15,7 +15,6 @@ PREPARE_SCENARIO =
 PREPARE_CI_PR ?= 0
 PREPARE_CI ?= 0
 PREPARE_AUTOPROVISION ?= 0
-PREPARE_AUTOPROVISION_SKIP_MONO ?= 0
 
 _PREPARE_CI_MODE_PR_ARGS = --no-emoji --run-mode=CI
 _PREPARE_CI_MODE_ARGS = $(_PREPARE_CI_MODE_PR_ARGS) -a
@@ -59,10 +58,6 @@ ifneq ($(PREPARE_AUTOPROVISION),0)
 _PREPARE_ARGS += --auto-provision=yes --auto-provision-uses-sudo=yes
 endif
 
-ifneq ($(PREPARE_AUTOPROVISION_SKIP_MONO),0)
-_PREPARE_ARGS += --auto-provision-skip-mono=yes
-endif
-
 ifneq ($(PREPARE_SCENARIO),)
 _PREPARE_ARGS += -s:"$(PREPARE_SCENARIO)"
 endif
diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml
@@ -20,10 +20,6 @@ steps:
   inputs:
     forceReinstallCredentialProvider: true
 
-- script: make prepare-update-mono CONFIGURATION=$(XA.Build.Configuration) PREPARE_CI=1 PREPARE_AUTOPROVISION=1
-  workingDirectory: ${{ parameters.xaSourcePath }}
-  displayName: make prepare-update-mono
-
 # Always checkout a second resource to ensure we are using multi-repo checkout behavior
 #  https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
 - checkout: maui
diff --git a/build-tools/xaprepare/README.md b/build-tools/xaprepare/README.md
@@ -155,9 +155,6 @@ You can append the following parameters to the command line:
    If set to `0` (the default), the utility will take notice of missing/outdated software the build depends on and exit with an error
    should any such condition is detected. Setting the property to `1` will let the utility install the software (installation **may** 
    use `sudo` on Unix so you will need administrator/root credentials for it to work)
- - `PREPARE_AUTOPROVISION_SKIP_MONO=0|1`
-   If set to `0` (the default), the utility will ensure the Mono MDK is installed.
-   Setting the property to `1` will allow you to skip Mono MDK installation.
  - `V=1`
    Causes the run to output much more information (making output much more messy in the process) to the console. Normally this additional
    information is placed only in the log files generated by the utility.
diff --git a/build-tools/xaprepare/xaprepare/Application/Context.cs b/build-tools/xaprepare/xaprepare/Application/Context.cs
@@ -137,11 +137,6 @@ partial class Context : AppObject
 		/// </summary>
 		public bool AutoProvisionUsesSudo              { get; set; }
 
-		/// <summary>
-		///   Skip automatic provision of the Mono MDK if missing
-		/// </summary>
-		public bool AutoProvisionSkipMono              { get; set; } = false;
-
 		/// <summary>
 		///   Current session execution mode. See <see cref="t:ExecutionMode" />
 		/// </summary>
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/MacOS.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/MacOS.cs
@@ -23,7 +23,7 @@ protected override void InitializeDependencies ()
 		{
 			Dependencies.AddRange (programs);
 
-			if (!Context.Instance.AutoProvisionSkipMono) {
+			if (Context.Instance.CheckCondition (KnownConditions.AllowMonoUpdate)) {
 				Dependencies.Add (
 					new MonoPkgProgram ("Mono", "com.xamarin.mono-MDK.pkg", new Uri (Context.Instance.Properties.GetRequiredValue (KnownProperties.MonoDarwinPackageUrl))) {
 						MinimumVersion = Context.Instance.Properties.GetRequiredValue (KnownProperties.MonoRequiredMinimumVersion),
diff --git a/build-tools/xaprepare/xaprepare/Main.cs b/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 bool AutoProvisionSkipMono  { get; set; }
 			public RefreshableComponent RefreshList { get; set; }
 			public IEnumerable<string> AndroidSdkPlatforms { get; set; } = new [] { "latest" };
 		}
@@ -101,7 +100,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)},
-				{"auto-provision-skip-mono=", $"Do not automatically install the Mono MDK", v => parsedOptions.AutoProvisionSkipMono = ParseBoolean (v)},
 				{"android-sdk-platforms=", "Comma separated list of Android SDK platform levels to be installed or 'latest' or 'all'. Defaults to 'latest' if no value is provided.", v => parsedOptions.AndroidSdkPlatforms = ParseAndroidSdkPlatformLevels (v?.Trim () ?? String.Empty) },
 				"",
 				{"h|help", "Show this help message", v => parsedOptions.ShowHelp = true },
@@ -132,7 +130,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.AutoProvisionSkipMono = parsedOptions.AutoProvisionSkipMono;
 			Context.Instance.ComponentsToRefresh   = parsedOptions.RefreshList;
 			Context.Instance.AndroidSdkPlatforms   = parsedOptions.AndroidSdkPlatforms;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected override void InitializeDependencies ()`
`23`	`23`	`{`
`24`	`24`	`Dependencies.AddRange (programs);`
`25`	`25`
`26`		`- if (!Context.Instance.AutoProvisionSkipMono) {`
	`26`	`+ if (Context.Instance.CheckCondition (KnownConditions.AllowMonoUpdate)) {`
`27`	`27`	`Dependencies.Add (`
`28`	`28`	`new MonoPkgProgram ("Mono", "com.xamarin.mono-MDK.pkg", new Uri (Context.Instance.Properties.GetRequiredValue (KnownProperties.MonoDarwinPackageUrl))) {`
`29`	`29`	`MinimumVersion = Context.Instance.Properties.GetRequiredValue (KnownProperties.MonoRequiredMinimumVersion),`