[main] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -296,17 +296,17 @@
  <Uri>https://github.com/dotnet/runtime</Uri>
  <Sha>7795971839be34099b07595fdcf47b95f048a730</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21179.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
+ <Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21167.3">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21179.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
+ <Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21179.7">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
+ <Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -138,7 +138,7 @@
  <MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.4.21177.2</MicrosoftEntityFrameworkCoreVersion>
  <MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.4.21177.2</MicrosoftEntityFrameworkCoreDesignVersion>
  <!-- Packages from dotnet/arcade -->
- <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21179.7</MicrosoftDotNetBuildTasksInstallersVersion>
  </PropertyGroup>
  <!--
 

eng/common/generate-locproject.ps1

@@ -38,7 +38,7 @@ if ($allXlfFiles) {
  $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
 }
 $langXlfFiles | ForEach-Object {
- $null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
+ $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
 
  $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
  $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
@@ -52,7 +52,7 @@ $locJson = @{
  LanguageSet = $LanguageSet
  LocItems = @(
  $locFiles | ForEach-Object {
- $outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
+ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
  $continue = $true
  foreach ($exclusion in $exclusions.Exclusions) {
  if ($outputPath.Contains($exclusion))
@@ -79,7 +79,7 @@ $locJson = @{
 }
 
 $json = ConvertTo-Json $locJson -Depth 5
-Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
+Write-Host "LocProject.json generated:`n`n$json`n`n"
 Pop-Location
 
 if (!$UseCheckedInLocProjectJson) {
@@ -91,7 +91,7 @@ else {
  Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
 
  if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
- Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
+ Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
 
  exit 1
  }

eng/common/performance/performance-setup.ps1

@@ -83,7 +83,7 @@ if ($RunFromPerformanceRepo) {
  robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git
 }
 else {
- git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory
+ git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory
 }
 
 if($MonoDotnet -ne "")

eng/common/performance/performance-setup.sh

@@ -17,6 +17,7 @@ kind="micro"
 llvm=false
 monointerpreter=false
 monoaot=false
+monoaot_path=
 run_categories="Libraries Runtime"
 csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
 configurations="CompliationMode=$compilation_mode RunKind=$kind"
@@ -107,7 +108,8 @@ while (($# > 0)); do
  ;;
  --monoaot)
  monoaot=true
- shift 1
+ monoaot_path=$2
+ shift 2
  ;;
  --monodotnet)
  mono_dotnet=$2
@@ -230,6 +232,11 @@ if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then
  extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono"
 fi
 
+if [[ "$monoaot" == "true" ]]; then
+ configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
+ extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoAOT"
+fi
+
 common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
 setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
 
@@ -239,7 +246,7 @@ if [[ "$run_from_perf_repo" = true ]]; then
  performance_directory=$workitem_directory
  setup_arguments="--perf-hash $commit_sha $common_setup_arguments"
 else
- git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
+ git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
 
  docs_directory=$performance_directory/docs
  mv $docs_directory $workitem_directory
@@ -252,12 +259,18 @@ if [[ "$wasm_runtime_loc" != "" ]]; then
  extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmMainJS \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm/runtime-test.js --wasmEngine /home/helixbot/.jsvu/v8 --customRuntimePack \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm"
 fi
 
-if [[ "$mono_dotnet" != "" ]]; then
+if [[ "$mono_dotnet" != "" ]] && [[ "$monoaot" == "false" ]]; then
  using_mono=true
  mono_dotnet_path=$payload_directory/dotnet-mono
  mv $mono_dotnet $mono_dotnet_path
 fi
 
+if [[ "$monoaot" == "true" ]]; then
+ monoaot_dotnet_path=$payload_directory/monoaot
+ mv $monoaot_path $monoaot_dotnet_path
+ extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --runtimes monoaotllvm --aotcompilerpath \$HELIX_CORRELATION_PAYLOAD/monoaot/sgen/mini/mono-sgen --customruntimepack \$HELIX_CORRELATION_PAYLOAD/monoaot/pack --aotcompilermode llvm"
+fi
+
 if [[ "$use_core_run" = true ]]; then
  new_core_root=$payload_directory/Core_Root
  mv $core_root_directory $new_core_root

eng/common/templates/job/onelocbuild.yml

@@ -46,16 +46,19 @@ jobs:
 
  - task: OneLocBuild@2
  displayName: OneLocBuild
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
  inputs:
  locProj: Localize/LocProject.json
  outDir: $(Build.ArtifactStagingDirectory)
  lclSource: ${{ parameters.LclSource }}
  lclPackageId: ${{ parameters.LclPackageId }}
  isCreatePrSelected: ${{ parameters.CreatePr }}
- repoType: ${{ parameters.RepoType }}
- gitHubPatVariable: "${{ parameters.GithubPat }}"
  packageSourceAuth: patAuth
  patVariable: ${{ parameters.CeapexPat }}
+ ${{ if eq(parameters.RepoType, 'gitHub') }}:
+ repoType: ${{ parameters.RepoType }}
+ gitHubPatVariable: "${{ parameters.GithubPat }}"
  condition: always()
 
  - task: PublishBuildArtifacts@1

eng/common/templates/steps/source-build.yml

@@ -36,7 +36,7 @@ steps:
 
  ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
  --configuration $buildConfig \
- --restore --build --pack --publish \
+ --restore --build --pack --publish -bl \
  $officialBuildArgs \
  $targetRidArgs \
  /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \

global.json

@@ -30,7 +30,7 @@
  },
  "msbuild-sdks": {
  "Yarn.MSBuild": "1.22.10",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21179.7",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21179.7"
  }
 }