[main] Source code updates from dotnet/dotnet

eng/Version.Details.props

@@ -8,7 +8,7 @@ This file should be imported by eng/Versions.props
     <!-- _git/vs-code-coverage dependencies -->
     <MicrosoftInternalCodeCoveragePackageVersion>18.3.0-preview.25571.1</MicrosoftInternalCodeCoveragePackageVersion>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25567.106</MicrosoftDiagnosticsNETCoreClientPackageVersion>
+    <MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25619.109</MicrosoftDiagnosticsNETCoreClientPackageVersion>
     <!-- dotnet/runtime dependencies -->
     <MicrosoftExtensionsDependencyModelPackageVersion>6.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- dotnet/core-setup 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="feff871cec763e9a9f8e9ace212f0fd6041d479f" BarId="291132" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Internal.CodeCoverage" Version="18.3.0-preview.25571.1">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
       <Sha>4369328a34a179f8bc91d3757d850a1214c72c73</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25567.106">
+    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25619.109">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
+      <Sha>5661a2c0a84a3fd32916395b254ce50e5ad7e9fe</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">

eng/Versions.props

@@ -1,8 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
+
+  <Import Project="Version.Details.props" />
+
   <PropertyGroup Label="Version settings">
-    <!-- This repo version -->
+    <VersionPrefix>18.1.0</VersionPrefix>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration></PreReleaseVersionIteration>
+    <!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
+    <DotNetFinalVersionKind></DotNetFinalVersionKind>
+
     <!--
         Workaround for https://github.com/microsoft/vstest/issues/4544
         Use semantic versioning V1 because V2 will produce version like 17.7.0-preview.23280.1+94103c3f and DTAExecutionHost
@@ -17,14 +23,14 @@
     <VersionPrefix>18.3.0</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
+
   <PropertyGroup Label="Arcade settings">
     <!-- Ensure we use xliff task tool - true is the default but we make it explicit here -->
     <UsingToolXliff>true</UsingToolXliff>
     <!-- Opt-in to Arcade tools for building VSIX projects. -->
     <UsingToolVSSDK>true</UsingToolVSSDK>
-    <!-- Don't allow netstandard1.x dependencies when building from source in this repository. -->
-    <FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
   </PropertyGroup>
+
   <PropertyGroup Label="VSTest dependencies">
     <CoverletCoverageVersion>1.2.0</CoverletCoverageVersion>
     <!--
@@ -71,6 +77,7 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
+
   <PropertyGroup Label="VSTest test settings">
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
     <AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
@@ -112,4 +119,5 @@
     <VSTestConsoleLegacyStableVersion>[15.9.2]</VSTestConsoleLegacyStableVersion>
     <ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
   </PropertyGroup>
+
 </Project>

scripts/test.ps1

@@ -68,8 +68,6 @@ $env:PATH = "$(Split-Path $(Get-DotNetPath));$env:PATH"
 $env:DOTNET_ROOT = Join-Path $env:TP_TOOLS_DIR "dotnet"
 # set the root for x86 runtimes as well
 ${env:DOTNET_ROOT(x86)} = "${env:DOTNET_ROOT}_x86"
-# disable looking up other dotnets in programfiles
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
 
 # Disable first run since we want to control all package sources
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs

@@ -40,7 +40,6 @@ private static void SetDotnetEnvironment()
         // We need to set this to point to our dotnet, because we cannot guarantee what is installed on the machine in Program Files,
         // and we install all the required SDKs and runtimes ourselves in Build.cmd.
 #pragma warning disable RS0030 // Do not used banned APIs
-        Environment.SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
         Environment.SetEnvironmentVariable("DOTNET_ROOT", DotnetDir);
         Environment.SetEnvironmentVariable("DOTNET_ROOT(x86)", Path.Combine(DotnetDir, "dotnet-sdk-x86"));
         Environment.SetEnvironmentVariable("PATH", $"{DotnetDir};{Environment.GetEnvironmentVariable("PATH")}");

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.Windows.cs

