From b9514321ee5dbd660e1d162ae04173db154d1c03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 12:19:47 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210524.6 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21271.3 -> To Version 6.0.0-beta.21274.6 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- 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, 36 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d8f588c79..2c53e1c1606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 diff --git a/eng/Versions.props b/eng/Versions.props index ce8c8b7c46f..74aabc92795 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21271.3 - 6.0.0-beta.21271.3 - 6.0.0-beta.21271.3 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index aad41464926..5023d36dcb3 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 58fa9a35b8c..8990dfc8c87 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 b50c0b3bdb8..3220c6a4f92 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 65ee5992bf4..e20637ed6a1 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 efee57405e3..dceb7b90f8c 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6" }, "sdk": { "version": "6.0.100-preview.3.21202.5"