Skip to content

Commit fdfd7d0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200827.5 (#25373)
[release/5.0] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
1 parent e272a00 commit fdfd7d0

File tree

13 files changed

+184
-141
lines changed

13 files changed

+184
-141
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,13 @@
317317
<Uri>https://github.com/dotnet/runtime</Uri>
318318
<Sha>1dfd9438149f74ae11918a7b0709b8d58c61443f</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20419.21">
320+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20427.5">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
322+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20419.21">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20427.5">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
326+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
327327
</Dependency>
328328
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3">
329329
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Param(
2323
[switch][Alias('nobl')]$excludeCIBinarylog,
2424
[switch] $ci,
2525
[switch] $prepareMachine,
26+
[string] $runtimeSourceFeed = '',
27+
[string] $runtimeSourceFeedKey = '',
2628
[switch] $help,
2729
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2830
)

‎eng/common/build.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ projects=''
7676
configuration='Debug'
7777
prepare_machine=false
7878
verbosity='minimal'
79+
runtime_source_feed=''
80+
runtime_source_feed_key=''
7981

8082
properties=''
81-
8283
while [[ $# > 0 ]]; do
8384
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
8485
case "$opt" in
@@ -151,6 +152,14 @@ while [[ $# > 0 ]]; do
151152
node_reuse=$2
152153
shift
153154
;;
155+
-runtimesourcefeed)
156+
runtime_source_feed=$2
157+
shift
158+
;;
159+
-runtimesourcefeedkey)
160+
runtime_source_feed_key=$2
161+
shift
162+
;;
154163
*)
155164
properties="$properties $1"
156165
;;

‎eng/common/cross/armel/tizen-build-rootfs.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ rm -rf $TIZEN_TMP_DIR
3030

3131
# Configure Tizen rootfs
3232
echo ">>Start configuring Tizen rootfs"
33-
rm ./usr/lib/libunwind.so
34-
ln -s libunwind.so.8 ./usr/lib/libunwind.so
3533
ln -sfn asm-arm ./usr/include/asm
3634
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
3735
echo "<<Finish configuring Tizen rootfs"

‎eng/common/cross/armel/tizen/tizen.patch‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,3 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
77
OUTPUT_FORMAT(elf32-littlearm)
88
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) )
10-
diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so
11-
--- a/usr/lib/libpthread.so 2016-12-30 23:00:19.408951841 +0900
12-
+++ b/usr/lib/libpthread.so 2016-12-30 23:00:39.068951801 +0900
13-
@@ -2,4 +2,4 @@
14-
Use the shared library, but some functions are only in
15-
the static library, so try that secondarily. */
16-
OUTPUT_FORMAT(elf32-littlearm)
17-
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
18-
+GROUP ( libpthread.so.0 libpthread_nonshared.a )

‎eng/common/performance/blazor_perf.proj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
2+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
3+
<Python>python3</Python>
4+
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
9+
<PayloadDirectory>%(Identity)</PayloadDirectory>
10+
</HelixCorrelationPayload>
11+
</ItemGroup>
12+
13+
<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
14+
<ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
15+
<BlazorDirectory>$(ScenarioDirectory)blazor\</BlazorDirectory>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
18+
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
19+
<BlazorDirectory>$(ScenarioDirectory)blazor/</BlazorDirectory>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<HelixWorkItem Include="SOD - New Blazor Template - Publish">
24+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
25+
<PreCommands>cd $(BlazorDirectory);$(Python) pre.py publish --msbuild %27/p:_TrimmerDumpDependencies=true%27 --msbuild-static AdditionalMonoLinkerOptions=%27&quot;%24(AdditionalMonoLinkerOptions) --dump-dependencies&quot;%27 --binlog %27./traces/blazor_publish.binlog%27</PreCommands>
26+
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
27+
<PostCommands>$(Python) post.py</PostCommands>
28+
</HelixWorkItem>
29+
</ItemGroup>
30+
</Project>

‎eng/common/performance/crossgen_perf.proj‎

Lines changed: 51 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,68 @@
11
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
22