@@ -40,7 +40,6 @@ public void Use_EnvironmentVariables(string architectureFrom, string architectur
 
         var environmentVariables = new Dictionary<string, string?>
         {
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
             [$"DOTNET_ROOT_{architectureTo}"] = Path.GetDirectoryName(dotnetPathTo)!,
             ["ExpectedArchitecture"] = architectureTo
         };
@@ -74,7 +73,6 @@ public void TestMethod1()
 
         environmentVariables = new Dictionary<string, string?>
         {
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
             ["DOTNET_ROOT"] = Path.GetDirectoryName(dotnetPathTo),
             ["ExpectedArchitecture"] = architectureTo
         };
@@ -88,7 +86,6 @@ public void TestMethod1()
 
         environmentVariables = new Dictionary<string, string?>
         {
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
             [$"DOTNET_ROOT_{architectureTo}"] = Path.GetDirectoryName(dotnetPathTo),
             ["DOTNET_ROOT"] = "WE SHOULD PICK THE ABOVE ONE BEFORE FALLBACK TO DOTNET_ROOT",
             ["ExpectedArchitecture"] = architectureTo

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs

@@ -53,8 +53,7 @@ public void GlobalInstallation()
 
         var env = new Dictionary<string, string?>
             {
-                { "DOTNET_ROOT", null },
-                { "DOTNET_MULTILEVEL_LOOKUP", "0" }
+                { "DOTNET_ROOT", null }
             };
 
         // Verify native architecture
@@ -107,8 +106,7 @@ public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX6
 
         var env = new Dictionary<string, string?>
         {
-            ["DOTNET_ROOT"] = null,
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+            ["DOTNET_ROOT"] = null
         };
 
         var projectName = "ArchitectureSwitch.csproj";
@@ -130,7 +128,6 @@ public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX6
 
         env.Clear();
         env["DOTNET_ROOT"] = null;
-        env["DOTNET_MULTILEVEL_LOOKUP"] = "0";
         if (dotnetRoot)
         {
             env["DOTNET_ROOT"] = s_privateX64Installation;
@@ -170,8 +167,7 @@ public void PrivateX64BuildToGlobalArmInstallation()
 
         var env = new Dictionary<string, string?>
         {
-            ["DOTNET_ROOT"] = null,
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+            ["DOTNET_ROOT"] = null
         };
         string privateInstallationMuxer = Path.Combine(s_privateX64Installation, GetMuxerName);
 
@@ -214,8 +210,7 @@ public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot,
 
         var env = new Dictionary<string, string?>
         {
-            ["DOTNET_ROOT"] = null,
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+            ["DOTNET_ROOT"] = null
         };
         string privateInstallationMuxer = Path.Combine(s_privateX64Installation, GetMuxerName);
 
@@ -231,7 +226,6 @@ public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot,
 
         env.Clear();
         env["DOTNET_ROOT"] = null;
-        env["DOTNET_MULTILEVEL_LOOKUP"] = "0";
         if (dotnetRoot)
         {
             env["DOTNET_ROOT"] = GetDefaultLocation;
@@ -275,8 +269,7 @@ public void SilentlyForceX64()
 
         var env = new Dictionary<string, string?>
         {
-            ["DOTNET_ROOT"] = null,
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+            ["DOTNET_ROOT"] = null
         };
         ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework {GetFrameworkVersionToForceToX64}", out string stdOut, out _, out _, env, projectDirectory);
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs

@@ -38,7 +38,6 @@ public void VerifyHostArchitecture(string architecture)
 
         var environmentVariables = new Dictionary<string, string?>
         {
-            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
             ["ExpectedArchitecture"] = architecture
         };
 

test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs

@@ -808,8 +808,6 @@ private static void ExecutePatchedDotnet(string command, string args, out string
     {
         environmentVariables ??= new();
 
-        environmentVariables["DOTNET_MULTILEVEL_LOOKUP"] = "0";
-
         var executablePath = OSUtils.IsWindows ? @"dotnet.exe" : @"dotnet";
         var patchedDotnetPath = Path.GetFullPath(Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, "artifacts", "tmp", ".dotnet", executablePath));
         ExecuteApplication(patchedDotnetPath, string.Join(" ", command, args), out stdOut, out stdError, out exitCode, environmentVariables, workingDirectory);