From ffc72793692f22f1f46a48e0174125b9fc9bf0b6 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
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 313ea172cc8..e0d5805ad13 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,7 +10,6 @@
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
<add key="darc-pub-aspnet-Extensions-1286a6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-1286a6ff/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
- <add key="aspnetcore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.102-servicing-014873/nuget/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
diff --git a/build.ps1 b/build.ps1
index 4ea50f51578..c515a84af5b 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 775200a963c..05e16283682 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 410f43c329d..b31b8106207 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)"
--
GitLab