Skip to content

Commit 16f213a

Browse files
KevinRansombaronfel
KevinRansom
authored and
baronfel
committed
Merge pull request #7875 from dotnet/darc-master-49f5a84d-0478-420c-96fb-1cd3db1d9dd6
[master] Update dependencies from dotnet/arcade
2 parents d89d4ff + 75c83a3 commit 16f213a

File tree

6 files changed

+4
-97
lines changed

6 files changed

+4
-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="5.0.0-beta.19564.6">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19569.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>c1cd0349f7d29cf21d93d61cdea382aecc422e36</Sha>
8+
<Sha>c29c916a0d1736522cfd944fcc06ead33b5e27db</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ fi
193193

194194
if [[ "$__LinuxCodeName" == "alpine" ]]; then
195195
__ApkToolsVersion=2.9.1
196-
__AlpineVersion=3.7
196+
__AlpineVersion=3.9
197197
__ApkToolsDir=$(mktemp -d)
198198
wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir
199199
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir

‎eng/common/templates/post-build/channels/generic-internal-channel.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ stages:
109109
buildType: current
110110
artifactName: BlobArtifacts
111111
continueOnError: true
112-
113112
- task: DownloadBuildArtifacts@0
114113
displayName: Download Asset Manifests
115114
inputs:

‎eng/common/templates/post-build/channels/generic-public-channel.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ stages:
7171
StageLabel: '${{ parameters.stageName }}'
7272
JobLabel: 'SymbolPublishing'
7373

74-
7574
- job: publish_assets
7675
displayName: Publish Assets
7776
dependsOn: setupMaestroVars

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,6 @@ stages:
131131
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
132132
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
133133

134-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
135-
parameters:
136-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
137-
dependsOn: ${{ parameters.publishDependsOn }}
138-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
139-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
140-
stageName: 'NetCore_Dev31_Publish'
141-
channelName: '.NET Core 3.1 Dev'
142-
channelId: 128
143-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
144-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
145-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
146-
147134
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
148135
parameters:
149136
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -170,84 +157,6 @@ stages:
170157
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
171158
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
172159

173-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
174-
parameters:
175-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
176-
dependsOn: ${{ parameters.publishDependsOn }}
177-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
178-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
179-
stageName: 'NetCore_3_Tools_Validation_Publish'
180-
channelName: '.NET 3 Tools - Validation'
181-
channelId: 390
182-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
183-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
184-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
185-
186-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
187-
parameters:
188-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
189-
dependsOn: ${{ parameters.publishDependsOn }}
190-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
191-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
192-
stageName: 'NetCore_3_Tools_Publish'
193-
channelName: '.NET 3 Tools'
194-
channelId: 344
195-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
196-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
197-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
198-
199-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
200-
parameters:
201-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
202-
dependsOn: ${{ parameters.publishDependsOn }}
203-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
204-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
205-
stageName: 'NetCore_Release30_Publish'
206-
channelName: '.NET Core 3.0 Release'
207-
channelId: 19
208-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
209-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
210-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
211-
212-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
213-
parameters:
214-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
215-
dependsOn: ${{ parameters.publishDependsOn }}
216-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
217-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
218-
stageName: 'NetCore_Release31_Publish'
219-
channelName: '.NET Core 3.1 Release'
220-
channelId: 129
221-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
222-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
223-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
224-
225-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
226-
parameters:
227-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
228-
dependsOn: ${{ parameters.publishDependsOn }}
229-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
230-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
231-
stageName: 'NetCore_Blazor31_Features_Publish'
232-
channelName: '.NET Core 3.1 Blazor Features'
233-
channelId: 531
234-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json'
235-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json'
236-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json'
237-
238-
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
239-
parameters:
240-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
241-
dependsOn: ${{ parameters.publishDependsOn }}
242-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
243-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
244-
stageName: 'NetCore_30_Internal_Servicing_Publishing'
245-
channelName: '.NET Core 3.0 Internal Servicing'
246-
channelId: 184
247-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
248-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
249-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
250-
251160
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
252161
parameters:
253162
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19564.6",
13+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19569.6",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)