From ffc72793692f22f1f46a48e0174125b9fc9bf0b6 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 19 Feb 2020 11:17:10 -0800 Subject: [PATCH] Use RTM version of the SDK (#19130) --- NuGet.config | 1 - build.ps1 | 6 ------ build.sh | 5 ----- global.json | 4 ++-- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 313ea172cc..e0d5805ad1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/build.ps1 b/build.ps1 index 4ea50f5157..c515a84af5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -362,12 +362,6 @@ try { $toolsetBuildProj = InitializeToolset - $dotnetInstallDir = Join-Path $RepoRoot ".dotnet" - $sdkPath = [IO.Path]::Combine($dotnetInstallDir, 'sdk', '3.1.102') - if (!(Test-Path $sdkPath)) { - InstallDotNetSdk $dotnetInstallDir '3.1.102-servicing-014873' -skipNonVersionedFiles $true - } - $restore = $tmpRestore if ($ci) { diff --git a/build.sh b/build.sh index 775200a963..05e1628368 100755 --- a/build.sh +++ b/build.sh @@ -316,11 +316,6 @@ restore=true InitializeToolset -dotnet_install_dir="$repo_root/.dotnet" -if [[ ! -d "$dotnet_install_dir/sdk/3.1.102" ]]; then - InstallDotNetSdk "$dotnet_install_dir" "3.1.102-servicing-014873" -fi - restore=$_tmp_restore= if [ "$build_repo_tasks" = true ]; then diff --git a/global.json b/global.json index 410f43c329..b31b810620 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.101" + "version": "3.1.102" }, "tools": { - "dotnet": "3.1.101", + "dotnet": "3.1.102", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)"