Skip to content

Commit e8c4a32

Browse files
mmitchemmitche
committed
Update arcade
1 parent 21d18d3 commit e8c4a32

20 files changed

+291
-50
lines changed

‎NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<!-- End: Package sources from dotnet-runtime -->
2525
<!-- Begin: Package sources from dotnet-templating -->
2626
<add key="darc-pub-dotnet-templating-7248c3c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-7248c3c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-5/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-7248c3c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-3/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-7248c3c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-2/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-7248c3c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-1/nuget/v3/index.json" />
2731
<!-- End: Package sources from dotnet-templating -->
2832
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2933
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -483,22 +483,22 @@
483483
</Dependency>
484484
</ProductDependencies>
485485
<ToolsetDependencies>
486-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24311.3">
486+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24352.1">
487487
<Uri>https://github.com/dotnet/arcade</Uri>
488-
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
488+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
489489
<SourceBuild RepoName="arcade" ManagedOnly="true" />
490490
</Dependency>
491-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24311.3">
491+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24352.1">
492492
<Uri>https://github.com/dotnet/arcade</Uri>
493-
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
493+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
494494
</Dependency>
495-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24311.3">
495+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24352.1">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
497+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24311.3">
499+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24352.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
501+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
502502
</Dependency>
503503
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
504504
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3636
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3737
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
38-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24311.3</MicrosoftDotNetSignToolVersion>
38+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24352.1</MicrosoftDotNetSignToolVersion>
3939
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4040
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4141
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -210,7 +210,7 @@
210210
<PropertyGroup>
211211
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
212212
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
213-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24311.3</MicrosoftDotNetXUnitExtensionsVersion>
213+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24352.1</MicrosoftDotNetXUnitExtensionsVersion>
214214
<MoqPackageVersion>4.18.4</MoqPackageVersion>
215215
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
216216
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
44
[Parameter(Mandatory=$true)][string] $AzdoToken,
5-
[Parameter(Mandatory=$true)][string] $MaestroToken,
65
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
76
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
87
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
@@ -31,13 +30,13 @@ try {
3130
}
3231

