diff --git a/NuGet.config b/NuGet.config index 313ea172cc8c4857923a9aa5f68fdab88bfac42d..e0d5805ad130dfc8621ceba95151a376e00db16a 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 4ea50f51578c7f5a5facf51668ce5ea7f681985a..c515a84af5b3208ff5a19fa8479b9fea18c35e8a 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 775200a963c7a603a8ce8cdd4adc6ce28ff49586..05e1628368236bc17ac2b3e2ff9dcbec68622dbd 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 410f43c329d26adc4eb06197253c17a27b2e4e5f..b31b8106207d4dd9770b85ec7d519a16344b81a4 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)"