From 6f26005f9d9c6f6352d98d04a8481c7346db0b65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2019 12:44:52 -0700 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#26618) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19459.10 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19459.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates/post-build/channels/netcore-dev-30.yml | 14 +++----------- .../templates/post-build/channels/netcore-dev-31.yml | 14 +++----------- .../templates/post-build/channels/netcore-dev-5.yml | 14 +++----------- .../post-build/channels/netcore-internal-30.yml | 15 ++------------- .../templates/post-build/channels/netcore-release-30.yml | 13 +------------ .../templates/post-build/channels/netcore-release-31.yml | 13 +------------ .../post-build/channels/netcore-tools-latest.yml | 16 ++++------------ .../post-build/channels/public-validation-release.yml | 16 ++++------------ eng/common/templates/steps/promote-build.yml | 13 +++++++++++++ global.json | 4 ++-- 12 files changed, 46 insertions(+), 106 deletions(-) create mode 100644 eng/common/templates/steps/promote-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 777a0d2..7c7d790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,21 +2,21 @@ - + https://github.com/dotnet/arcade - 29ee79a10c58dd6863a46157e374521cac610ad8 + f5ccfdcbd828383d39cf583086ef42d72ca5b320 - + https://github.com/dotnet/arcade - 29ee79a10c58dd6863a46157e374521cac610ad8 + f5ccfdcbd828383d39cf583086ef42d72ca5b320 - + https://github.com/dotnet/arcade - 29ee79a10c58dd6863a46157e374521cac610ad8 + f5ccfdcbd828383d39cf583086ef42d72ca5b320 - + https://github.com/dotnet/arcade - 29ee79a10c58dd6863a46157e374521cac610ad8 + f5ccfdcbd828383d39cf583086ef42d72ca5b320 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index a949e75..a32a5b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,8 +15,8 @@ false - 2.2.0-beta.19458.2 - 1.0.0-beta.19458.2 + 2.2.0-beta.19459.10 + 1.0.0-beta.19459.10 2.5.1-beta.19278.1 3.3.0-beta2-19367-02 diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 7984f06..3c5eb83 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -120,14 +120,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev30_Publish_Validation - displayName: .NET Core 3.0 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index bcedd0f..965309d1 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -120,14 +120,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev31_Publish_Validation - displayName: .NET Core 3.1 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 18432cc..9975dda 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -126,14 +126,6 @@ stages: /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev5_Publish_Validation - displayName: .NET Core 5 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 36e1d11..20eef37 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -113,17 +113,6 @@ stages: /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} - -- stage: NetCore_30_Internal_Servicing_Publish_Validation - displayName: .NET Core 3.0 Internal Servicing Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index abae985..5a5c28e 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -113,17 +113,6 @@ stages: /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} - -- stage: NetCore_Release30_Publish_Validation - displayName: .NET Core 3.0 Release Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index b2a6c76..2945215 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -119,17 +119,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} - -- stage: NetCore_Release31_Publish_Validation - displayName: .NET Core 3.1 Release Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 36f6dea..09445ae 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -125,15 +125,7 @@ stages: /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) ${{ parameters.artifactsPublishingAdditionalParameters }} - - -- stage: NetCore_Tools_Latest_PublishValidation - displayName: .NET Tools - Latest Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index a5fcdc5..4feed32 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -85,15 +85,7 @@ stages: /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - - -- stage: PVR_PublishValidation - displayName: .NET Tools - Validation Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/steps/promote-build.yml b/eng/common/templates/steps/promote-build.yml new file mode 100644 index 0000000..b904044 --- /dev/null +++ b/eng/common/templates/steps/promote-build.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/global.json b/global.json index c374a7b..6733356 100644 --- a/global.json +++ b/global.json @@ -7,8 +7,8 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19458.2", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19459.10", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19459.10", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" } -- 2.7.4