Skip to content

Commit a788dc1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#31349)
[main] Update dependencies from dotnet/arcade
1 parent afce624 commit a788dc1

File tree

8 files changed

+36
-20
lines changed

8 files changed

+36
-20
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,17 @@
296296
<Uri>https://github.com/dotnet/runtime</Uri>
297297
<Sha>d2613848efd92dfaad21499a8de81916346a3b60</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21179.7">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
301+
<Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21167.3">
303+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21179.7">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
305+
<Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
307+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21179.7">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
309+
<Sha>fd5f55c64d48b7894516cc841fba1253b2e79ffd</Sha>
310310
</Dependency>
311311
</ToolsetDependencies>
312312
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.4.21179.3</MicrosoftEntityFrameworkCoreVersion>
139139
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.4.21179.3</MicrosoftEntityFrameworkCoreDesignVersion>
140140
<!-- Packages from dotnet/arcade -->
141-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksInstallersVersion>
141+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21179.7</MicrosoftDotNetBuildTasksInstallersVersion>
142142
</PropertyGroup>
143143
<!--
144144

‎eng/common/generate-locproject.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if ($allXlfFiles) {
3838
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
3939
}
4040
$langXlfFiles | ForEach-Object {
41-
$null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
41+
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
4242

4343
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
4444
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
@@ -52,7 +52,7 @@ $locJson = @{
5252
LanguageSet = $LanguageSet
5353
LocItems = @(
5454
$locFiles | ForEach-Object {
55-
$outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
55+
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
5656
$continue = $true
5757
foreach ($exclusion in $exclusions.Exclusions) {
5858
if ($outputPath.Contains($exclusion))
@@ -79,7 +79,7 @@ $locJson = @{
7979
}
8080

8181
$json = ConvertTo-Json $locJson -Depth 5
82-
Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
82+
Write-Host "LocProject.json generated:`n`n$json`n`n"
8383
Pop-Location
8484

8585
if (!$UseCheckedInLocProjectJson) {
@@ -91,7 +91,7 @@ else {
9191
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
9292

9393
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
94-
Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
94+
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
9595

9696
exit 1
9797
}

‎eng/common/performance/performance-setup.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ if ($RunFromPerformanceRepo) {
8383
robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git
8484
}
8585
else {
86-
git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory
86+
git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory
8787
}
8888

8989
if($MonoDotnet -ne "")

‎eng/common/performance/performance-setup.sh‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ kind="micro"
1717
llvm=false
1818
monointerpreter=false
1919
monoaot=false
20+
monoaot_path=
2021
run_categories="Libraries Runtime"
2122
csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
2223
configurations="CompliationMode=$compilation_mode RunKind=$kind"
@@ -107,7 +108,8 @@ while (($# > 0)); do
107108
;;
108109
--monoaot)
109110
monoaot=true
110-
shift 1
111+
monoaot_path=$2
112+
shift 2
111113
;;
112114
--monodotnet)
113115
mono_dotnet=$2
@@ -230,6 +232,11 @@ if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then
230232
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono"
231233
fi
232234

235+
if [[ "$monoaot" == "true" ]]; then
236+
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
237+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoAOT"
238+
fi
239+
233240
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
234241
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
235242

@@ -239,7 +246,7 @@ if [[ "$run_from_perf_repo" = true ]]; then
239246
performance_directory=$workitem_directory
240247
setup_arguments="--perf-hash $commit_sha $common_setup_arguments"
241248
else
242-
git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
249+
git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
243250

244251
docs_directory=$performance_directory/docs
245252
mv $docs_directory $workitem_directory
@@ -252,12 +259,18 @@ if [[ "$wasm_runtime_loc" != "" ]]; then
252259
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"
253260
fi
254261

255-
if [[ "$mono_dotnet" != "" ]]; then
262+
if [[ "$mono_dotnet" != "" ]] && [[ "$monoaot" == "false" ]]; then
256263
using_mono=true
257264
mono_dotnet_path=$payload_directory/dotnet-mono
258265
mv $mono_dotnet $mono_dotnet_path
259266
fi
260267

268+
if [[ "$monoaot" == "true" ]]; then
269+
monoaot_dotnet_path=$payload_directory/monoaot
270+
mv $monoaot_path $monoaot_dotnet_path
271+
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"
272+
fi
273+
261274
if [[ "$use_core_run" = true ]]; then
262275
new_core_root=$payload_directory/Core_Root
263276
mv $core_root_directory $new_core_root

‎eng/common/templates/job/onelocbuild.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,19 @@ jobs:
4646

4747
- task: OneLocBuild@2
4848
displayName: OneLocBuild
49+
env:
50+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
4951
inputs:
5052
locProj: Localize/LocProject.json
5153
outDir: $(Build.ArtifactStagingDirectory)
5254
lclSource: ${{ parameters.LclSource }}
5355
lclPackageId: ${{ parameters.LclPackageId }}
5456
isCreatePrSelected: ${{ parameters.CreatePr }}
55-
repoType: ${{ parameters.RepoType }}
56-
gitHubPatVariable: "${{ parameters.GithubPat }}"
5757
packageSourceAuth: patAuth
5858
patVariable: ${{ parameters.CeapexPat }}
59+
${{ if eq(parameters.RepoType, 'gitHub') }}:
60+
repoType: ${{ parameters.RepoType }}
61+
gitHubPatVariable: "${{ parameters.GithubPat }}"
5962
condition: always()
6063

6164
- task: PublishBuildArtifacts@1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ steps:
3636
3737
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
3838
--configuration $buildConfig \
39-
--restore --build --pack --publish \
39+
--restore --build --pack --publish -bl \
4040
$officialBuildArgs \
4141
$targetRidArgs \
4242
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.22.10",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21179.7",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21179.7"
3535
}
3636
}

0 commit comments

Comments
 (0)