From c85f725547f5be4efa19a499e487d8b8fccf0416 Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Mon, 16 Jun 2025 10:42:31 +0200
Subject: [PATCH 1/4] detect ANDROID_SDK_ROOT

---
 NuGet.config                                     | 2 ++
 src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs | 4 +++-
 src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index d060e04ff3..02768ab104 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -20,6 +20,8 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-diagnostics-tests" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-diagnostics-tests/nuget/v3/index.json" />
+    <!-- android-tools to locate adb -->
+    <add key="Xamarin.Android" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
     <!-- Standard feeds -->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
diff --git a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
index 4cb9284ead..2ca4fbb0a8 100644
--- a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
+++ b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.Diagnostics.NETCore.Client;
 using Microsoft.Extensions.Logging;
+using Xamarin.Android.Tools;
 
 namespace Microsoft.Diagnostics.Tools.DiagnosticsServerRouter
 {
@@ -65,7 +66,8 @@ public static void AdbRemovePortReverse(int localPort, int remotePort, bool owns
 
         public static bool RunAdbCommandInternal(string command, string expectedOutput, int expectedExitCode, bool rethrow, ILogger logger)
         {
-            string sdkRoot = Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT");
+            //ANDROID_SDK_ROOT is deprecated
+            string sdkRoot = Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT") ?? new AndroidSdkInfo().AndroidSdkPath;
             string adbTool = "adb";
 
             if (!string.IsNullOrEmpty(sdkRoot))
diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
index 939c3601da..be672b50e1 100644
--- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
+++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
+    <PackageReference Include="Xamarin.Android.Tools.AndroidSdk" Version="[1.1.76, ]" />
   </ItemGroup>
 
 </Project>

From c392e451acb248d4a571dc7d3add431271601583 Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Mon, 16 Jun 2025 17:09:04 +0200
Subject: [PATCH 2/4] only log what's requested by the user

---
 .../dotnet-dsrouter/ADBTcpRouterFactory.cs    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
index 2ca4fbb0a8..856ce7baa8 100644
--- a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
+++ b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
@@ -66,8 +66,27 @@ public static void AdbRemovePortReverse(int localPort, int remotePort, bool owns
 
         public static bool RunAdbCommandInternal(string command, string expectedOutput, int expectedExitCode, bool rethrow, ILogger logger)
         {
+            void sdklogger(TraceLevel level, string message)
+            {
+                switch (level)
+                {
+                    case TraceLevel.Error:
+                        logger?.LogError(message);
+                        break;
+                    case TraceLevel.Warning:
+                        logger?.LogWarning(message);
+                        break;
+                    case TraceLevel.Info:
+                        logger?.LogInformation(message);
+                        break;
+                    case TraceLevel.Verbose:
+                        logger?.LogDebug(message);
+                        break;
+                }
+            };
+
             //ANDROID_SDK_ROOT is deprecated
-            string sdkRoot = Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT") ?? new AndroidSdkInfo().AndroidSdkPath;
+            string sdkRoot = Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT") ?? new AndroidSdkInfo(logger: sdklogger).AndroidSdkPath;
             string adbTool = "adb";
 
             if (!string.IsNullOrEmpty(sdkRoot))

From 5751bac7973da22343d695c2f061483b8aeb2627 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 21:10:25 -0500
Subject: [PATCH 3/4] Track Xamarin.Android.Tools.AndroidSdk with Maestro

---
 NuGet.config                                     | 2 --
 eng/Version.Details.xml                          | 4 ++++
 eng/Versions.props                               | 1 +
 src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 02768ab104..d060e04ff3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -20,8 +20,6 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-diagnostics-tests" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-diagnostics-tests/nuget/v3/index.json" />
-    <!-- android-tools to locate adb -->
-    <add key="Xamarin.Android" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
     <!-- Standard feeds -->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 260c35a22a..24dddd69c8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,6 +9,10 @@
       <Uri>https://github.com/microsoft/clrmd</Uri>
       <Sha>d724947392626b66e39b525998a8817447d50380</Sha>
     </Dependency>
+    <Dependency Name="Xamarin.Android.Tools.AndroidSdk" Version="1.0.105-preview.225">
+      <Uri>https://github.com/dotnet/android</Uri>
+      <Sha>bf304cf475308547a2a1a342bb9f2e6825cc33cd</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25351.106">
diff --git a/eng/Versions.props b/eng/Versions.props
index 8e96ea5ed8..e01e55b9a4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -72,6 +72,7 @@
     <cdbsosversion>10.0.26100.1</cdbsosversion>
     <NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.622304</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
+    <XamarinAndroidToolsAndroidSdkVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkVersion>
     <!-- Roslyn and analyzers -->
     <!-- dotnet/roslyn dependencies -->
     <!--
diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
index 56d8e00eaf..ebed4febb6 100644
--- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
+++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
-    <PackageReference Include="Xamarin.Android.Tools.AndroidSdk" Version="[1.1.76, ]" />
+    <PackageReference Include="Xamarin.Android.Tools.AndroidSdk" Version="$(XamarinAndroidToolsAndroidSdkVersion)" />
   </ItemGroup>
 
 </Project>

From c208716971af391fea488e5377e9b04706aa682d Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 24 Jul 2025 10:29:50 -0500
Subject: [PATCH 4/4] Use AndroidSdkInfo by default, use $ANDROID_HOME in
 messages

---
 src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs | 8 ++++----
 src/Tools/dotnet-dsrouter/Program.cs             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
index c7e22a46af..b9103b77f1 100644
--- a/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
+++ b/src/Tools/dotnet-dsrouter/ADBTcpRouterFactory.cs
@@ -85,8 +85,8 @@ void sdklogger(TraceLevel level, string message)
                 }
             };
 
-            //ANDROID_SDK_ROOT is deprecated
-            string sdkRoot = Environment.GetEnvironmentVariable("ANDROID_HOME") ?? Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT") ?? new AndroidSdkInfo(logger: sdklogger).AndroidSdkPath;
+            // AndroidSdkInfo checks $ANDROID_SDK_ROOT, $ANDROID_HOME, and default locations.
+            string sdkRoot = new AndroidSdkInfo(logger: sdklogger).AndroidSdkPath;
             string adbTool = "adb";
 
             if (!string.IsNullOrEmpty(sdkRoot))
@@ -187,7 +187,7 @@ public override void Start()
                 _ownsPortReverse = false;
                 Logger.LogError("Failed setting up adb port reverse." +
                     " This might lead to problems communicating with Android application." +
-                    " Make sure env variable ANDROID_SDK_ROOT is set and points to an Android SDK." +
+                    " Make sure env variable $ANDROID_HOME is set and points to an Android SDK." +
                     $" Executing with unknown adb status for port {_localPort}.");
                 base.Start();
                 return;
@@ -266,7 +266,7 @@ public override void Start()
                 _ownsPortForward = false;
                 Logger.LogError("Failed setting up adb port forward." +
                     " This might lead to problems communicating with Android application." +
-                    " Make sure env variable ANDROID_SDK_ROOT is set and points to an Android SDK." +
+                    " Make sure env variable $ANDROID_HOME is set and points to an Android SDK." +
                     $" Executing with unknown adb status for port {_localPort}.");
                 return;
             }
diff --git a/src/Tools/dotnet-dsrouter/Program.cs b/src/Tools/dotnet-dsrouter/Program.cs
index 3738e1b876..5449a9dead 100644
--- a/src/Tools/dotnet-dsrouter/Program.cs
+++ b/src/Tools/dotnet-dsrouter/Program.cs
@@ -289,7 +289,7 @@ private static Command AndroidRouterCommand()
         private static readonly Option<string> ForwardPortOption =
             new("--forward-port", "-fp")
             {
-                Description = "Enable port forwarding, values Android|iOS for TcpClient and only Android for TcpServer. Make sure to set ANDROID_SDK_ROOT before using this option on Android."
+                Description = "Enable port forwarding, values Android|iOS for TcpClient and only Android for TcpServer. For Android, optionally set $ANDROID_HOME to a valid Android SDK path."
             };
 
         private static readonly Option<string> BlockedSignalsOption =