Skip to content

Commit c2bc640

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200817.6 (#25005)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6
1 parent 411e7be commit c2bc640

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,13 @@
305305
<Uri>https://github.com/dotnet/runtime</Uri>
306306
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20411.8">
308+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20417.6">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
310+
<Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20411.8">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20417.6">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
314+
<Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
315315
</Dependency>
316316
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3">
317317
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/common/cross/toolchain.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
1919
endif()
2020
elseif(TARGET_ARCH_NAME STREQUAL "arm")
2121
set(CMAKE_SYSTEM_PROCESSOR armv7l)
22-
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
22+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
23+
set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
24+
elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
2325
set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
2426
else()
2527
set(TOOLCHAIN "arm-linux-gnueabihf")

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ parameters:
3939
NetEngLatestChannelId: 2
4040
NetEngValidationChannelId: 9
4141
NetDev5ChannelId: 131
42+
NetDev6ChannelId: 1296
4243
GeneralTestingChannelId: 529
4344
NETCoreToolingDevChannelId: 548
4445
NETCoreToolingReleaseChannelId: 549
4546
NETInternalToolingChannelId: 551
4647
NETCoreExperimentalChannelId: 562
4748
NetEngServicesIntChannelId: 678
4849
NetEngServicesProdChannelId: 679
49-
Net5Preview7ChannelId: 1065
5050
Net5Preview8ChannelId: 1155
5151
Net5RC1ChannelId: 1157
5252
NetCoreSDK313xxChannelId: 759
@@ -115,7 +115,7 @@ stages:
115115
inputs:
116116
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
117117
arguments: -PromoteToChannels "$(TargetChannels)"
118-
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
118+
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
119119

120120
- job:
121121
displayName: NuGet Validation
@@ -276,13 +276,13 @@ stages:
276276
dependsOn: ${{ parameters.publishDependsOn }}
277277
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
278278
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
279-
stageName: 'Net5_Preview7_Publish'
280-
channelName: '.NET 5 Preview 7'
281-
akaMSChannelName: 'net5/preview7'
282-
channelId: ${{ parameters.Net5Preview7ChannelId }}
283-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
284-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
285-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
279+
stageName: 'NetCore_Dev6_Publish'
280+
channelName: '.NET 6 Dev'
281+
akaMSChannelName: 'net6/dev'
282+
channelId: ${{ parameters.NetDev6ChannelId }}
283+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
284+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
285+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
286286

287287
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
288288
parameters:
@@ -298,7 +298,7 @@ stages:
298298
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
299299
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
300300

301-
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
301+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
302302
parameters:
303303
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
304304
dependsOn: ${{ parameters.publishDependsOn }}
@@ -308,9 +308,9 @@ stages:
308308
channelName: '.NET 5 RC 1'
309309
akaMSChannelName: 'net5/rc1'
310310
channelId: ${{ parameters.Net5RC1ChannelId }}
311-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
312-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
313-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
311+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
312+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
313+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
314314

315315
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
316316
parameters:

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20411.8"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6"
3535
}
3636
}

0 commit comments

Comments
 (0)