File tree Expand file tree Collapse file tree 6 files changed +19
-13
lines changed Expand file tree Collapse file tree 6 files changed +19
-13
lines changed Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Dependencies >
33 <ToolsetDependencies >
4- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.20567.7 " >
4+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.20573.2 " >
55 <Uri >https://github.com/dotnet/arcade</Uri >
6- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
6+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
77 </Dependency >
8- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.20567.7 " >
8+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.20573.2 " >
99 <Uri >https://github.com/dotnet/arcade</Uri >
10- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
10+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
1111 </Dependency >
12- <Dependency Name =" Microsoft.DotNet.GenAPI" Version =" 6.0.0-beta.20567.7 " >
12+ <Dependency Name =" Microsoft.DotNet.GenAPI" Version =" 6.0.0-beta.20573.2 " >
1313 <Uri >https://github.com/dotnet/arcade</Uri >
14- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
14+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
1515 </Dependency >
1616 </ToolsetDependencies >
1717 <!-- ProductDependencies -->
Original file line number Diff line number Diff line change 22<Project ToolsVersion =" 4.0" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
33 <PropertyGroup >
44 <PreReleaseVersionLabel >prerelease</PreReleaseVersionLabel >
5- <MicrosoftDotNetGenAPIPackageVersion >6.0.0-beta.20567.7 </MicrosoftDotNetGenAPIPackageVersion >
5+ <MicrosoftDotNetGenAPIPackageVersion >6.0.0-beta.20573.2 </MicrosoftDotNetGenAPIPackageVersion >
66 <!-- dotnet/corefx dependencies -->
77 <SystemDrawingCommonPackageVersion >5.0.0</SystemDrawingCommonPackageVersion >
88 <SystemIOPortsPackageVersion >5.0.0</SystemIOPortsPackageVersion >
Original file line number Diff line number Diff line change 1919 </PropertyGroup >
2020 <PropertyGroup Condition =" '$(AGENT_OS)' != 'Windows_NT'" >
2121 <Python >python3</Python >
22- <HelixPreCommands >$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update</HelixPreCommands >
22+ <HelixPreCommands >$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk </HelixPreCommands >
2323 <CoreRoot >$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot >
2424 <ScenarioDirectory >$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory >
2525 <CrossgenDirectory >$(ScenarioDirectory)crossgen/</CrossgenDirectory >
6969 <CrossgenSizeOnDiskWorkItem Include =" @(SingleAssembly)" Condition =" '$(Architecture)' == 'x64'" >
7070 <PayloadDirectory >$(WorkItemDirectory)</PayloadDirectory >
7171 <PreCommands >$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands >
72- <Command >$(Python) $(CrossgenDirectory)test.py sod --scenario-name " Crossgen %(Identity) Size" --dirs ./crossgen/</Command >
72+ <Command >$(Python) $(CrossgenDirectory)test.py sod --scenario-name " Crossgen %(Identity) Size" --dirs ./crossgen.out /</Command >
7373 <PostCommands >$(Python) $(CrossgenDirectory)post.py</PostCommands >
7474 </CrossgenSizeOnDiskWorkItem >
7575 </ItemGroup >
7878 <Crossgen2SizeOnDiskWorkItem Include =" @(SingleAssembly)" Condition =" '$(Architecture)' == 'x64'" >
7979 <PayloadDirectory >$(WorkItemDirectory)</PayloadDirectory >
8080 <PreCommands >$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands >
81- <Command >$(Python) $(Crossgen2Directory)test.py sod --scenario-name " Crossgen2 %(Identity) Size" --dirs ./crossgen/</Command >
81+ <Command >$(Python) $(Crossgen2Directory)test.py sod --scenario-name " Crossgen2 %(Identity) Size" --dirs ./crossgen.out /</Command >
8282 <PostCommands >$(Python) $(Crossgen2Directory)post.py</PostCommands >
8383 </Crossgen2SizeOnDiskWorkItem >
8484 </ItemGroup >
Original file line number Diff line number Diff line change @@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
198198 else
199199 queue=Ubuntu.1804.Amd64.Tiger.Perf
200200 fi
201+ else
202+ if [[ " $architecture " = " arm64" ]]; then
203+ queue=ubuntu.1804.armarch.open
204+ else
205+ queue=Ubuntu.1804.Amd64.Open
206+ fi
201207fi
202208
203209if [[ " $mono_dotnet " != " " ]] && [[ " $monointerpreter " == " false" ]]; then
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ function CheckJobResult(
164164 [ref ]$ValidationFailures ,
165165 [switch ]$logErrors ) {
166166 if ($result -ne ' 0' ) {
167- if ($logError ) {
167+ if ($logErrors ) {
168168 Write-PipelineTelemetryError - Category ' SourceLink' - Message " $packagePath has broken SourceLink links."
169169 }
170170 $ValidationFailures.Value ++
Original file line number Diff line number Diff line change 1111 "version" : " 5.0.100"
1212 },
1313 "msbuild-sdks" : {
14- "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.20567.7 " ,
15- "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.20567.7 "
14+ "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.20573.2 " ,
15+ "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.20573.2 "
1616 }
1717}
You can’t perform that action at this time.
0 commit comments