From 9fcc4b9a082de3b40bc0363a5b57558f4e70c982 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2019 13:09:55 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20191118.10 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19568.10 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19568.10 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19568.10 --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 2 +- .../channels/generic-public-channel.yml | 1 - .../templates/post-build/post-build.yml | 91 ------------------- global.json | 4 +- 6 files changed, 10 insertions(+), 102 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 239da55fcb..15c94254be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 928efaa081ffd17b37f6c662fee44775f2d0b90f + 303e0fac8703c7147c9e1f1046082c8db4fb66fa - + https://github.com/dotnet/arcade - 928efaa081ffd17b37f6c662fee44775f2d0b90f + 303e0fac8703c7147c9e1f1046082c8db4fb66fa - + https://github.com/dotnet/arcade - 928efaa081ffd17b37f6c662fee44775f2d0b90f + 303e0fac8703c7147c9e1f1046082c8db4fb66fa diff --git a/eng/Versions.props b/eng/Versions.props index 4002e36fca..3fa23be795 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.19567.2 + 5.0.0-beta.19568.10 4.6.0 4.6.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d7d5d7d5f4..8d61377a87 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -193,7 +193,7 @@ fi if [[ "$__LinuxCodeName" == "alpine" ]]; then __ApkToolsVersion=2.9.1 - __AlpineVersion=3.7 + __AlpineVersion=3.9 __ApkToolsDir=$(mktemp -d) wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir 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 59b4765da1..3f572f8b12 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -71,7 +71,6 @@ stages: StageLabel: '${{ parameters.stageName }}' JobLabel: 'SymbolPublishing' - - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index adedc70b83..5965cc2005 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -131,19 +131,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev31_Publish' - channelName: '.NET Core 3.1 Dev' - channelId: 128 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -170,84 +157,6 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_3_Tools_Validation_Publish' - channelName: '.NET 3 Tools - Validation' - channelId: 390 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_3_Tools_Publish' - channelName: '.NET 3 Tools' - channelId: 344 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Release30_Publish' - channelName: '.NET Core 3.0 Release' - channelId: 19 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Release31_Publish' - channelName: '.NET Core 3.1 Release' - channelId: 129 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Blazor31_Features_Publish' - channelName: '.NET Core 3.1 Blazor Features' - channelId: 531 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' - -- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_30_Internal_Servicing_Publishing' - channelName: '.NET Core 3.0 Internal Servicing' - channelId: 184 - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/global.json b/global.json index 6a9396e978..9efeb51ecf 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19567.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19567.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19568.10", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19568.10" } } From 32eafb29dfb977cd2b572b519a699972220e3e80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2019 13:09:52 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20191119.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19569.6 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19569.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19569.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../post-build/channels/generic-internal-channel.yml | 1 - global.json | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15c94254be..fa7542226b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 303e0fac8703c7147c9e1f1046082c8db4fb66fa + c29c916a0d1736522cfd944fcc06ead33b5e27db - + https://github.com/dotnet/arcade - 303e0fac8703c7147c9e1f1046082c8db4fb66fa + c29c916a0d1736522cfd944fcc06ead33b5e27db - + https://github.com/dotnet/arcade - 303e0fac8703c7147c9e1f1046082c8db4fb66fa + c29c916a0d1736522cfd944fcc06ead33b5e27db diff --git a/eng/Versions.props b/eng/Versions.props index 3fa23be795..ae2c6d22d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.19568.10 + 5.0.0-beta.19569.6 4.6.0 4.6.0 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 2ea807033d..3a8755fbbb 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -97,7 +97,6 @@ stages: buildType: current artifactName: BlobArtifacts continueOnError: true - - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests inputs: diff --git a/global.json b/global.json index 9efeb51ecf..27c4fea135 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19568.10", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19568.10" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19569.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19569.6" } } From f1e12ce848f46701b0c3c5413f799347fcb60259 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2019 23:43:42 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20191120.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19570.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19570.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19570.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa7542226b..0b7209e77f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - c29c916a0d1736522cfd944fcc06ead33b5e27db + 06447494599679788b60515cad6ed77027206b22 - + https://github.com/dotnet/arcade - c29c916a0d1736522cfd944fcc06ead33b5e27db + 06447494599679788b60515cad6ed77027206b22 - + https://github.com/dotnet/arcade - c29c916a0d1736522cfd944fcc06ead33b5e27db + 06447494599679788b60515cad6ed77027206b22 diff --git a/eng/Versions.props b/eng/Versions.props index ae2c6d22d5..2f968aa5e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.19569.6 + 5.0.0-beta.19570.3 4.6.0 4.6.0 diff --git a/global.json b/global.json index 27c4fea135..e3e87b4520 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19569.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19569.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19570.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19570.3" } } From 384961ddfd0357069af0301c05e9deb9f8ea6c05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2019 13:11:08 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20191120.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19570.6 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19570.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19570.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b7209e77f..ce88a5bdc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 06447494599679788b60515cad6ed77027206b22 + be36a2fb1898f4eb69b29a1150a507e371618b8c - + https://github.com/dotnet/arcade - 06447494599679788b60515cad6ed77027206b22 + be36a2fb1898f4eb69b29a1150a507e371618b8c - + https://github.com/dotnet/arcade - 06447494599679788b60515cad6ed77027206b22 + be36a2fb1898f4eb69b29a1150a507e371618b8c diff --git a/eng/Versions.props b/eng/Versions.props index 2f968aa5e3..9ffaab0eb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.19570.3 + 5.0.0-beta.19570.6 4.6.0 4.6.0 diff --git a/global.json b/global.json index e3e87b4520..a1669f35a2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19570.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19570.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19570.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19570.6" } }