Misc changes.

Update setup-vs-tools.cmd for 2019.

Updated to build/test with the 2.1.505 SDK with the 2.1.9 runtime.

Updated to test against 1.1.11 and 2.2.2 also.

diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd
index e847566b0160e9770bbc43305c8d89011f7c81b2..a72be3a4bc6f5e405cb24b62477b5f47866b25c2 100644 (file)
--- a/eng/Build-Native.cmd
+++ b/eng/Build-Native.cmd
@@ -172,13 +172,13 @@ if not exist "%__DotNetCli%" (
     echo %__MsgPrefix%Assertion failed: dotnet cli not found at path "%__DotNetCli%"
     exit /b 1
 )
-set __MSBuildPath=%__ProjectDir%\.dotnet\sdk\2.1.503\MSBuild.dll
+set __MSBuildPath=%__ProjectDir%\.dotnet\sdk\2.1.505\MSBuild.dll
 if not exist "%__MSBuildPath%" (
     echo %__MsgPrefix%Assertion failed: dotnet cli sdk not found at path "%__MSBuildPath%"
     exit /b 1
 )
 
-set __DotNetRuntimeVersion=2.1.7
+set __DotNetRuntimeVersion=2.1.9
 
 REM =========================================================================================
 REM ===

diff --git a/eng/build-native.sh b/eng/build-native.sh
index e2c623474e9745cce94488d5c996ed088c9f48a2..4b694a5a1240cdd8d6aefdc28e35016ec1da81e5 100755 (executable)
--- a/eng/build-native.sh
+++ b/eng/build-native.sh
@@ -267,8 +267,8 @@ __ResultsDir=$__RootBinDir/TestResults/$__BuildType
 __PackagesBinDir=$__RootBinDir/packages/$__BuildType/Shipping
 __ExtraCmakeArgs="-DCLR_MANAGED_BINARY_DIR=$__RootBinDir/bin -DCLR_BUILD_TYPE=$__BuildType"
 __DotNetCli=$__ProjectRoot/.dotnet/dotnet
-__MSBuildPath=$__ProjectRoot/.dotnet/sdk/2.1.503/MSBuild.dll
-__DotNetRuntimeVersion=2.1.7
+__MSBuildPath=$__ProjectRoot/.dotnet/sdk/2.1.505/MSBuild.dll
+__DotNetRuntimeVersion=2.1.9
 
 if [ ! -e $__DotNetCli ]; then
    echo "dotnet cli not installed $__DotNetCli"

diff --git a/eng/install-test-runtimes.ps1 b/eng/install-test-runtimes.ps1
index 42bf6d3d98dc5d0ed630d2000a1b4398e5742fb5..aa636ed50e98c69bab7d57b1896c0045305c748c 100644 (file)
--- a/eng/install-test-runtimes.ps1
+++ b/eng/install-test-runtimes.ps1
@@ -12,8 +12,8 @@ param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference="Stop"
 
-$RuntimeVersion11="1.1.10"
-$RuntimeVersion22="2.2.1"
+$RuntimeVersion11="1.1.11"
+$RuntimeVersion22="2.2.2"
 $DailyTestText="true"
 
 # Install the other versions of .NET Core runtime we are going to test. 1.1.x, 2.1.x (installed with the CLI), 2.2.x

diff --git a/eng/install-test-runtimes.sh b/eng/install-test-runtimes.sh
index 41151ac8ace77a69a3b142c04c490733f9b040f0..dc902a4e9b76bd50ccc9f2c9b66fff23cd4f5b3e 100755 (executable)
--- a/eng/install-test-runtimes.sh
+++ b/eng/install-test-runtimes.sh
@@ -9,8 +9,8 @@ daily_test=0
 branch="master"
 uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
 
-runtime_version_11="1.1.10"
-runtime_version_22="2.2.1"
+runtime_version_11="1.1.11"
+runtime_version_22="2.2.2"
 runtime_version_21=
 
 while [ $# -ne 0 ]; do

diff --git a/eng/setup-vs-tools.cmd b/eng/setup-vs-tools.cmd
index 9af06e5bdd1d0e9916e74bf20f22b906b4933c20..24e8b230cab8a5d93da23f8ea3ec0d106623fc6f 100644 (file)
--- a/eng/setup-vs-tools.cmd
+++ b/eng/setup-vs-tools.cmd
@@ -1,42 +1,36 @@
 @if not defined _echo @echo off
 
-REM This script is responsible for setting up either the vs2015 or vs2017 env
+REM This script is responsible for setting up the vs2017 or vs2019 env
 REM All passed arguments are ignored
 REM Script will return with 0 if pass, 1 if there is a failure to find either
-REM vs2015 or vs2017
+REM vs2017 or vs2019
 
 :: Default to highest Visual Studio version available
 ::
-:: For VS2015 (and prior), only a single instance is allowed to be installed on a box
-:: and VS140COMNTOOLS is set as a global environment variable by the installer. This
-:: allows users to locate where the instance of VS2015 is installed.
-::
-:: For VS2017, multiple instances can be installed on the same box SxS and VS150COMNTOOLS
+:: For VS2017 and later, multiple instances can be installed on the same box SxS and VS1*0COMNTOOLS
 :: is no longer set as a global environment variable and is instead only set if the user
-:: has launched the VS2017 Developer Command Prompt.
+:: has launched the Visual Studio Developer Command Prompt.
 ::
-:: Following this logic, we will default to the VS2017 toolset if VS150COMNTOOLS tools is
-:: set, as this indicates the user is running from the VS2017 Developer Command Prompt and
-:: is already configured to use that toolset. Otherwise, we will fallback to using the VS2015
-:: toolset if it is installed. Finally, we will fail the script if no supported VS instance
-:: can be found.
+:: Following this logic, we will default to the Visual Studio toolset assocated with the active
+:: Developer Command Prompt. Otherwise, we will query VSWhere to locate the later version of
+:: Visual Studio available on the machine. Finally, we will fail the script if not supported
+:: instance can be found.
 
 if defined VisualStudioVersion (
     if not defined __VSVersion echo %__MsgPrefix%Detected Visual Studio %VisualStudioVersion% developer command ^prompt environment
     goto skip_setup
 )
 
-echo %__MsgPrefix%Searching ^for Visual Studio 2017 or 2015 installation
+echo %__MsgPrefix%Searching ^for Visual Studio 2017 or later installation
 set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if exist %_VSWHERE% (
     for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
     goto call_vs
 )
-if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
-echo VS2017 not found, using VS2015
+echo Visual Studio 2017 or later not found
 :call_vs
 if not exist "%_VSCOMNTOOLS%" (
-    echo %__MsgPrefix%Error: Visual Studio 2015 or 2017 required.
+    echo %__MsgPrefix%Error: Visual Studio 2017 or 2019 required.
     echo        Please see https://github.com/dotnet/coreclr/blob/master/Documentation/building/windows-instructions.md for build instructions.
     exit /b 1
 )
@@ -45,4 +39,4 @@ call "%_VSCOMNTOOLS%\VsDevCmd.bat"
 
 :skip_setup
 
-exit /b 0
\ No newline at end of file
+exit /b 0

diff --git a/global.json b/global.json
index 0ae51c08c4f548669c20c17c35bc64812378a760..85b5e1b0d18cb93d3bf878f5ae1b62be3ce6c6c4 100644 (file)
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "2.1.503"
+    "dotnet": "2.1.505"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18516.5"