From e18a29263d5484af2323765f0498e4b96175b103 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 19:46:44 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210524.6 (#835) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++----- eng/Versions.props | 41 ++++++++----------- eng/common/templates/job/source-build.yml | 3 ++ .../channels/generic-internal-channel.yml | 6 +++ .../channels/generic-public-channel.yml | 6 +++ eng/common/templates/steps/source-build.yml | 7 +++- global.json | 4 +- 7 files changed, 49 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd3ba231f4..6cc7e3741e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + f22435d0f9cc367e75e1875d93ef980be1be6b79 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index dad1b4605c..9af69ed0df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,26 +1,23 @@ - + 6.0.0 beta - false - 17.0.0-preview-20210520-02 - - 0.2.0 - 5.9.1 - 2.5.2 - 14.0.0 - 1.1.0-beta2-21064-01 - 1.0.0-build-20170420-1 - 0.1.3 - 16.9.0-preview-4267359 + 0.2.0 + 5.9.1 + 2.5.2 + 14.0.0 + + 1.1.0-beta2-21064-01 + 1.0.0-build-20170420-1 + 0.1.3 + 16.9.0-preview-4267359 - 4.3.0 4.3.0 @@ -31,28 +28,22 @@ 4.3.0 4.3.0 - 1.6.0 1.6.0 - 5.3.0 0.5.0 - 4.8.3 4.3.0 5.10.3 1.0.0 - - 15.7.0 - 1.2.0 - 1.2.0 + 15.7.0 + 1.2.0 + 1.2.0 - 11.0 - 2.2.1 1.0.2 @@ -106,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 1.22.0 1.1.2 2.0.0 @@ -117,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 6.0.0-beta.21264.2 + 6.0.0-beta.21274.6 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index aad4146492..5023d36dcb 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -15,6 +15,9 @@ parameters: # nonPortable: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. # container: '' # A container to use. Runs in docker. # pool: {} diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 58fa9a35b8..8990dfc8c8 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -40,6 +40,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + # This is necessary whenever we want to publish/restore to an AzDO private feed - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' @@ -110,6 +113,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index b50c0b3bdb..3220c6a4f9 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -42,6 +42,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true @@ -109,6 +112,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 65ee5992bf..e20637ed6a 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -34,9 +34,14 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ - --restore --build --pack --publish -bl \ + --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ diff --git a/global.json b/global.json index caeba792fd..5db448ffdf 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6" } }