summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2019-09-10 14:04:47 +0000
committerGitHub <noreply@github.com>2019-09-10 14:04:47 +0000
commit70ee2a2175f7976daed4fc0a2c2f02aaf08dd2c4 (patch)
treed7b5245f810cb6722c0fbba7daea9ef2b4dfdfd5
parent1533d6a5db52179c23a552878cd227fb2e7448bf (diff)
downloadcoreclr-70ee2a2175f7976daed4fc0a2c2f02aaf08dd2c4.tar.gz
coreclr-70ee2a2175f7976daed4fc0a2c2f02aaf08dd2c4.tar.bz2
coreclr-70ee2a2175f7976daed4fc0a2c2f02aaf08dd2c4.zip
Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#26615)
- 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
-rw-r--r--eng/Version.Details.xml16
-rw-r--r--eng/Versions.props4
-rw-r--r--eng/common/templates/post-build/channels/netcore-dev-30.yml14
-rw-r--r--eng/common/templates/post-build/channels/netcore-dev-31.yml14
-rw-r--r--eng/common/templates/post-build/channels/netcore-dev-5.yml14
-rw-r--r--eng/common/templates/post-build/channels/netcore-internal-30.yml15
-rw-r--r--eng/common/templates/post-build/channels/netcore-release-30.yml13
-rw-r--r--eng/common/templates/post-build/channels/netcore-release-31.yml13
-rw-r--r--eng/common/templates/post-build/channels/netcore-tools-latest.yml16
-rw-r--r--eng/common/templates/post-build/channels/public-validation-release.yml16
-rw-r--r--eng/common/templates/steps/promote-build.yml13
-rw-r--r--global.json4
12 files changed, 46 insertions, 106 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6a9a3487ae..a684bead92 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,21 +2,21 @@
<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>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19458.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19459.10">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
+ <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19458.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19459.10">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
+ <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19458.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19459.10">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
+ <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19458.3">
<Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 52b990709d..a11d70088c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,8 +15,8 @@
<UsingToolXliff>false</UsingToolXliff>
<!-- Package versions -->
<!-- arcade -->
- <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19458.2</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19458.2</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19459.10</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19459.10</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<!-- roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
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 7984f06d1b..3c5eb83988 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 bcedd0f075..965309d154 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 18432cc60b..9975dda4e8 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 36e1d1188b..20eef377b2 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 abae985ab0..5a5c28e1b6 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 b2a6c7659d..2945215883 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 36f6dea628..09445aee0e 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 a5fcdc581a..4feed32971 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 0000000000..b90404435d
--- /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 c374a7b017..673335673a 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"
}