From: Santiago Fernandez Madero Date: Wed, 6 May 2020 10:30:53 +0000 (-0700) Subject: Update arcade from build 20200505.6 (#35871) X-Git-Tag: submit/tizen/20210909.063632~8163 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4acc94752e6115b35adb7cfa5b520cfae0ad85b;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Update arcade from build 20200505.6 (#35871) * Update arcade from build 20200505.6 * Fix package testing, settings.targets where not found due to updated tfm * Stop invoking test target if SkipTests is false in installer Co-authored-by: Viktor Hofer --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d43cde..e5aea70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,61 +6,61 @@ - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 981e1a0b0149281a5994ecddfeb5cfcf002f9f1e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c23c0dd..b8db12d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,17 +57,16 @@ - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 - 5.0.0-beta.20201.2 - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 - 2.5.1-beta.20228.4 - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 - 5.0.0-beta.20228.4 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 2.5.1-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 + 5.0.0-beta.20255.6 5.0.0-preview.4.20202.18 5.0.0-preview.4.20202.18 diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd index 56c2f25..ac1f72b 100644 --- a/eng/common/CIBuild.cmd +++ b/eng/common/CIBuild.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" diff --git a/eng/common/PSScriptAnalyzerSettings.psd1 b/eng/common/PSScriptAnalyzerSettings.psd1 index 4c1ea7c..fc7eafc 100644 --- a/eng/common/PSScriptAnalyzerSettings.psd1 +++ b/eng/common/PSScriptAnalyzerSettings.psd1 @@ -8,4 +8,4 @@ 'PSStandardDSCFunctionsInResource', 'PSUseIdenticalMandatoryParametersForDSC', 'PSUseIdenticalParametersForDSC') -} \ No newline at end of file +} diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh index 1a02c0d..66e3b0a 100755 --- a/eng/common/cibuild.sh +++ b/eng/common/cibuild.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ \ No newline at end of file +. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty index 07d8f88..8aa98a2 100644 --- a/eng/common/cross/arm/sources.list.trusty +++ b/eng/common/cross/arm/sources.list.trusty @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial index eacd86b..56fbb36 100644 --- a/eng/common/cross/arm/sources.list.xenial +++ b/eng/common/cross/arm/sources.list.xenial @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty index 07d8f88..8aa98a2 100644 --- a/eng/common/cross/arm64/sources.list.trusty +++ b/eng/common/cross/arm64/sources.list.trusty @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial index eacd86b..56fbb36 100644 --- a/eng/common/cross/arm64/sources.list.xenial +++ b/eng/common/cross/arm64/sources.list.xenial @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e764..d1b9f5c 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,5 +1,5 @@ param ( - $darcVersion = $null, + $darcVersion = "1.1.0-beta.20255.1", $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null @@ -44,4 +44,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'Darc' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index d981d7b..9e62d08 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash source="${BASH_SOURCE[0]}" -darcVersion='' +darcVersion='1.1.0-beta.20255.1' versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' diff --git a/eng/common/dotnet-install.cmd b/eng/common/dotnet-install.cmd index b1c2642..f74c16c 100644 --- a/eng/common/dotnet-install.cmd +++ b/eng/common/dotnet-install.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 index 0728b1a..bc7ad85 100644 --- a/eng/common/generate-graph-files.ps1 +++ b/eng/common/generate-graph-files.ps1 @@ -83,4 +83,4 @@ catch { ExitWithExitCode 1 } finally { Pop-Location -} \ No newline at end of file +} diff --git a/eng/common/init-tools-native.cmd b/eng/common/init-tools-native.cmd index 438cd54..10938a2 100644 --- a/eng/common/init-tools-native.cmd +++ b/eng/common/init-tools-native.cmd @@ -1,3 +1,3 @@ @echo off powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file +exit /b %ErrorLevel% diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 1a39a7e..f46d5ef 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -4,6 +4,7 @@ net472 false + false diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index c640123..b2dceff 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -23,4 +23,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 \ No newline at end of file +ExitWithExitCode 0 diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh index 12339a4..7d1b713 100755 --- a/eng/common/native/install-cmake-test.sh +++ b/eng/common/native/install-cmake-test.sh @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh index 18041be..aaa3e38 100755 --- a/eng/common/native/install-cmake.sh +++ b/eng/common/native/install-cmake.sh @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index cf5941e..f86c341 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -118,4 +118,4 @@ $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - \ No newline at end of file + diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 1763a1a..a070385 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -3,7 +3,7 @@ Param( [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="netcoreapp5.0", + [string] $Framework="net5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -31,7 +31,8 @@ $HelixSourcePrefix = "pr" $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" -if ($Framework.StartsWith("netcoreapp")) { +# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5. +if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) { $Queue = "Windows.10.Amd64.ClientRS5.Open" } @@ -111,4 +112,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index b9eecf9..34eed8b 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= architecture=x64 -framework=netcoreapp5.0 +framework=net5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh index 33c3f0d..f87f195 100755 --- a/eng/common/pipeline-logging-functions.sh +++ b/eng/common/pipeline-logging-functions.sh @@ -176,4 +176,4 @@ function Write-PipelinePrependPath { if [[ "$ci" == true ]]; then echo "##vso[task.prependpath]$prepend_path" fi -} \ No newline at end of file +} diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 79c25e7..f997be4 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -59,14 +59,15 @@ try { if( $msbuildEngine -eq "vs") { # Ensure desktop MSBuild is available for sdk tasks. - if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) { - $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty + if( -not ($GlobalJson.tools.PSObject.Properties.Name -contains "vs" )) { + $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty } - InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + $global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe" } $taskProject = GetSdkTaskProject $task diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 0c5451c..a8213a5 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml index f877fd7..53be464 100644 --- a/eng/common/templates/job/performance.yml +++ b/eng/common/templates/job/performance.yml @@ -92,4 +92,4 @@ jobs: Creator: $(Creator) WorkItemTimeout: 4:00 # 4 hours WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy - CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions \ No newline at end of file + CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions diff --git a/eng/common/templates/steps/run-script-ifequalelse.yml b/eng/common/templates/steps/run-script-ifequalelse.yml index 3d1242f..2dcd9d1 100644 --- a/eng/common/templates/steps/run-script-ifequalelse.yml +++ b/eng/common/templates/steps/run-script-ifequalelse.yml @@ -30,4 +30,4 @@ steps: name: ${{ parameters.name }} displayName: ${{ parameters.displayName }} env: ${{ parameters.env }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 8a62e0b..fd90c6e 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -69,6 +69,13 @@ jobs: eq(parameters.isOfficialBuild, true), ne(parameters.crossrootfsDir, '')) }} + - name: BuildAction + value: -test + + - ${{ if eq(variables.SkipTests, true) }}: + - name: BuildAction + value: '' + - name: SignType value: test @@ -108,7 +115,8 @@ jobs: - name: BaseJobBuildCommand value: >- - build.cmd -subset installer -test -ci + build.cmd -subset installer -ci + $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) $(CommonMSBuildArgs) @@ -124,7 +132,8 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset installer -test -ci + $(Build.SourcesDirectory)/build.sh -subset installer -ci + $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) $(CommonMSBuildArgs) @@ -139,7 +148,8 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset installer --ci --test + $(Build.SourcesDirectory)/build.sh -subset installer -ci + $(BuildAction) -configuration $(_BuildConfig) -os ${{ parameters.osGroup }} -arch ${{ parameters.archType }} @@ -199,7 +209,8 @@ jobs: - name: BuildArguments value: >- - -subset installer -test -ci + -subset installer -ci + $(BuildAction) /p:CrossBuild=${{ ne(parameters.crossrootfsDir, '') }} /p:PortableBuild=$(_PortableBuild) /p:SkipTests=$(SkipTests) diff --git a/global.json b/global.json index 9870c2a..572ecf2 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20228.4", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20228.4", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20228.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20228.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20255.6", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20255.6", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20255.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20255.6", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets similarity index 100% rename from src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets rename to src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets