-
Notifications
You must be signed in to change notification settings - Fork 378
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged PR 41074: [internal/release/6.0.4xx] Merge from public
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code enhancement and internal feature addition. #### PR Summary This pull request introduces new YAML templates for generating SAS tokens and federated access tokens, along with updates to existing build and release workflows to support internal sources and authentication. - Added `get-delegation-sas.yml` and `get-federated-access-token.yml` templates for generating SAS tokens and access tokens. - Updated `source-index-stage1.yml` and `source-build.yml` to include steps for Azure authentication and internal source enabling. - Modified `azure-pipelines.yml` and `azure-pipelines-pr.yml` to integrate new internal runtime enabling steps. - Updated `NuGet.config` to include new internal package sources. - Bumped `Microsoft.DotNet.Arcade.Sdk` version in `Version.Details.xml`.
- Loading branch information
Showing
21 changed files
with
334 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| name: Inter-branch merge workflow | ||
| on: | ||
| push: | ||
| branches: | ||
| - release/** | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| Merge: | ||
| uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
eng/common/templates-official/steps/enable-internal-runtimes.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' | ||
| # variable with the base64-encoded SAS token, by default | ||
|
|
||
| parameters: | ||
| - name: federatedServiceConnection | ||
| type: string | ||
| default: 'dotnetbuilds-internal-read' | ||
| - name: outputVariableName | ||
| type: string | ||
| default: 'dotnetbuilds-internal-container-read-token-base64' | ||
| - name: expiryInHours | ||
| type: number | ||
| default: 1 | ||
| - name: base64Encode | ||
| type: boolean | ||
| default: true | ||
|
|
||
| steps: | ||
| - ${{ if ne(variables['System.TeamProject'], 'public') }}: | ||
| - template: /eng/common/templates-official/steps/get-delegation-sas.yml | ||
| parameters: | ||
| federatedServiceConnection: ${{ parameters.federatedServiceConnection }} | ||
| outputVariableName: ${{ parameters.outputVariableName }} | ||
| expiryInHours: ${{ parameters.expiryInHours }} | ||
| base64Encode: ${{ parameters.base64Encode }} | ||
| storageAccount: dotnetbuilds | ||
| container: internal | ||
| permissions: rl |
43 changes: 43 additions & 0 deletions
43
eng/common/templates-official/steps/get-delegation-sas.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| parameters: | ||
| - name: federatedServiceConnection | ||
| type: string | ||
| - name: outputVariableName | ||
| type: string | ||
| - name: expiryInHours | ||
| type: number | ||
| default: 1 | ||
| - name: base64Encode | ||
| type: boolean | ||
| default: false | ||
| - name: storageAccount | ||
| type: string | ||
| - name: container | ||
| type: string | ||
| - name: permissions | ||
| type: string | ||
| default: 'rl' | ||
|
|
||
| steps: | ||
| - task: AzureCLI@2 | ||
| displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' | ||
| inputs: | ||
| azureSubscription: ${{ parameters.federatedServiceConnection }} | ||
| scriptType: 'pscore' | ||
| scriptLocation: 'inlineScript' | ||
| inlineScript: | | ||
| # Calculate the expiration of the SAS token and convert to UTC | ||
| $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") | ||
| $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 | ||
| if ($LASTEXITCODE -ne 0) { | ||
| Write-Error "Failed to generate SAS token." | ||
| exit 1 | ||
| } | ||
| if ('${{ parameters.base64Encode }}' -eq 'true') { | ||
| $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) | ||
| } | ||
| Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" | ||
| Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" |
Oops, something went wrong.