No more MD_APPLE_SDK_ROOT.

Nor warnings about settings files.

Author: rolfbjarne

Make.config

@@ -223,7 +223,6 @@ endif
 
 # Tell both Xcode and our build logic which Xcode we're using.
 export DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT)
-export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
 
 # We don't need to be told there are workload updates
 export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true

tests/common/BinLog.cs

@@ -210,6 +210,9 @@ public static IEnumerable<BuildLogEvent> GetBuildLogWarnings (string path)
 				.Where (v => v.Type == BuildLogEventType.Warning)
 				// We're often referencing earlier .NET projects (Touch.Unit/MonoTouch.Dialog), so ignore any out-of-support warnings.
 				.Where (v => v.Message?.Contains ("is out of support and will not receive security updates in the future") != true)
+				// Ignore any messages about the settings files, we get *a lot* of those
+				.Where (v => !(v.Message?.Contains ("The settings file '/Users/") == true && v.Message?.Contains ("/Library/Preferences/maui/Settings.plist' is deprecated, and will be ignored in .NET 11+. ") == true))
+				.Where (v => !(v.Message?.Contains ("The settings file '/Users/") == true && v.Message?.Contains ("/Library/Preferences/Xamarin/Settings.plist' is deprecated, and will be ignored in .NET 11+. ") == true))
 				;
 		}
 

tests/common/Configuration.cs

@@ -697,7 +697,7 @@ public static void SetBuildVariables (ApplePlatform platform, ref Dictionary<str
 			if (environment is null)
 				environment = new Dictionary<string, string> ();
 
-			environment ["MD_APPLE_SDK_ROOT"] = Path.GetDirectoryName (Path.GetDirectoryName (xcode_root));
+			environment ["DEVELOPER_DIR"] = Path.GetDirectoryName (Path.GetDirectoryName (xcode_root));
 
 			// This is set by `dotnet test` and can cause building legacy projects to fail to build with:
 			// Microsoft.NET.Build.Extensions.ConflictResolution.targets(30,5):

tests/dotnet/UnitTests/XcodeVersionTest.cs

@@ -36,14 +36,14 @@ public void Test (ApplePlatform platform, string xcodePath, Version xcodeVersion
 			var properties = GetDefaultProperties (runtimeIdentifiers);
 			properties ["BundleOriginalResources"] = "true"; // this prevents a different and unrelated error message from failing to build library projects
 
-			var existingDeveloperDir = Environment.GetEnvironmentVariable ("MD_APPLE_SDK_ROOT");
+			var existingDeveloperDir = Environment.GetEnvironmentVariable ("DEVELOPER_DIR");
 			try {
-				Environment.SetEnvironmentVariable ("MD_APPLE_SDK_ROOT", Path.GetDirectoryName (Path.GetDirectoryName (xcodePath)));
+				Environment.SetEnvironmentVariable ("DEVELOPER_DIR", Path.GetDirectoryName (Path.GetDirectoryName (xcodePath)));
 				var rv = DotNet.AssertBuildFailure (project_path, properties);
 				var errors = BinLog.GetBuildLogErrors (rv.BinLogPath).ToArray ();
 				AssertErrorMessages (errors, $"This version of .NET for {platform.AsString ()} ({Configuration.GetNuGetVersionNoMetadata (platform)}) requires Xcode {Configuration.XcodeVersion}. The current version of Xcode is {xcodeVersion}. Either install Xcode {Configuration.XcodeVersion}, or use a different version of .NET for {platform.AsString ()}. See https://aka.ms/xcode-requirement for more information.");
 			} finally {
-				Environment.SetEnvironmentVariable ("MD_APPLE_SDK_ROOT", existingDeveloperDir);
+				Environment.SetEnvironmentVariable ("DEVELOPER_DIR", existingDeveloperDir);
 			}
 		}
 	}

tests/msbuild/Xamarin.MacDev.Tasks.Tests/AssemblySetup.cs

@@ -17,7 +17,7 @@ public void AssemblyInitialization ()
 		const string msbuild_exe_path = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/msbuild/15.0/bin/MSBuild.dll";
 		if (is_in_vsmac) {
 			var env = new Dictionary<string, string> {
-				{ "MD_APPLE_SDK_ROOT", Path.GetDirectoryName (Path.GetDirectoryName (Configuration.xcode_root)) },
+				{ "DEVELOPER_DIR", Path.GetDirectoryName (Path.GetDirectoryName (Configuration.xcode_root)) },
 				{ "MSBUILD_EXE_PATH", msbuild_exe_path },
 			};
 

tests/package-mac-tests.sh

@@ -19,7 +19,7 @@ cat test.config
 INCLUDE_MAC=$(grep ^INCLUDE_MAC= test.config | sed 's/.*=//')
 INCLUDE_MACCATALYST=$(grep ^INCLUDE_MACCATALYST= test.config | sed 's/.*=//')
 XCODE_DEVELOPER_ROOT=$(grep ^XCODE_DEVELOPER_ROOT= test.config | sed 's/.*=//')
-export MD_APPLE_SDK_ROOT="$(dirname "$(dirname "$XCODE_DEVELOPER_ROOT")")"
+export DEVELOPER_DIR="$(dirname "$(dirname "$XCODE_DEVELOPER_ROOT")")"
 export RootTestsDirectory="$(pwd)"
 
 make

tests/xharness/Jenkins/TestTasks/AppleTestTask.cs

@@ -35,7 +35,7 @@ public override void SetEnvironmentVariables (Process process)
 			var xcodeRoot = Jenkins.Harness.XcodeRoot;
 
 			process.StartInfo.EnvironmentVariables ["RootTestsDirectory"] = HarnessConfiguration.RootDirectory;
-			process.StartInfo.EnvironmentVariables ["MD_APPLE_SDK_ROOT"] = xcodeRoot;
+			process.StartInfo.EnvironmentVariables ["DEVELOPER_DIR"] = xcodeRoot;
 
 			foreach (var kvp in Environment) {
 				if (kvp.Value is null) {