Skip to content

Commit 384efb2

Browse files
dotnet-maestro[bot]KevinRansom
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#7527)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10
1 parent 8413dac commit 384efb2

File tree

11 files changed

+37
-97
lines changed

11 files changed

+37
-97
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19458.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19459.10">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
8+
<Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/templates/post-build/channels/netcore-dev-30.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,6 @@ stages:
120120
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
121121
${{ parameters.artifactsPublishingAdditionalParameters }}
122122

123-
124-
- stage: NetCore_Dev30_Publish_Validation
125-
displayName: .NET Core 3.0 Dev Publish Validation
126-
variables:
127-
- template: ../common-variables.yml
128-
jobs:
129-
- template: ../setup-maestro-vars.yml
130-
131-
- template: ../promote-build.yml
132-
parameters:
133-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
123+
- template: ../../steps/promote-build.yml
124+
parameters:
125+
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

eng/common/templates/post-build/channels/netcore-dev-31.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,6 @@ stages:
120120
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
121121
${{ parameters.artifactsPublishingAdditionalParameters }}
122122

123-
124-
- stage: NetCore_Dev31_Publish_Validation
125-
displayName: .NET Core 3.1 Dev Publish Validation
126-
variables:
127-
- template: ../common-variables.yml
128-
jobs:
129-
- template: ../setup-maestro-vars.yml
130-
131-
- template: ../promote-build.yml
132-
parameters:
133-
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
123+
- template: ../../steps/promote-build.yml
124+
parameters:
125+
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

eng/common/templates/post-build/channels/netcore-dev-5.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,6 @@ stages:
126126
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
127127
${{ parameters.artifactsPublishingAdditionalParameters }}
128128

129-
130-
- stage: NetCore_Dev5_Publish_Validation
131-
displayName: .NET Core 5 Dev Publish Validation
132-
variables:
133-
- template: ../common-variables.yml
134-
jobs:
135-
- template: ../setup-maestro-vars.yml
136-
137-
- template: ../promote-build.yml
138-
parameters:
139-
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
129+
- template: ../../steps/promote-build.yml
130+
parameters:
131+
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}

eng/common/templates/post-build/channels/netcore-internal-30.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,6 @@ stages:
113113
/p:Configuration=Release
114114
${{ parameters.artifactsPublishingAdditionalParameters }}
115115

116-
- template: ../trigger-subscription.yml
116+
- template: ../../steps/promote-build.yml
117117
parameters:
118-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
119-
120-
- stage: NetCore_30_Internal_Servicing_Publish_Validation
121-
displayName: .NET Core 3.0 Internal Servicing Publish Validation
122-
variables:
123-
- template: ../common-variables.yml
124-
jobs:
125-
- template: ../setup-maestro-vars.yml
126-
127-
- template: ../promote-build.yml
128-
parameters:
129-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
118+
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}

eng/common/templates/post-build/channels/netcore-release-30.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,6 @@ stages:
113113
/p:Configuration=Release
114114
${{ parameters.artifactsPublishingAdditionalParameters }}
115115

116-
- template: ../trigger-subscription.yml
116+
- template: ../../steps/promote-build.yml
117117
parameters:
118118
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}
119-
120-
- stage: NetCore_Release30_Publish_Validation
121-
displayName: .NET Core 3.0 Release Publish Validation
122-
variables:
123-
- template: ../common-variables.yml
124-
jobs:
125-
- template: ../setup-maestro-vars.yml
126-
127-
- template: ../promote-build.yml
128-
parameters:
129-
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}

eng/common/templates/post-build/channels/netcore-release-31.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,6 @@ stages:
119119
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
120120
${{ parameters.artifactsPublishingAdditionalParameters }}
121121

122-
- template: ../trigger-subscription.yml
122+
- template: ../../steps/promote-build.yml
123123
parameters:
124124
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}
125-
126-
- stage: NetCore_Release31_Publish_Validation
127-
displayName: .NET Core 3.1 Release Publish Validation
128-
variables:
129-
- template: ../common-variables.yml
130-
jobs:
131-
- template: ../setup-maestro-vars.yml
132-
133-
- template: ../promote-build.yml
134-
parameters:
135-
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}

eng/common/templates/post-build/channels/netcore-tools-latest.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,7 @@ stages:
125125
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
126126
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)
127127
${{ parameters.artifactsPublishingAdditionalParameters }}
128-
129-
130-
- stage: NetCore_Tools_Latest_PublishValidation
131-
displayName: .NET Tools - Latest Publish Validation
132-
variables:
133-
- template: ../common-variables.yml
134-
jobs:
135-
- template: ../setup-maestro-vars.yml
136-
137-
- template: ../promote-build.yml
138-
parameters:
139-
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}
128+
129+
- template: ../../steps/promote-build.yml
130+
parameters:
131+
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}

eng/common/templates/post-build/channels/public-validation-release.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,7 @@ stages:
8585
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
8686
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
8787
${{ parameters.artifactsPublishingAdditionalParameters }}
88-
89-
90-
- stage: PVR_PublishValidation
91-
displayName: .NET Tools - Validation Publish Validation
92-
variables:
93-
- template: ../common-variables.yml
94-
jobs:
95-
- template: ../setup-maestro-vars.yml
96-
97-
- template: ../promote-build.yml
98-
parameters:
99-
ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }}
88+
89+
- template: ../../steps/promote-build.yml
90+
parameters:
91+
ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
parameters:
2+
ChannelId: 0
3+
4+
steps:
5+
- task: PowerShell@2
6+
displayName: Add Build to Channel
7+
inputs:
8+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1
9+
arguments: -BuildId $(BARBuildId)
10+
-ChannelId ${{ parameters.ChannelId }}
11+
-MaestroApiAccessToken $(MaestroApiAccessToken)
12+
-MaestroApiEndPoint $(MaestroApiEndPoint)
13+
-MaestroApiVersion $(MaestroApiVersion)

0 commit comments

Comments
 (0)