Skip to content

Commit 1ef2ab9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240514.1 (#467)
[main] Update dependencies from dotnet/arcade
1 parent 3d5f140 commit 1ef2ab9

File tree

4 files changed

+70
-35
lines changed

4 files changed

+70
-35
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.24225.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24264.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
8+
<Sha>1814df258a66473d388b8884ac95bd1c8a2585a9</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24225.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24264.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
12+
<Sha>1814df258a66473d388b8884ac95bd1c8a2585a9</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

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

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -14,15 +15,15 @@ jobs:
1415
dependsOn: ${{ parameters.dependsOn }}
1516
condition: ${{ parameters.condition }}
1617
variables:
17-
- name: SourceIndexPackageVersion
18-
value: ${{ parameters.sourceIndexPackageVersion }}
18+
- name: SourceIndexUploadPackageVersion
19+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
20+
- name: SourceIndexProcessBinlogPackageVersion
21+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
1922
- name: SourceIndexPackageSource
2023
value: ${{ parameters.sourceIndexPackageSource }}
2124
- name: BinlogPath
2225
value: ${{ parameters.binlogPath }}
23-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: source-dot-net stage1 variables
25-
- template: /eng/common/templates-official/variables/pool-providers.yml
26+
- template: /eng/common/templates/variables/pool-providers.yml
2627

2728
${{ if ne(parameters.pool, '') }}:
2829
pool: ${{ parameters.pool }}
@@ -33,24 +34,23 @@ jobs:
3334
demands: ImageOverride -equals windows.vs2019.amd64.open
3435
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3536
name: $(DncEngInternalBuildPool)
36-
image: windows.vs2022.amd64
37-
os: windows
37+
demands: ImageOverride -equals windows.vs2019.amd64
3838

3939
steps:
4040
- ${{ each preStep in parameters.preSteps }}:
4141
- ${{ preStep }}
4242

4343
- task: UseDotNet@2
44-
displayName: Use .NET Core SDK 6
44+
displayName: Use .NET 8 SDK
4545
inputs:
4646
packageType: sdk
47-
version: 6.0.x
47+
version: 8.0.x
4848
installationPath: $(Agent.TempDirectory)/dotnet
4949
workingDirectory: $(Agent.TempDirectory)
5050

5151
- script: |
52-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5454
displayName: Download Tools
5555
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
5656
workingDirectory: $(Agent.TempDirectory)
@@ -62,7 +62,24 @@ jobs:
6262
displayName: Process Binlog into indexable sln
6363

6464
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
65-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
66-
displayName: Upload stage1 artifacts to source index
67-
env:
68-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
65+
- task: AzureCLI@2
66+
displayName: Get stage 1 auth token
67+
inputs:
68+
azureSubscription: 'SourceDotNet Stage1 Publish'
69+
addSpnToEnvironment: true
70+
scriptType: 'ps'
71+
scriptLocation: 'inlineScript'
72+
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"
76+
77+
- script: |
78+
echo "Client ID: $(ARM_CLIENT_ID)"
79+
echo "ID Token: $(ARM_ID_TOKEN)"
80+
echo "Tenant ID: $(ARM_TENANT_ID)"
81+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
82+
displayName: "Login to Azure"
83+
84+
- 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

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

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -14,14 +15,14 @@ jobs:
1415
dependsOn: ${{ parameters.dependsOn }}
1516
condition: ${{ parameters.condition }}
1617
variables:
17-
- name: SourceIndexPackageVersion
18-
value: ${{ parameters.sourceIndexPackageVersion }}
18+
- name: SourceIndexUploadPackageVersion
19+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
20+
- name: SourceIndexProcessBinlogPackageVersion
21+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
1922
- name: SourceIndexPackageSource
2023
value: ${{ parameters.sourceIndexPackageSource }}
2124
- name: BinlogPath
2225
value: ${{ parameters.binlogPath }}
23-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: source-dot-net stage1 variables
2526
- template: /eng/common/templates/variables/pool-providers.yml
2627

2728
${{ if ne(parameters.pool, '') }}:
@@ -40,16 +41,16 @@ jobs:
4041
- ${{ preStep }}
4142

4243
- task: UseDotNet@2
43-
displayName: Use .NET Core SDK 6
44+
displayName: Use .NET 8 SDK
4445
inputs:
4546
packageType: sdk
46-
version: 6.0.x
47+
version: 8.0.x
4748
installationPath: $(Agent.TempDirectory)/dotnet
4849
workingDirectory: $(Agent.TempDirectory)
4950

5051
- script: |
51-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5354
displayName: Download Tools
5455
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
5556
workingDirectory: $(Agent.TempDirectory)
@@ -61,7 +62,24 @@ jobs:
6162
displayName: Process Binlog into indexable sln
6263

6364
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
64-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
65-
displayName: Upload stage1 artifacts to source index
66-
env:
67-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
65+
- task: AzureCLI@2
66+
displayName: Get stage 1 auth token
67+
inputs:
68+
azureSubscription: 'SourceDotNet Stage1 Publish'
69+
addSpnToEnvironment: true
70+
scriptType: 'ps'
71+
scriptLocation: 'inlineScript'
72+
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"
76+
77+
- script: |
78+
echo "Client ID: $(ARM_CLIENT_ID)"
79+
echo "ID Token: $(ARM_ID_TOKEN)"
80+
echo "Tenant ID: $(ARM_TENANT_ID)"
81+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
82+
displayName: "Login to Azure"
83+
84+
- 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

‎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.24225.1",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24225.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24264.1",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24264.1"
88
}
99
}

0 commit comments

Comments
 (0)