From: noahfalk Date: Tue, 5 Feb 2019 07:56:30 +0000 (-0800) Subject: Small engineering and test updates X-Git-Tag: submit/tizen/20190813.035844~58^2~2^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e1b71ff99001dd4a09fd9896af2160e9196ee18;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git 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 c99536158..29bd5762b 100644 --- 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 65d8578a9..a810a095b 100644 --- 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 76afd41f1..588379b52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ 4.3.0 - 1.0.0-dev-63604-01 + 1.0.0-dev-63716-01 diff --git a/eng/build-native.sh b/eng/build-native.sh index dca44b57b..deb6c858c 100755 --- 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 fa582628e..1191f4b6e 100644 --- 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 20e7a33c5..42bf6d3d9 100644 --- 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) { ' ' + $DailyTestText +' ' + $RuntimeVersion11 + ' -' + $RuntimeVersion20 + ' ' + $RuntimeVersion21 + ' +' + $RuntimeVersion22 + ' ' + $RuntimeVersionLatest + ' ' | Set-Content $ConfigFile diff --git a/eng/install-test-runtimes.sh b/eng/install-test-runtimes.sh index 2edf1b0f3..41151ac8a 100755 --- 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 " $daily_test_text $runtime_version_11 -$runtime_version_20 $runtime_version_21 +$runtime_version_22 $runtime_version_latest " > $config_file diff --git a/global.json b/global.json index a4abdd630..0ae51c08c 100644 --- 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 24999e271..781b4e804 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,10 +9,7 @@ Latest - - false + true true @@ -24,11 +21,11 @@ false - + full - + portable