Merge branch 'main' into feature/sdk-manager

Author: rmarinho

src/Xamarin.Android.Tools.AndroidSdk/EnvironmentVariableNames.cs

@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Xamarin.Android.Tools
+{
+	/// <summary>
+	/// Constants for environment variable names used by Android SDK tooling.
+	/// See https://developer.android.com/tools/variables#envar
+	/// </summary>
+	internal static class EnvironmentVariableNames
+	{
+		/// <summary>
+		/// The preferred variable for the Android SDK root directory.
+		/// </summary>
+		public const string AndroidHome = "ANDROID_HOME";
+
+		/// <summary>
+		/// Deprecated — use <see cref="AndroidHome"/> instead.
+		/// Retained for reading existing environment configurations.
+		/// </summary>
+		[System.Obsolete ("ANDROID_SDK_ROOT is deprecated. Use ANDROID_HOME instead.")]
+		public const string AndroidSdkRoot = "ANDROID_SDK_ROOT";
+
+		/// <summary>
+		/// The JDK installation directory.
+		/// </summary>
+		public const string JavaHome = "JAVA_HOME";
+
+		/// <summary>
+		/// Internal/override JDK path. Takes precedence over JAVA_HOME when set.
+		/// </summary>
+		public const string JiJavaHome = "JI_JAVA_HOME";
+
+		/// <summary>
+		/// Executable search paths.
+		/// </summary>
+		public const string Path = "PATH";
+
+		/// <summary>
+		/// Executable file extensions (Windows).
+		/// </summary>
+		public const string PathExt = "PATHEXT";
+	}
+}

src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs

@@ -328,7 +328,7 @@ public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, st
 		{
 			logger  = logger ?? AndroidSdkInfo.DefaultConsoleLogger;
 
-			return GetEnvironmentVariableJdks ("JI_JAVA_HOME", logger)
+			return GetEnvironmentVariableJdks (EnvironmentVariableNames.JiJavaHome, logger)
 				.Concat (JdkLocations.GetPreferredJdks (logger))
 				.Concat (XAPrepareJdkLocations.GetXAPrepareJdks (logger))
 				.Concat (MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger))
@@ -337,7 +337,7 @@ public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, st
 				.Concat (OracleJdkLocations.GetOracleJdks (logger))
 				.Concat (VSAndroidJdkLocations.GetVSAndroidJdks (logger))
 				.Concat (MicrosoftDistJdkLocations.GetMicrosoftDistJdks (logger))
-				.Concat (GetEnvironmentVariableJdks ("JAVA_HOME", logger))
+				.Concat (GetEnvironmentVariableJdks (EnvironmentVariableNames.JavaHome, logger))
 				.Concat (GetPathEnvironmentJdks (logger))
 				.Concat (GetLibexecJdks (logger))
 				.Concat (GetJavaAlternativesJdks (logger))

src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs

@@ -18,7 +18,7 @@ public static class ProcessUtils
 
 		static ProcessUtils ()
 		{
-			var pathExt     = Environment.GetEnvironmentVariable ("PATHEXT");
+			var pathExt     = Environment.GetEnvironmentVariable (EnvironmentVariableNames.PathExt);
 			var pathExts    = pathExt?.Split (new char [] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries) ?? new string [0];
 
 			ExecutableFileExtensions    = pathExts;
@@ -205,7 +205,7 @@ static string JoinArguments (string[] args)
 
 		internal static IEnumerable<string> FindExecutablesInPath (string executable)
 		{
-			var path        = Environment.GetEnvironmentVariable ("PATH") ?? "";
+			var path        = Environment.GetEnvironmentVariable (EnvironmentVariableNames.Path) ?? "";
 			var pathDirs    = path.Split (new char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries);
 
 			foreach (var dir in pathDirs) {

src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs

@@ -16,7 +16,9 @@ abstract class AndroidSdkBase
 		static readonly char[] SourcePropertiesKeyValueSplit = new char[] { '=' };
 
 		// Per https://developer.android.com/studio/command-line/variables#envar
-		protected static readonly string[] AndroidSdkEnvVars = {"ANDROID_HOME", "ANDROID_SDK_ROOT"};
+		#pragma warning disable CS0618 // ANDROID_SDK_ROOT is obsolete but still needed for compat
+		protected static readonly string[] AndroidSdkEnvVars = {EnvironmentVariableNames.AndroidHome, EnvironmentVariableNames.AndroidSdkRoot};
+		#pragma warning restore CS0618
 
 		string[]? allAndroidSdks;
 

src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs

@@ -185,16 +185,16 @@ public override void Initialize (string? androidSdkPath = null, string? androidN
 
 			var jdkPath = JavaSdkPath;
 			if (!string.IsNullOrEmpty (jdkPath)) {
-				var cur = Environment.GetEnvironmentVariable ("JAVA_HOME");
+				var cur = Environment.GetEnvironmentVariable (EnvironmentVariableNames.JavaHome);
 				if (!string.IsNullOrEmpty (cur))
-					Environment.SetEnvironmentVariable ("JAVA_HOME", jdkPath);
+					Environment.SetEnvironmentVariable (EnvironmentVariableNames.JavaHome, jdkPath);
 
 				var javaBinPath = this.JavaBinPath;
 				if (!string.IsNullOrEmpty (javaBinPath)) {
-					var environmentPath = Environment.GetEnvironmentVariable ("PATH") ?? "";
+					var environmentPath = Environment.GetEnvironmentVariable (EnvironmentVariableNames.Path) ?? "";
 					if (!environmentPath.Contains (javaBinPath)) {
 						var processPath = string.Concat (javaBinPath, Path.PathSeparator, environmentPath);
-						Environment.SetEnvironmentVariable ("PATH", processPath);
+						Environment.SetEnvironmentVariable (EnvironmentVariableNames.Path, processPath);
 					}
 				}
 			}