Skip to content

Commit 9a8f2dd

Browse files
marcpopMSFTmarcpopMSFT
authored
[release/8.0.3xx] Update dependencies from dotnet/arcade (#41520)
2 parents 8358d93 + 52248c4 commit 9a8f2dd

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

‎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.24270.4">
486+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
487487
<Uri>https://github.com/dotnet/arcade</Uri>
488-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
488+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
489489
<SourceBuild RepoName="arcade" ManagedOnly="true" />
490490
</Dependency>
491-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24270.4">
491+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24310.5">
492492
<Uri>https://github.com/dotnet/arcade</Uri>
493-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
493+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
494494
</Dependency>
495-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24270.4">
495+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24310.5">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
497+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24270.4">
499+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24310.5">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
501+
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</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.24270.4</MicrosoftDotNetSignToolVersion>
38+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24310.5</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.24270.4</MicrosoftDotNetXUnitExtensionsVersion>
213+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24310.5</MicrosoftDotNetXUnitExtensionsVersion>
214214
<MoqPackageVersion>4.18.4</MoqPackageVersion>
215215
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
216216
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎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
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24270.4"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24310.5"
1919
}
2020
}

0 commit comments

Comments
 (0)