[main] Source code updates from dotnet/dotnet

.devcontainer/devcontainer.json

@@ -31,7 +31,6 @@
   // This is needed so that things like the C# extension can resolve the correct SDK version
   "remoteEnv": {
     "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
-    "DOTNET_MULTILEVEL_LOOKUP": "0",
     "TARGET": "net10.0",
     "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
   },

activate.ps1

@@ -26,7 +26,6 @@ function deactivate ([switch]$init) {
 
     Remove-Item env:DOTNET_ROOT -ea ignore
     Remove-Item 'env:DOTNET_ROOT(x86)' -ea Ignore
-    Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ea ignore
     if (-not $init) {
         # Remove the deactivate function
         Remove-Item function:deactivate
@@ -40,8 +39,6 @@ $_OLD_PATH = $env:PATH
 # Tell dotnet where to find itself
 $env:DOTNET_ROOT = "$PSScriptRoot\.dotnet"
 ${env:DOTNET_ROOT(x86)} = "$PSScriptRoot\.dotnet\x86"
-# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
 # Put dotnet first on PATH
 $env:PATH = "${env:DOTNET_ROOT};${env:PATH}"
 

activate.sh

@@ -53,7 +53,6 @@ deactivate () {
     fi
 
     unset DOTNET_ROOT
-    unset DOTNET_MULTILEVEL_LOOKUP
     if [ ! "${1:-}" = "init" ] ; then
         # Remove the deactivate function
         unset -f deactivate
@@ -67,8 +66,6 @@ DIR="$( cd "$( dirname "$THIS_SCRIPT" )" && pwd )"
 _OLD_PATH="$PATH"
 # Tell dotnet where to find itself
 export DOTNET_ROOT="$DIR/.dotnet"
-# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
-export DOTNET_MULTILEVEL_LOOKUP=0
 # Put dotnet first on PATH
 export PATH="$DOTNET_ROOT:$PATH"
 

eng/common/tools.ps1

@@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
     return $global:_DotNetInstallDir
   }
 
-  # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
-  $env:DOTNET_MULTILEVEL_LOOKUP=0
-
   # Disable first run since we do not need all ASP.NET packages restored.
   $env:DOTNET_NOLOGO=1
 
@@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
   Write-PipelinePrependPath -Path $dotnetRoot
 
-  Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
   Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
 
   return $global:_DotNetInstallDir = $dotnetRoot

eng/common/tools.sh

@@ -115,9 +115,6 @@ function InitializeDotNetCli {
 
   local install=$1
 
-  # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
-  export DOTNET_MULTILEVEL_LOOKUP=0
-
   # Disable first run since we want to control all package sources
   export DOTNET_NOLOGO=1
 
@@ -166,7 +163,6 @@ function InitializeDotNetCli {
   # build steps from using anything other than what we've downloaded.
   Write-PipelinePrependPath -path "$dotnet_root"
 
-  Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
   Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
 
   # return value

eng/helix/content/runtests.cmd

@@ -12,7 +12,6 @@ set $installPlaywright=%7
 REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
 
 set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-set DOTNET_MULTILEVEL_LOOKUP=0
 set PLAYWRIGHT_BROWSERS_PATH=%CD%\ms-playwright
 
 REM Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.

eng/helix/content/runtests.sh

@@ -9,8 +9,6 @@ YELLOW="\033[0;33m"
 MAGENTA="\033[0;95m"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# Prevent fallback to global .NET locations. This ensures our tests use the shared frameworks we specify and don't rollforward to something else that might be installed on the machine
-export DOTNET_MULTILEVEL_LOOKUP=0
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.

global.json

@@ -32,9 +32,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25576.105",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25576.105",
-    "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25576.105",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.106",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.106",
+    "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25603.106",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

src/ProjectTemplates/scripts/startvs.cmd

@@ -7,9 +7,6 @@ SETLOCAL
 SET DOTNET_ROOT=%~dp0\.dotnet
 SET DOTNET_ROOT(x86)=%~dp0\.dotnet\x86
 
-:: This tells .NET not to go looking for .NET in other places
-SET DOTNET_MULTILEVEL_LOOKUP=0
-
 :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
 SET PATH=%DOTNET_ROOT%;%PATH%
 

startvs.cmd

@@ -7,9 +7,6 @@ SETLOCAL
 SET DOTNET_ROOT=%~dp0.dotnet
 SET DOTNET_ROOT(x86)=%~dp0.dotnet\x86
 
-:: This tells .NET not to go looking for .NET in other places
-SET DOTNET_MULTILEVEL_LOOKUP=0
-
 :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
 SET PATH=%DOTNET_ROOT%;%PATH%
 

startvscode.cmd

@@ -7,9 +7,6 @@ SETLOCAL
 SET DOTNET_ROOT=%~dp0.dotnet
 SET DOTNET_ROOT(x86)=%~dp0.dotnet\x86
 
-:: This tells .NET not to go looking for .NET in other places
-SET DOTNET_MULTILEVEL_LOOKUP=0
-
 :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
 SET PATH=%DOTNET_ROOT%;%PATH%
 

startvscode.sh

@@ -6,9 +6,6 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export DOTNET_ROOT="$DIR/.dotnet"
 
-# This tells .NET not to go looking for .NET in other places
-export DOTNET_MULTILEVEL_LOOKUP=0
-
 # Put our local dotnet on PATH first so Visual Studio knows which one to use
 export PATH="$DOTNET_ROOT:$PATH"