Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Update dependencies from dotnet/arcade #384

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19458.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19459.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
<Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
14 changes: 3 additions & 11 deletions eng/common/templates/post-build/channels/netcore-dev-30.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
14 changes: 3 additions & 11 deletions eng/common/templates/post-build/channels/netcore-dev-31.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
14 changes: 3 additions & 11 deletions eng/common/templates/post-build/channels/netcore-dev-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
15 changes: 2 additions & 13 deletions eng/common/templates/post-build/channels/netcore-internal-30.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
13 changes: 1 addition & 12 deletions eng/common/templates/post-build/channels/netcore-release-30.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
13 changes: 1 addition & 12 deletions eng/common/templates/post-build/channels/netcore-release-31.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
16 changes: 4 additions & 12 deletions eng/common/templates/post-build/channels/netcore-tools-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
13 changes: 13 additions & 0 deletions eng/common/templates/steps/promote-build.yml
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"xcopy-msbuild": "15.9.0-alpha"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19459.10"
}
}