3332
& $darc add-build-to-channel `
34-
--id $buildId `
35-
--publishing-infra-version $PublishingInfraVersion `
36-
--default-channels `
37-
--source-branch main `
38-
--azdev-pat $AzdoToken `
39-
--bar-uri $MaestroApiEndPoint `
40-
--password $MaestroToken `
33+
--id $buildId `
34+
--publishing-infra-version $PublishingInfraVersion `
35+
--default-channels `
36+
--source-branch main `
37+
--azdev-pat "$AzdoToken" `
38+
--bar-uri "$MaestroApiEndPoint" `
39+
--ci `
4140
@optionalParams
4241

4342
if ($LastExitCode -ne 0) {

‎eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,16 @@ jobs:
7676

7777
- task: NuGetAuthenticate@1
7878

79-
- task: PowerShell@2
79+
- task: AzureCLI@2
8080
displayName: Publish Build Assets
8181
inputs:
82-
filePath: eng\common\sdk-task.ps1
83-
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
82+
azureSubscription: "Darc: Maestro Production"
83+
scriptType: ps
84+
scriptLocation: scriptPath
85+
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
86+
arguments: >
87+
-task PublishBuildAssets -restore -msbuildEngine dotnet
8488
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
85-
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
8689
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
8790
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
8891
/p:OfficialBuildId=$(Build.BuildNumber)
@@ -144,7 +147,6 @@ jobs:
144147
arguments: -BuildId $(BARBuildId)
145148
-PublishingInfraVersion 3
146149
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
147-
-MaestroToken '$(MaestroApiAccessToken)'
148150
-WaitPublishingFinish true
149151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
150152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates-official/job/source-build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34+
# If set to true and running on a non-public project,
35+
# Internal blob storage locations will be enabled.
36+
# This is not enabled by default because many repositories do not need internal sources
37+
# and do not need to have the required service connections approved in the pipeline.
38+
enableInternalSources: false
39+
3440
jobs:
3541
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
3642
displayName: Source-Build (${{ parameters.platform.name }})
@@ -62,6 +68,8 @@ jobs:
6268
clean: all
6369

6470
steps:
71+
- ${{ if eq(parameters.enableInternalSources, true) }}:
72+
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
6573
- template: /eng/common/templates-official/steps/source-build.yml
6674
parameters:
6775
platform: ${{ parameters.platform }}

‎eng/common/templates-official/jobs/source-build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# If set to true and running on a non-public project,
25+
# Internal nuget and blob storage locations will be enabled.
26+
# This is not enabled by default because many repositories do not need internal sources
27+
# and do not need to have the required service connections approved in the pipeline.
28+
enableInternalSources: false
29+
2430
jobs:
2531

2632
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -38,9 +44,11 @@ jobs:
3844
parameters:
3945
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4046
platform: ${{ platform }}
47+
enableInternalSources: ${{ parameters.enableInternalSources }}
4148

4249
- ${{ if eq(length(parameters.platforms), 0) }}:
4350
- template: /eng/common/templates-official/job/source-build.yml
4451
parameters:
4552
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4653
platform: ${{ parameters.defaultManagedPlatform }}
54+
enableInternalSources: ${{ parameters.enableInternalSources }}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,16 @@ stages:
272272

273273
- task: NuGetAuthenticate@1
274274

275-
- task: PowerShell@2
275+
- task: AzureCLI@2
276276
displayName: Publish Using Darc
277277
inputs:
278-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
278+
azureSubscription: "Darc: Maestro Production"
279+
scriptType: ps
280+
scriptLocation: scriptPath
281+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
279282
arguments: -BuildId $(BARBuildId)
280283
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
281284
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
282-
-MaestroToken '$(MaestroApiAccessToken)'
283285
-WaitPublishingFinish true
284286
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
285287
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/templates-official/steps/enable-internal-runtimes.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
2+
# variable with the base64-encoded SAS token, by default
3+
4+
parameters:
5+
- name: federatedServiceConnection
6+
type: string
7+
default: 'dotnetbuilds-internal-read'
8+
- name: outputVariableName
9+
type: string
10+
default: 'dotnetbuilds-internal-container-read-token-base64'
11+
- name: expiryInHours
12+
type: number
13+
default: 1
14+
- name: base64Encode
15+
type: boolean
16+
default: true
17+
18+
steps:
19+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
20+
- template: /eng/common/templates-official/steps/get-delegation-sas.yml
21+
parameters:
22+
federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
23+
outputVariableName: ${{ parameters.outputVariableName }}
24+
expiryInHours: ${{ parameters.expiryInHours }}
25+
base64Encode: ${{ parameters.base64Encode }}
26+
storageAccount: dotnetbuilds
27+
container: internal
28+
permissions: rl

‎eng/common/templates-official/steps/get-delegation-sas.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
parameters:
2+
- name: federatedServiceConnection
3+
type: string
4+
- name: outputVariableName
5+
type: string
6+
- name: expiryInHours
7+
type: number
8+
default: 1
9+
- name: base64Encode
10+
type: boolean
11+
default: false
12+
- name: storageAccount
13+
type: string
14+
- name: container
15+
type: string
16+
- name: permissions
17+
type: string
18+
default: 'rl'
19+
20+
steps:
21+
- task: AzureCLI@2
22+
displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}'
23+
inputs:
24+
azureSubscription: ${{ parameters.federatedServiceConnection }}
25+
scriptType: 'pscore'
26+
scriptLocation: 'inlineScript'
27+
inlineScript: |
28+
# Calculate the expiration of the SAS token and convert to UTC
29+
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
30+
31+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
32+
33+
if ($LASTEXITCODE -ne 0) {
34+
Write-Error "Failed to generate SAS token."
35+
exit 1
36+
}
37+
38+
if ('${{ parameters.base64Encode }}' -eq 'true') {
39+
$sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))
40+
}
41+
42+
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
43+
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas"

0 commit comments

Comments
 (0)