Skip to content

Commit ad2e6b2

Browse files
mmitchemmitche
committed
Update to arcade with WiX fix (225805)
1 parent e53280a commit ad2e6b2

File tree

6 files changed

+73
-40
lines changed

6 files changed

+73
-40
lines changed

‎NuGet.config

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-087e153" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-087e1532/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +18,6 @@
1918
<clear />
2019
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2120
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-087e153" value="true" />
2321
<!-- End: Package sources from dotnet-runtime -->
2422
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2523
</disabledPackageSources>

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24266.3">
6060
<Uri>https://github.com/dotnet/arcade</Uri>
61-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
61+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24204.3">
63+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24266.3">
6464
<Uri>https://github.com/dotnet/arcade</Uri>
65-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
65+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24204.3">
67+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24266.3">
6868
<Uri>https://github.com/dotnet/arcade</Uri>
69-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
69+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
7070
</Dependency>
7171
</ToolsetDependencies>
7272
</Dependencies>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.5-servicing.24216.15</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3333
</PropertyGroup>
3434
<PropertyGroup Label="Dependencies from dotnet/arcade">
35-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksTemplatingVersion>
35+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksTemplatingVersion>
3636
</PropertyGroup>
3737
<PropertyGroup Label="Other dependencies">
3838
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

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

+33-16
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

+31-13
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24204.3"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24266.3"
1818
}
1919
}

0 commit comments

Comments
 (0)