[main] Update arcade and xharness (#22981)

* Update arcade

* Update dotnet-tools.json

* Update xharness

.config/dotnet-tools.json

@@ -21,7 +21,7 @@
  ]
  },
  "microsoft.dotnet.xharness.cli": {
- "version": "9.0.0-prerelease.24304.1",
+ "version": "9.0.0-prerelease.24311.2",
  "commands": [
  "xharness"
  ]

eng/Version.Details.xml

@@ -1,26 +1,26 @@
 <Dependencies>
  <ProductDependencies>
- <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24304.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24311.2">
  <Uri>https:/dotnet/xharness</Uri>
- <Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
+ <Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24304.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24311.2">
  <Uri>https:/dotnet/xharness</Uri>
- <Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
+ <Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24304.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24311.2">
  <Uri>https:/dotnet/xharness</Uri>
- <Sha>03a55dc4462c3851ce4bb939e71410136ea8f5e3</Sha>
+ <Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24225.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24310.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
+ <Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24225.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
+ <Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
  </ToolsetDependencies>

eng/Versions.props

@@ -104,16 +104,16 @@
  <_HarfBuzzSharpVersion>7.3.0.2</_HarfBuzzSharpVersion>
  <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086</_SkiaSharpNativeAssetsVersion>
  <MicrosoftTemplateEngineTasksVersion>7.0.114</MicrosoftTemplateEngineTasksVersion>
- <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
- <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
- <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24304.1</MicrosoftDotNetXHarnessCLIVersion>
+ <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+ <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+ <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessCLIVersion>
  <TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
  <SvgSkiaPackageVersion>1.0.0.16</SvgSkiaPackageVersion>
  <FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
  <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
  <ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
  <SystemDrawingCommonPackageVersion>8.0.3</SystemDrawingCommonPackageVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24310.5</MicrosoftDotNetBuildTasksFeedVersion>
  </PropertyGroup>
  <PropertyGroup>
  <MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>

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

@@ -1,6 +1,7 @@
 parameters:
  runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20230228.2
+ sourceIndexUploadPackageVersion: 2.0.0-20240502.12
+ sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
  preSteps: []
@@ -14,14 +15,14 @@ jobs:
  dependsOn: ${{ parameters.dependsOn }}
  condition: ${{ parameters.condition }}
  variables:
- - name: SourceIndexPackageVersion
- value: ${{ parameters.sourceIndexPackageVersion }}
+ - name: SourceIndexUploadPackageVersion
+ value: ${{ parameters.sourceIndexUploadPackageVersion }}
+ - name: SourceIndexProcessBinlogPackageVersion
+ value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
  - name: SourceIndexPackageSource
  value: ${{ parameters.sourceIndexPackageSource }}
  - name: BinlogPath
  value: ${{ parameters.binlogPath }}
- - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - group: source-dot-net stage1 variables
  - template: /eng/common/templates-official/variables/pool-providers.yml
 
  ${{ if ne(parameters.pool, '') }}:
@@ -41,16 +42,16 @@ jobs:
  - ${{ preStep }}
 
  - task: UseDotNet@2
- displayName: Use .NET Core SDK 6
+ displayName: Use .NET 8 SDK
  inputs:
  packageType: sdk
- version: 6.0.x
+ version: 8.0.x
  installationPath: $(Agent.TempDirectory)/dotnet
  workingDirectory: $(Agent.TempDirectory)
 
  - script: |
- $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
- $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
  displayName: Download Tools
  # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
  workingDirectory: $(Agent.TempDirectory)
@@ -62,7 +63,21 @@ jobs:
  displayName: Process Binlog into indexable sln
 
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
+ - task: AzureCLI@2
+ displayName: Get stage 1 auth token
+ inputs:
+ azureSubscription: 'SourceDotNet Stage1 Publish'
+ addSpnToEnvironment: true
+ scriptType: 'ps'
+ scriptLocation: 'inlineScript'
+ inlineScript: |
+ 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: |
+ 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
- env:
- BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

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

@@ -1,6 +1,7 @@
 parameters:
  runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20230228.2
+ sourceIndexUploadPackageVersion: 2.0.0-20240502.12
+ sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
  preSteps: []
@@ -14,14 +15,14 @@ jobs:
  dependsOn: ${{ parameters.dependsOn }}
  condition: ${{ parameters.condition }}
  variables:
- - name: SourceIndexPackageVersion
- value: ${{ parameters.sourceIndexPackageVersion }}
+ - name: SourceIndexUploadPackageVersion
+ value: ${{ parameters.sourceIndexUploadPackageVersion }}
+ - name: SourceIndexProcessBinlogPackageVersion
+ value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
  - name: SourceIndexPackageSource
  value: ${{ parameters.sourceIndexPackageSource }}
  - name: BinlogPath
  value: ${{ parameters.binlogPath }}
- - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - group: source-dot-net stage1 variables
  - template: /eng/common/templates/variables/pool-providers.yml
 
  ${{ if ne(parameters.pool, '') }}:
@@ -40,16 +41,16 @@ jobs:
  - ${{ preStep }}
 
  - task: UseDotNet@2
- displayName: Use .NET Core SDK 6
+ displayName: Use .NET 8 SDK
  inputs:
  packageType: sdk
- version: 6.0.x
+ version: 8.0.x
  installationPath: $(Agent.TempDirectory)/dotnet
  workingDirectory: $(Agent.TempDirectory)
 
  - script: |
- $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
- $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
  displayName: Download Tools
  # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
  workingDirectory: $(Agent.TempDirectory)
@@ -61,7 +62,21 @@ jobs:
  displayName: Process Binlog into indexable sln
 
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
+ - task: AzureCLI@2
+ displayName: Get stage 1 auth token
+ inputs:
+ azureSubscription: 'SourceDotNet Stage1 Publish'
+ addSpnToEnvironment: true
+ scriptType: 'ps'
+ scriptLocation: 'inlineScript'
+ inlineScript: |
+ 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: |
+ 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
- env:
- BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

global.json

@@ -1,10 +1,10 @@
 {
  "tools": {
- "dotnet": "9.0.100-preview.3.24204.13"
+ "dotnet": "9.0.100-preview.4.24267.66"
  },
  "msbuild-sdks": {
  "MSBuild.Sdk.Extras": "3.0.44",
  "Microsoft.Build.NoTargets": "3.7.0",
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5"
  }
 }