Update dependencies from https://github.com/dotnet/arcade build 20210325.1 (#10028)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21153.1 to 1.0.0-beta.21169.2 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
82a95978c4
commit
09efa9bf52
7 changed files with 28 additions and 15 deletions
|
@ -136,13 +136,13 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21175.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
|
||||
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</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.21175.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
|
||||
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
@ -152,9 +152,9 @@
|
|||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||
<Sha>99defc1944a90ef96ec966cb378780caf18c3922</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21153.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21169.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||
<Sha>f330177980c754b02cf80067f3bdd07454d5fccd</Sha>
|
||||
<Sha>0da469fe1c2714d0e25cad1143632562fb528425</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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 "")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 }} \
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21175.1"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue