From c449a1e6103ab251f2624dea664952da811e9c48 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Tue, 9 Jun 2020 12:04:02 +0200 Subject: [PATCH] Update feeds --- NuGet.config | 2 ++ global.json | 4 ++-- scripts/build.ps1 | 2 +- scripts/build.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15e1ddd568..b98ec75cd0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + + diff --git a/global.json b/global.json index 301cd03aa1..9472a35fce 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "sdk": { - "version": "3.1.101", + "version": "3.1.300", "rollForward": "minor", "allowPrerelease": false, "architecture": "x64" }, "tools": { - "dotnet": "3.1.101" + "dotnet": "3.1.300" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3", diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 9a6fcf9ff5..19e760fd24 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -82,7 +82,7 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 # Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712 $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR $env:NUGET_EXE_Version = "3.4.3" -$env:DOTNET_CLI_VERSION = "3.1.101" +$env:DOTNET_CLI_VERSION = "3.1.300" # $env:DOTNET_RUNTIME_VERSION = "LATEST" $env:VSWHERE_VERSION = "2.0.2" $env:MSBUILD_VERSION = "15.0" diff --git a/scripts/build.sh b/scripts/build.sh index 009b5c3d82..84694df7a1 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -111,7 +111,7 @@ VERSION=$(test -z $VERSION && grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/Te export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712 export NUGET_PACKAGES=$TP_PACKAGES_DIR -DOTNET_CLI_VERSION="3.1.101" +DOTNET_CLI_VERSION="3.1.300" #DOTNET_RUNTIME_VERSION="LATEST" #