Skip to content

Commit 355d112

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200304.1 (#2950)
- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20154.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20154.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20154.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20154.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20154.1
1 parent 9ebc7e2 commit 355d112

File tree

7 files changed

+29
-101
lines changed

7 files changed

+29
-101
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
6767
<SourceBuildId>5596</SourceBuildId>
6868
</Dependency>
6969
<!-- Arcade -->
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20153.1">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20154.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
72+
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20153.1">
74+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20154.1">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
76+
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20153.1">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20154.1">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
80+
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20153.1">
82+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20154.1">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
84+
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20153.1">
86+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20154.1">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
88+
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
8989
</Dependency>
9090
</ToolsetDependencies>
9191
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</PropertyGroup>
3434
<!-- Arcade -->
3535
<PropertyGroup>
36-
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20153.1</MicrosoftDotNetGenFacadesPackageVersion>
37-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20153.1</MicrosoftDotNetRemoteExecutorVersion>
38-
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20153.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
36+
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20154.1</MicrosoftDotNetGenFacadesPackageVersion>
37+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20154.1</MicrosoftDotNetRemoteExecutorVersion>
38+
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20154.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
3939
</PropertyGroup>
4040
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
4141
<!-- XUnit-related (not extensions) -->

eng/common/SigningValidation.proj

Lines changed: 0 additions & 83 deletions
This file was deleted.

eng/common/darc-init.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ param (
77

88
. $PSScriptRoot\tools.ps1
99

10-
function InstallDarcCli ($darcVersion) {
10+
function InstallDarcCli ($darcVersion, $toolpath) {
1111
$darcCliPackageName = 'microsoft.dotnet.darc'
1212

1313
$dotnetRoot = InitializeDotNetCli -install:$true
@@ -32,13 +32,13 @@ function InstallDarcCli ($darcVersion) {
3232
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
3333
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
3434
}else {
35-
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g --tool-path '$toolpath'"
35+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
3636
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
3737
}
3838
}
3939

4040
try {
41-
InstallDarcCli $darcVersion
41+
InstallDarcCli $darcVersion $toolpath
4242
}
4343
catch {
4444
Write-Host $_.ScriptStackTrace

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ parameters:
1010
transportFeed: ''
1111
shippingFeed: ''
1212
symbolsFeed: ''
13+
# If the channel name is empty, no links will be generated
14+
akaMSChannelName: ''
1315

1416
stages:
1517
- stage: ${{ parameters.stageName }}
@@ -161,6 +163,9 @@ stages:
161163
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
162164
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
163165
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
166+
/p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
167+
/p:AkaMSClientId=$(akams-client-id)
168+
/p:AkaMSClientSecret=$(akams-client-secret)
164169
${{ parameters.artifactsPublishingAdditionalParameters }}
165170

166171
- template: ../../steps/publish-logs.yml

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ stages:
199199
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
200200
stageName: 'NetCore_Dev5_Publish'
201201
channelName: '.NET Core 5 Dev'
202+
akaMSChannelName: 'net5/dev'
202203
channelId: ${{ parameters.NetCoreDev5ChannelId }}
203204
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
204205
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
@@ -212,6 +213,7 @@ stages:
212213
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
213214
stageName: 'Net5_Preview1_Publish'
214215
channelName: '.NET 5 Preview 1'
216+
akaMSChannelName: 'net5/preview1'
215217
channelId: ${{ parameters.Net5Preview1ChannelId }}
216218
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
217219
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
@@ -225,6 +227,7 @@ stages:
225227
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
226228
stageName: 'Net5_Preview2_Publish'
227229
channelName: '.NET 5 Preview 2'
230+
akaMSChannelName: 'net5/preview2'
228231
channelId: ${{ parameters.Net5Preview2ChannelId }}
229232
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
230233
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
@@ -238,6 +241,7 @@ stages:
238241
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
239242
stageName: 'Net_Eng_Latest_Publish'
240243
channelName: '.NET Eng - Latest'
244+
akaMSChannelName: 'eng/daily'
241245
channelId: ${{ parameters.NetEngLatestChannelId }}
242246
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
243247
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -251,6 +255,7 @@ stages:
251255
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
252256
stageName: 'Net_Eng_Validation_Publish'
253257
channelName: '.NET Eng - Validation'
258+
akaMSChannelName: 'eng/validation'
254259
channelId: ${{ parameters.NetEngValidationChannelId }}
255260
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
256261
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -264,6 +269,7 @@ stages:
264269
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
265270
stageName: 'General_Testing_Publish'
266271
channelName: 'General Testing'
272+
akaMSChannelName: 'generaltesting'
267273
channelId: ${{ parameters.GeneralTestingChannelId }}
268274
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
269275
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"version": "5.0.100-alpha1-015536"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20153.1",
15-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20153.1",
14+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20154.1",
15+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20154.1",
1616
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
1717
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3"
1818
},

0 commit comments

Comments
 (0)