From 31fa046642400b7741137a6f027b4b3eea964a1a Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sandy@xamarin.com>
Date: Fri, 20 May 2022 06:54:24 -0700
Subject: [PATCH] Provisionator's XcodeSelect  now configures Xamarin
 Settings.plist

---
 tools/devops/build-provisioning.csx.in        | 25 -------------------
 tools/devops/device-tests-provisioning.csx.in | 25 -------------------
 tools/devops/provision-shared.csx             |  8 ------
 tools/devops/provision-xcode.csx.in           |  9 -------
 4 files changed, 67 deletions(-)

diff --git a/tools/devops/build-provisioning.csx.in b/tools/devops/build-provisioning.csx.in
index d7b2220b4cf9..1ca079d09965 100644
--- a/tools/devops/build-provisioning.csx.in
+++ b/tools/devops/build-provisioning.csx.in
@@ -14,28 +14,3 @@ Item ("@MONO_PACKAGE@");
 Item ("@MIN_SHARPIE_URL@");
 Item ("@VS_PACKAGE@");
 DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@");
-
-var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
-Item ("Override Apple SDK Settings")
-	.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
-	.Action (item => {
-		DeleteSafe (appleSdkOverride);
-		CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
-		Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
-	});
-
-void DeleteSafe (string file)
-{
-	if (File.Exists (file))
-		File.Delete (file);
-}
-
-void CreateSetting (string settingFile, string key, string value)
-{
-	Exec ("defaults", "write", settingFile, key, value);
-}
-
-string GetSettingValue (string settingFile, string keyName)
-{
-	return Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
-}
diff --git a/tools/devops/device-tests-provisioning.csx.in b/tools/devops/device-tests-provisioning.csx.in
index 7037f83638a8..b62bb63599d6 100644
--- a/tools/devops/device-tests-provisioning.csx.in
+++ b/tools/devops/device-tests-provisioning.csx.in
@@ -18,28 +18,3 @@ Item ("@MIN_SHARPIE_URL@");
 DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@");
 
 BrewPackages ("p7zip");
-
-var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
-Item ("Override Apple SDK Settings")
-	.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
-	.Action (item => {
-		DeleteSafe (appleSdkOverride);
-		CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
-		Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
-	});
-
-void DeleteSafe (string file)
-{
-	if (File.Exists (file))
-		File.Delete (file);
-}
-
-void CreateSetting (string settingFile, string key, string value)
-{
-	Exec ("defaults", "write", settingFile, key, value);
-}
-
-string GetSettingValue (string settingFile, string keyName)
-{
-	return Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
-}
diff --git a/tools/devops/provision-shared.csx b/tools/devops/provision-shared.csx
index 0ba588d55790..f01699237aee 100644
--- a/tools/devops/provision-shared.csx
+++ b/tools/devops/provision-shared.csx
@@ -88,14 +88,6 @@ bool IsAtLeastVersion(string actualVer, string minVer)
     return actualVerChars.Length > minVerChars.Length;
 }
 
-void CreateSetting (string settingFile, string key, string value) => Exec ("defaults", "write", settingFile, key, value);
-string GetSettingValue (string settingFile, string keyName) => Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
-void DeleteSafe (string file)
-{
-	if (File.Exists (file))
-		File.Delete (file);
-}
-
 void RemoveXcodeSymlinks (string xcodePath)
 {
 	Console.WriteLine ($"Checkig if '{xcodePath}' is a symlink...");
diff --git a/tools/devops/provision-xcode.csx.in b/tools/devops/provision-xcode.csx.in
index 3de557722ca8..ea30ad8f6ec8 100644
--- a/tools/devops/provision-xcode.csx.in
+++ b/tools/devops/provision-xcode.csx.in
@@ -31,13 +31,4 @@ RemoveXcodeSymlinks (reqXcode);
 // Provision Xcode using the xip name declared in Make.config
 Xcode ("@XCODE_XIP_NAME@").XcodeSelect (allowUntrusted: true);
 
-var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
-Item ("Override Apple SDK Settings")
-	.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
-	.Action (item => {
-		DeleteSafe (appleSdkOverride);
-		CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
-		Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
-	});
-
 LogInstalledXcodes ();