[main] Source code updates from dotnet/dotnet

eng/Version.Details.props

@@ -10,7 +10,7 @@ This file should be imported by eng/Versions.props
     <!-- dotnet-core-setup dependencies -->
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <!-- dotnet-dotnet dependencies -->
-    <MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.26157.103</MicrosoftDiagnosticsNETCoreClientPackageVersion>
+    <MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.26165.107</MicrosoftDiagnosticsNETCoreClientPackageVersion>
     <!-- dotnet-runtime dependencies -->
     <MicrosoftExtensionsDependencyModelPackageVersion>6.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- dotnet-symreader-converter dependencies -->

eng/Version.Details.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="ee56b9a0106c983775a0691bde4a4a988f4351d3" BarId="305114" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="5ff448a6425ec6980e08b5c9a35e454c8a843c35" BarId="306238" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Internal.CodeCoverage" Version="18.6.0-preview.26156.6">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
       <Sha>82ffff0e0402fe4e9ac7e101132617e12df660f8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.26157.103">
+    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.26165.107">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
+      <Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.2">

src/Microsoft.TestPlatform.Build/Tasks/TestTaskUtils.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using Microsoft.Build.Utilities;
 
@@ -237,4 +238,16 @@ public static string CreateCommandLineArguments(ITestTask task)
 
         return builder.ToString();
     }
+
+    /// <summary>
+    /// Resolves the full path to the dotnet host from the DOTNET_HOST_PATH environment variable.
+    /// </summary>
+    /// <returns>
+    /// The resolved full path to the dotnet host, or <see langword="null"/> if the variable is not set or empty.
+    /// </returns>
+    internal static string? ResolveDotnetPath()
+    {
+        var dotnetHostPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH");
+        return StringUtils.IsNullOrEmpty(dotnetHostPath) ? null : Path.GetFullPath(dotnetHostPath);
+    }
 }

src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs

@@ -15,8 +15,6 @@ public class VSTestTask : Task, ITestTask
 {
     private int _activeProcessId;
 
-    private const string DotnetExe = "dotnet";
-
     [Required]
     public ITaskItem? TestFileFullPath { get; set; }
     public string? VSTestSetting { get; set; }
@@ -73,7 +71,7 @@ public override bool Execute()
 
         var processInfo = new ProcessStartInfo
         {
-            FileName = DotnetExe,
+            FileName = TestTaskUtils.ResolveDotnetPath() ?? "dotnet",
             Arguments = TestTaskUtils.CreateCommandLineArguments(this),
             UseShellExecute = false,
         };

src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -282,37 +281,7 @@ private bool TryGetMessage(string singleLine, out string name, out string?[] dat
 
     protected override string? GenerateFullPathToTool()
     {
-        if (!ToolPath.IsNullOrEmpty())
-        {
-            return Path.Combine(Path.GetDirectoryName(Path.GetFullPath(ToolPath))!, ToolExe);
-        }
-
-        //TODO: https://github.com/dotnet/sdk/issues/20 Need to get the dotnet path from MSBuild?
-
-        var dhp = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH");
-        if (!dhp.IsNullOrEmpty())
-        {
-            var path = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(dhp))!, ToolExe);
-            if (File.Exists(path))
-            {
-                return path;
-            }
-        }
-
-        if (File.Exists(ToolExe))
-        {
-            return Path.GetFullPath(ToolExe);
-        }
-
-        var values = Environment.GetEnvironmentVariable("PATH");
-        foreach (var p in values!.Split(Path.PathSeparator))
-        {
-            var fullPath = Path.Combine(p, ToolExe);
-            if (File.Exists(fullPath))
-                return fullPath;
-        }
-
-        return null;
+        return TestTaskUtils.ResolveDotnetPath();
     }
 
     /// <summary>