Skip to content

Commit d289eac

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240610.5 (#473)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24270.4 -> To Version 8.0.0-beta.24310.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 4ebf1c5 commit d289eac

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24270.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
8+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24270.4">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24310.5">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
12+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

‎eng/common/templates-official/job/source-index-stage1.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
value: ${{ parameters.sourceIndexPackageSource }}
2424
- name: BinlogPath
2525
value: ${{ parameters.binlogPath }}
26-
- template: /eng/common/templates/variables/pool-providers.yml
26+
- template: /eng/common/templates-official/variables/pool-providers.yml
2727

2828
${{ if ne(parameters.pool, '') }}:
2929
pool: ${{ parameters.pool }}
@@ -34,7 +34,8 @@ jobs:
3434
demands: ImageOverride -equals windows.vs2019.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
37-
demands: ImageOverride -equals windows.vs2019.amd64
37+
image: windows.vs2022.amd64
38+
os: windows
3839

3940
steps:
4041
- ${{ each preStep in parameters.preSteps }}:
@@ -70,16 +71,13 @@ jobs:
7071
scriptType: 'ps'
7172
scriptLocation: 'inlineScript'
7273
inlineScript: |
73-
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
74-
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
75-
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
74+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
75+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
76+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
7677
7778
- script: |
78-
echo "Client ID: $(ARM_CLIENT_ID)"
79-
echo "ID Token: $(ARM_ID_TOKEN)"
80-
echo "Tenant ID: $(ARM_TENANT_ID)"
8179
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
8280
displayName: "Login to Azure"
8381
8482
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
85-
displayName: Upload stage1 artifacts to source index
83+
displayName: Upload stage1 artifacts to source index

‎eng/common/templates/job/source-index-stage1.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,13 @@ jobs:
7070
scriptType: 'ps'
7171
scriptLocation: 'inlineScript'
7272
inlineScript: |
73-
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
74-
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
75-
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
73+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
74+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
75+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
7676
7777
- script: |
78-
echo "Client ID: $(ARM_CLIENT_ID)"
79-
echo "ID Token: $(ARM_ID_TOKEN)"
80-
echo "Tenant ID: $(ARM_TENANT_ID)"
8178
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
8279
displayName: "Login to Azure"
8380
8481
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
85-
displayName: Upload stage1 artifacts to source index
82+
displayName: Upload stage1 artifacts to source index

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.101"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24270.4"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24310.5"
88
}
99
}

0 commit comments

Comments
 (0)