3+
<ItemGroup>
4+
<HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
5+
<PayloadDirectory>%(Identity)</PayloadDirectory>
6+
</HelixCorrelationPayload>
7+
</ItemGroup>
8+
9+
<!--
10+
Crossgen and Crossgen2 Scenario WorkItems
11+
-->
312
<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
413
<Python>py -3</Python>
5-
<HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%</HelixPreCommands>
6-
<ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
7-
<BaseDirectory>$HELIX_CORRELATION_PAYLOAD</BaseDirectory>
8-
<PerformanceDirectory>$(BaseDirectory)/performance</PerformanceDirectory>
14+
<HelixPreCommands>$(HelixPreCommands)</HelixPreCommands>
15+
<CoreRoot>%HELIX_CORRELATION_PAYLOAD%\Core_Root</CoreRoot>
16+
<ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
17+
<CrossgenDirectory>$(ScenarioDirectory)crossgen\</CrossgenDirectory>
18+
<Crossgen2Directory>$(ScenarioDirectory)crossgen2\</Crossgen2Directory>
919
</PropertyGroup>
10-
11-
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
12-
<WorkItemCommand>$(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj)</WorkItemCommand>
13-
<CliArguments>--dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP</CliArguments>
20+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
1421
<Python>python3</Python>
15-
<CoreRun>$(BaseDirectory)/Core_Root/corerun</CoreRun>
16-
<HelixPreCommands>$(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh</HelixPreCommands>
17-
<ArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts</ArtifactsDirectory>
18-
<BaselineArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
19-
<ResultsComparer>$(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj</ResultsComparer>
20-
<DotnetExe>$(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet</DotnetExe>
21-
<Percent>%25</Percent>
22-
<XMLResults>$HELIX_WORKITEM_ROOT/testResults.xml</XMLResults>
23-
</PropertyGroup>
22+
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update</HelixPreCommands>
23+
<CoreRoot>$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot>
24+
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
25+
<CrossgenDirectory>$(ScenarioDirectory)crossgen/</CrossgenDirectory>
26+
<Crossgen2Directory>$(ScenarioDirectory)crossgen2/</Crossgen2Directory>
27+
</PropertyGroup>
2428

2529
<ItemGroup>
26-
<HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
27-
<PayloadDirectory>%(Identity)</PayloadDirectory>
28-
</HelixCorrelationPayload>
30+
<SingleAssembly Include="System.Private.Xml.dll"/>
31+
<SingleAssembly Include="System.Linq.Expressions.dll"/>
32+
<SingleAssembly Include="Microsoft.CodeAnalysis.VisualBasic.dll"/>
33+
<SingleAssembly Include="Microsoft.CodeAnalysis.CSharp.dll"/>
34+
<SingleAssembly Include="System.Private.CoreLib.dll"/>
35+
</ItemGroup>
36+
<ItemGroup>
37+
<Composite Include="framework-r2r.dll.rsp"/>
2938
</ItemGroup>
3039

31-
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
32-
<HelixWorkItem Include="Crossgen System.Private.Xml.dll">
33-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
34-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
35-
</HelixWorkItem>
36-
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
37-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
38-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
39-
</HelixWorkItem>
40-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
41-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
42-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
43-
</HelixWorkItem>
44-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
45-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
46-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
47-
</HelixWorkItem>
48-
<HelixWorkItem Include="Crossgen System.Private.CoreLib.dll">
49-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
50-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
51-
</HelixWorkItem>
40+
<ItemGroup>
41+
<CrossgenWorkItem Include="@(SingleAssembly)">
42+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
43+
<Command>$(Python) $(CrossgenDirectory)test.py crossgen --core-root $(CoreRoot) --test-name %(Identity)</Command>
44+
</CrossgenWorkItem>
5245
</ItemGroup>
5346

54-
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'">
55-
<HelixWorkItem Include="Crossgen2 System.Private.Xml.dll">
56-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
57-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
58-
</HelixWorkItem>
59-
<HelixWorkItem Include="Crossgen2 System.Linq.Expressions.dll">
60-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
61-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
62-
</HelixWorkItem>
63-
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.VisualBasic.dll">
64-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
65-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
66-
</HelixWorkItem>
67-
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.CSharp.dll">
68-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
69-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
47+
<ItemGroup>
48+
<Crossgen2WorkItem Include="@(SingleAssembly)">
49+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
50+
<Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity)</Command>
51+
</Crossgen2WorkItem>
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<!-- Enable crossgen tests on Windows x64 and Windows x86 -->
56+
<HelixWorkItem Include="@(CrossgenWorkItem -> 'Crossgen %(Identity)')" Condition="'$(AGENT_OS)' == 'Windows_NT'">
57+
<Timeout>4:00</Timeout>
7058
</HelixWorkItem>
71-
<HelixWorkItem Include="Crossgen2 System.Private.CoreLib.dll">
72-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
73-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
59+
<!-- Enable crossgen2 tests on Windows x64 and Linux x64 -->
60+
<HelixWorkItem Include="@(Crossgen2WorkItem -> 'Crossgen2 %(Identity)')" Condition="'$(Architecture)' == 'x64'">
61+
<Timeout>4:00</Timeout>
7462
</HelixWorkItem>
75-
<HelixWorkItem Include="Crossgen2 Composite Framework R2R">
76-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
77-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
63+
<HelixWorkItem Include="Crossgen2 Composite Framework R2R" Condition="'$(Architecture)' == 'x64'">
64+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
65+
<Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp</Command>
7866
<Timeout>1:00</Timeout>
7967
</HelixWorkItem>
8068
</ItemGroup>

‎eng/common/performance/microbenchmarks.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
</PropertyGroup>
4747

4848
<PropertyGroup Condition="'$(MonoDotnet)' == 'true' and '$(AGENT_OS)' == 'Windows_NT'">
49-
<CoreRunArgument>--corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\5.0.0\corerun.exe</CoreRunArgument>
49+
<CoreRunArgument>--corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\6.0.0\corerun.exe</CoreRunArgument>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(MonoDotnet)' == 'true' and '$(AGENT_OS)' != 'Windows_NT'">
52-
<CoreRunArgument>--corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun</CoreRunArgument>
52+
<CoreRunArgument>--corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/6.0.0/corerun</CoreRunArgument>
5353
</PropertyGroup>
5454

5555
<PropertyGroup Condition="'$(UseCoreRun)' == 'true'">

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

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use_baseline_core_run=true
2626
using_mono=false
2727
wasm_runtime_loc=
2828
using_wasm=false
29+
use_latest_dotnet=false
2930

3031
while (($# > 0)); do
3132
lowerI="$(echo $1 | awk '{print tolower($0)}')"
@@ -115,7 +116,11 @@ while (($# > 0)); do
115116
configurations=$2
116117
shift 2
117118
;;
118-
--help)
119+
--latestdotnet)
120+
use_latest_dotnet=true
121+
shift 1
122+
;;
123+
*)
119124
echo "Common settings:"
120125
echo " --corerootdirectory <value> Directory where Core_Root exists, if running perf testing with --corerun"
121126
echo " --architecture <value> Architecture of the testing being run"
@@ -137,6 +142,7 @@ while (($# > 0)); do
137142
echo " --internal If the benchmarks are running as an official job."
138143
echo " --monodotnet Pass the path to the mono dotnet for mono performance testing."
139144
echo " --wasm Path to the unpacked wasm runtime pack."
145+
echo " --latestdotnet --dotnet-versions will not be specified. --dotnet-versions defaults to LKG version in global.json "
140146
echo ""
141147
exit 0
142148
;;
@@ -194,28 +200,30 @@ if [[ "$internal" == true ]]; then
194200
fi
195201
fi
196202

197-
if [[ "$mono_dotnet" != "" ]]; then
203+
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
198204
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
205+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
199206
fi
200207

201208
if [[ "$wasm_runtime_loc" != "" ]]; then
202-
configurations="CompilationMode=wasm RunKind=micro"
203-
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM"
209+
configurations="CompilationMode=wasm RunKind=$kind"
210+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM NoMono"
204211
fi
205212

206-
if [[ "$monointerpreter" == "true" ]]; then
207-
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter"
213+
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then
214+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono"
208215
fi
209216

210217
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
211218
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
212219

213220

214-
# Get the tools section from the global.json.
215-
# This grabs the LKG version number of dotnet and passes it to our scripts
216-
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
217-
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
218-
221+
if [[ "$use_latest_dotnet" = false ]]; then
222+
# Get the tools section from the global.json.
223+
# This grabs the LKG version number of dotnet and passes it to our scripts
224+
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
225+
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
226+
fi
219227

220228
if [[ "$run_from_perf_repo" = true ]]; then
221229
payload_directory=
@@ -266,7 +274,7 @@ Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_dire
266274
Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
267275
Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
268276
Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
269-
Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
277+
Write-PipelineSetVariable -name "Python" -value "python3" -is_multi_job_variable false
270278
Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
271279
Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
272280
Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false

0 commit comments

Comments
 (0)