From d8de9db79c2128153f680a5ab0e90b128b83455a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 19:10:00 +0000 Subject: [PATCH] [master] Update dependencies from dotnet/arcade dotnet/xharness (#46980) [master] Update dependencies from dotnet/arcade dotnet/xharness --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 28 +++---- .../templates/job/source-index-stage1.yml | 12 +++ .../templates/post-build/post-build.yml | 2 +- global.json | 10 +-- 6 files changed, 71 insertions(+), 59 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1d39a970601..31d4b4aca62 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21063.1", + "version": "1.0.0-prerelease.21064.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0fc1ef8b6c..e4341fa1684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,73 +6,73 @@ - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -202,13 +202,13 @@ https://github.com/mono/linker fc8abeff62398d46ac3408d20f50879e6f2e713f - + https://github.com/dotnet/xharness - dcc8a6231c597824388ed3ce94f9c079e0867b36 + cf837a290a9451d3d1b3a09c54c90e5e0f656143 - + https://github.com/dotnet/xharness - dcc8a6231c597824388ed3ce94f9c079e0867b36 + cf837a290a9451d3d1b3a09c54c90e5e0f656143 diff --git a/eng/Versions.props b/eng/Versions.props index 2c3b43f3957..5293fb8857d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,18 +47,18 @@ 6.0.0-preview1.21054.10 3.8.0-4.20503.2 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 2.5.1-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 - 6.0.0-beta.21058.3 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 2.5.1-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 + 6.0.0-beta.21062.10 5.9.0-preview.2 @@ -141,8 +141,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21063.1 - 1.0.0-prerelease.21063.1 + 1.0.0-prerelease.21064.3 + 1.0.0-prerelease.21064.3 2.4.1 2.4.2 1.3.0 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b33f06b9517..61263307455 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -3,6 +3,7 @@ parameters: sourceIndexPackageVersion: 1.0.0-beta5 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 @@ -21,12 +22,20 @@ jobs: pool: ${{ parameters.pool }} steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + - task: UseDotNet@2 displayName: Use .NET Core sdk 3.1 inputs: packageType: sdk version: 3.1.x + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true + - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools @@ -38,9 +47,12 @@ jobs: - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln + env: + DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) displayName: Upload stage1 artifacts to source index env: BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 41f2d96a608..bd776c7675b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -224,7 +224,7 @@ stages: - ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - stage: publish_using_darc ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: Validate + dependsOn: ${{ parameters.publishDependsOn }} ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc diff --git a/global.json b/global.json index 02813c16ec5..335656513ec 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21058.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21058.3", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.21058.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21058.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21058.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21062.10", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21062.10", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.21062.10", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21062.10", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21062.10", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.21060.3", "Microsoft.Build.NoTargets": "2.0.1", -- GitLab