Merge pull request #8092 from dotnet/darc-release/8.0.3xx-3b1e96de-25…

…94-4cf4-8f4d-594b37cc072b [release/8.0.3xx] Update dependencies from dotnet/arcade
dotnet · Jun 11, 2024 · 7248c3c · 7248c3c
2 parents 1bddd10 + 877faca
commit 7248c3c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -17,9 +17,9 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24270.4">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
+ <Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
  <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
@@ -23,7 +23,7 @@ jobs:
  value: ${{ parameters.sourceIndexPackageSource }}
  - name: BinlogPath
  value: ${{ parameters.binlogPath }}
- - template: /eng/common/templates/variables/pool-providers.yml
+ - template: /eng/common/templates-official/variables/pool-providers.yml
 
  ${{ if ne(parameters.pool, '') }}:
  pool: ${{ parameters.pool }}
@@ -34,7 +34,8 @@ jobs:
  demands: ImageOverride -equals windows.vs2019.amd64.open
  ${{ if eq(variables['System.TeamProject'], 'internal') }}:
  name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2019.amd64
+ image: windows.vs2022.amd64
+ os: windows
 
  steps:
  - ${{ each preStep in parameters.preSteps }}:
@@ -70,16 +71,13 @@ jobs:
  scriptType: 'ps'
  scriptLocation: 'inlineScript'
  inlineScript: |
- echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
- echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
- echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
+ echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
+ echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
+ echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
 
  - script: |
- echo "Client ID: $(ARM_CLIENT_ID)"
- echo "ID Token: $(ARM_ID_TOKEN)"
- echo "Tenant ID: $(ARM_TENANT_ID)"
  az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
  displayName: "Login to Azure"
 
  - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
- displayName: Upload stage1 artifacts to source index
+ displayName: Upload stage1 artifacts to source index
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
@@ -70,16 +70,13 @@ jobs:
  scriptType: 'ps'
  scriptLocation: 'inlineScript'
  inlineScript: |
- echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
- echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
- echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
+ echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
+ echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
+ echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
 
  - script: |
- echo "Client ID: $(ARM_CLIENT_ID)"
- echo "ID Token: $(ARM_ID_TOKEN)"
- echo "Tenant ID: $(ARM_TENANT_ID)"
  az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
  displayName: "Login to Azure"
 
  - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
- displayName: Upload stage1 artifacts to source index
+ displayName: Upload stage1 artifacts to source index
diff --git a/global.json b/global.json
@@ -3,6 +3,6 @@
  "dotnet": "8.0.101"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5"
  }
 }