diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a30ea9f0a474..6dda64455e23 100644 --- a/.devcontainer/devcontainer.json +++ b/.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" }, diff --git a/activate.ps1 b/activate.ps1 index c780fca16fff..72e950eafc87 100644 --- a/activate.ps1 +++ b/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}" diff --git a/activate.sh b/activate.sh index 4986e1b297f5..8108b9849db2 100755 --- a/activate.sh +++ b/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" diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 41ee19221222..d3bf0aa0e7cd 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,98 +6,98 @@ This file should be imported by eng/Versions.props - 10.0.2-servicing.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 11.0.0-beta.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.2-servicing.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 3.3.0-preview.25576.105 - 7.0.0-preview.1.7705 - 7.0.0-preview.1.7705 - 7.0.0-preview.1.7705 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 - 10.0.0-rc.3.25576.105 + 10.0.2-servicing.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.2-servicing.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 3.3.0-preview.25603.106 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 4.13.0-3.24613.7 4.13.0-3.24613.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b9fd307050b..4995f2887101 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - 305623c3cd0df455e01b95ed3a8c347e650b315f + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbd..1556562c68f0 100644 --- a/eng/common/tools.ps1 +++ b/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 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0f..6c121300ac7d 100755 --- a/eng/common/tools.sh +++ b/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 diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 8fd9e85596ce..f54dccdeeb61 100644 --- a/eng/helix/content/runtests.cmd +++ b/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. diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index ba9ce79418ef..db9c42884862 100644 --- a/eng/helix/content/runtests.sh +++ b/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. diff --git a/global.json b/global.json index 99f92afcbea9..4b43c2e5cae2 100644 --- a/global.json +++ b/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" diff --git a/src/ProjectTemplates/scripts/startvs.cmd b/src/ProjectTemplates/scripts/startvs.cmd index 7a18c1f525bf..4dffa6191c92 100644 --- a/src/ProjectTemplates/scripts/startvs.cmd +++ b/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% diff --git a/startvs.cmd b/startvs.cmd index 93cbc52d6c4a..0546b4d68225 100644 --- a/startvs.cmd +++ b/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% diff --git a/startvscode.cmd b/startvscode.cmd index c609b5cea6eb..8f34fc2afb35 100644 --- a/startvscode.cmd +++ b/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% diff --git a/startvscode.sh b/startvscode.sh index d6328dfb5967..2dda06c0cefd 100755 --- a/startvscode.sh +++ b/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"