Small engineering and test updates

1) Update to 2.1.503 SDK/2.1.7 runtime.
2) Test against 2.2 instead of 2.0
3) Push test logs on public ci

(work originally mikem, I just split his mega-commit so history would be a little more understandable)

diff --git a/README.md b/README.md
index c9953615893ae89de639f7e9e42bb8cb4985e278..29bd5762be889ff242e7f0ce769ab773f4d12d29 100644 (file)
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ Symbol server support - The `setsymbolserver` command enables downloading the sy
 
 ## Build Status
 
-[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/diagnostics/public-ci?branchName=master)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=72&branchName=master)
+[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/diagnostics/diagnostics-public-ci?branchName=master)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=72&branchName=master)
 
 [//]: # (End current test results)
 

diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd
index 65d8578a95e20c28544c584d0b50d08cc94994fd..a810a095ba93b1bb90c6b7e7401e40274ce2ed0d 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.401\MSBuild.dll
+set __MSBuildPath=%__ProjectDir%\.dotnet\sdk\2.1.503\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.3
+set __DotNetRuntimeVersion=2.1.7
 
 REM =========================================================================================
 REM ===

diff --git a/eng/Versions.props b/eng/Versions.props
index 76afd41f17a21e18c9172a15fe65e98185565cc4..588379b525c4fd804bb9541e0471d0b62feebbc4 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
     <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
 
     <!-- Other libs -->
-    <MicrosoftSymbolStoreVersion>1.0.0-dev-63604-01</MicrosoftSymbolStoreVersion>
+    <MicrosoftSymbolStoreVersion>1.0.0-dev-63716-01</MicrosoftSymbolStoreVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/eng/build-native.sh b/eng/build-native.sh
index dca44b57b854fd937a7405797cb6c5ac7d2cef7b..deb6c858c6120e9e3f83004069fdfc0589294d8a 100755 (executable)
--- a/eng/build-native.sh
+++ b/eng/build-native.sh
@@ -285,8 +285,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.401/MSBuild.dll
-__DotNetRuntimeVersion=2.1.3
+__MSBuildPath=$__ProjectRoot/.dotnet/sdk/2.1.503/MSBuild.dll
+__DotNetRuntimeVersion=2.1.7
 
 if [ ! -e $__DotNetCli ]; then
    echo "dotnet cli not installed $__DotNetCli"

diff --git a/eng/build.yml b/eng/build.yml
index fa582628e6ff720011c68715908f03b19942ebff..1191f4b6e723a15ecfaef60bf6d70a92705ebc57 100644 (file)
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -135,20 +135,20 @@ phases:
           artifactName: $(_PhaseName)_$(Agent.JobName)
         condition: and(succeeded(), ne(variables['_PublishArtifacts'], ''))
 
-      - task: CopyFiles@2
-        displayName: Gather Build Logs
-        inputs:
-          sourceFolder: '$(Build.SourcesDirectory)/artifacts'
-          contents: '?(log|TestResults)/**'
-          targetFolder: '$(Build.StagingDirectory)/BuildLogs'
-        continueOnError: true
-        condition: always()
+    - task: CopyFiles@2
+      displayName: Gather Build Logs
+      inputs:
+        sourceFolder: '$(Build.SourcesDirectory)/artifacts'
+        contents: '?(log|TestResults)/**'
+        targetFolder: '$(Build.StagingDirectory)/BuildLogs'
+      continueOnError: true
+      condition: always()
 
-      - task: PublishBuildArtifacts@1
-        displayName: Publish Logs to VSTS
-        inputs:
-          PathtoPublish: '$(Build.StagingDirectory)/BuildLogs'
-          PublishLocation: Container
-          ArtifactName: Logs_$(_PhaseName)_$(Agent.JobName)
-        continueOnError: true
-        condition: always()
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Logs to VSTS
+      inputs:
+        PathtoPublish: '$(Build.StagingDirectory)/BuildLogs'
+        PublishLocation: Container
+        ArtifactName: Logs_$(_PhaseName)_$(Agent.JobName)
+      continueOnError: true
+      condition: always()

diff --git a/eng/install-test-runtimes.ps1 b/eng/install-test-runtimes.ps1
index 20e7a33c550520d6badd94a85d91cbdac29190c8..42bf6d3d98dc5d0ed630d2000a1b4398e5742fb5 100644 (file)
--- a/eng/install-test-runtimes.ps1
+++ b/eng/install-test-runtimes.ps1
@@ -12,16 +12,16 @@ param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference="Stop"
 
-$RuntimeVersion11="1.1.9"
-$RuntimeVersion20="2.0.9"
+$RuntimeVersion11="1.1.10"
+$RuntimeVersion22="2.2.1"
 $DailyTestText="true"
 
-# Install the other versions of .NET Core runtime we are going to test. 1.1.x, 2.0.x, 2.1.x (installed with the CLI)
+# 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
 # and latest. Only install the latest master for daily jobs and leave the RuntimeVersion* config properties blank.
 if (!$DailyTest) {
     $DailyTestText="false"
     . $DotNetDir\dotnet-install.ps1 -Version $RuntimeVersion11 -Architecture $BuildArch -SkipNonVersionedFiles -Runtime dotnet -InstallDir $DotNetDir
-    . $DotNetDir\dotnet-install.ps1 -Version $RuntimeVersion20 -Architecture $BuildArch -SkipNonVersionedFiles -Runtime dotnet -InstallDir $DotNetDir
+    . $DotNetDir\dotnet-install.ps1 -Version $RuntimeVersion22 -Architecture $BuildArch -SkipNonVersionedFiles -Runtime dotnet -InstallDir $DotNetDir
 }
 
 . $DotNetDir\dotnet-install.ps1 -Channel $Branch -Version latest -Architecture $BuildArch -SkipNonVersionedFiles -Runtime dotnet -InstallDir $DotNetDir
@@ -43,8 +43,8 @@ if (Test-Path $VersionFile) {
     '<Configuration>
 <DailyTest>' + $DailyTestText  +'</DailyTest>
 <RuntimeVersion11>' + $RuntimeVersion11 + '</RuntimeVersion11>
-<RuntimeVersion20>' + $RuntimeVersion20 + '</RuntimeVersion20>
 <RuntimeVersion21>' + $RuntimeVersion21 + '</RuntimeVersion21>
+<RuntimeVersion22>' + $RuntimeVersion22 + '</RuntimeVersion22>
 <RuntimeVersionLatest>' + $RuntimeVersionLatest + '</RuntimeVersionLatest>
 </Configuration>' | Set-Content $ConfigFile
 

diff --git a/eng/install-test-runtimes.sh b/eng/install-test-runtimes.sh
index 2edf1b0f38840b8a63660876df78faa0d3bcb165..41151ac8ace77a69a3b142c04c490733f9b040f0 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.9"
-runtime_version_20="2.0.9"
+runtime_version_11="1.1.10"
+runtime_version_22="2.2.1"
 runtime_version_21=
 
 while [ $# -ne 0 ]; do
@@ -48,12 +48,12 @@ done
 
 daily_test_text="true"
 
-# Install the other versions of .NET Core runtime we are going to test. 1.1.x, 2.0.x, 2.1.x (installed with the CLI)
+# 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
 # and latest. Only install the latest master for daily jobs and leave the RuntimeVersion* config properties blank.
 if [ $daily_test == 0 ]; then
     daily_test_text="false"
     bash "$dotnet_dir/dotnet-install.sh" --version "$runtime_version_11" --architecture "$build_arch" --skip-non-versioned-files --runtime dotnet --install-dir "$dotnet_dir"
-    bash "$dotnet_dir/dotnet-install.sh" --version "$runtime_version_20" --architecture "$build_arch" --skip-non-versioned-files --runtime dotnet --install-dir "$dotnet_dir"
+    bash "$dotnet_dir/dotnet-install.sh" --version "$runtime_version_22" --architecture "$build_arch" --skip-non-versioned-files --runtime dotnet --install-dir "$dotnet_dir"
 fi
 
 bash "$dotnet_dir/dotnet-install.sh" --channel $branch --version latest --architecture "$build_arch" --skip-non-versioned-files --runtime dotnet --install-dir "$dotnet_dir"
@@ -78,8 +78,8 @@ if [ -f "$version_file" ]; then
     echo "<Configuration>
 <DailyTest>$daily_test_text</DailyTest>
 <RuntimeVersion11>$runtime_version_11</RuntimeVersion11>
-<RuntimeVersion20>$runtime_version_20</RuntimeVersion20>
 <RuntimeVersion21>$runtime_version_21</RuntimeVersion21>
+<RuntimeVersion22>$runtime_version_22</RuntimeVersion22>
 <RuntimeVersionLatest>$runtime_version_latest</RuntimeVersionLatest>
 </Configuration>" > $config_file
 

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

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 24999e271197bfe09a4e2be3f5326c5520d66446..781b4e8048b697ccdd97f54b299b67d493880d63 100644 (file)
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -9,10 +9,7 @@
 
   <PropertyGroup>
     <LangVersion>Latest</LangVersion>
-    <!--
-      Tools and packages produced by this repository support infrastructure and are not shipping on NuGet or via any other official channel.
-    -->
-    <IsShipping>false</IsShipping>
+    <IsShipping>true</IsShipping>
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
 
@@ -24,11 +21,11 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DebugType>full</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net45'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net461'">
     <DebugType>portable</DebugType>
   </PropertyGroup>
 </Project>