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 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<Dependencies >
3
3
<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 " >
5
5
<Uri >https://github.com/dotnet/arcade</Uri >
6
- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
6
+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
7
7
</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 " >
9
9
<Uri >https://github.com/dotnet/arcade</Uri >
10
- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
10
+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
11
11
</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 " >
13
13
<Uri >https://github.com/dotnet/arcade</Uri >
14
- <Sha >a9a80fb35d2e7da21509441d665a40022ce8f1b4 </Sha >
14
+ <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
15
15
</Dependency >
16
16
</ToolsetDependencies >
17
17
<!-- ProductDependencies -->
Original file line number Diff line number Diff line change 2
2
<Project ToolsVersion =" 4.0" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
3
3
<PropertyGroup >
4
4
<PreReleaseVersionLabel >prerelease</PreReleaseVersionLabel >
5
- <MicrosoftDotNetGenAPIPackageVersion >6.0.0-beta.20567.7 </MicrosoftDotNetGenAPIPackageVersion >
5
+ <MicrosoftDotNetGenAPIPackageVersion >6.0.0-beta.20573.2 </MicrosoftDotNetGenAPIPackageVersion >
6
6
<!-- dotnet/corefx dependencies -->
7
7
<SystemDrawingCommonPackageVersion >5.0.0</SystemDrawingCommonPackageVersion >
8
8
<SystemIOPortsPackageVersion >5.0.0</SystemIOPortsPackageVersion >
Original file line number Diff line number Diff line change 19
19
</PropertyGroup >
20
20
<PropertyGroup Condition =" '$(AGENT_OS)' != 'Windows_NT'" >
21
21
<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 >
23
23
<CoreRoot >$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot >
24
24
<ScenarioDirectory >$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory >
25
25
<CrossgenDirectory >$(ScenarioDirectory)crossgen/</CrossgenDirectory >
69
69
<CrossgenSizeOnDiskWorkItem Include =" @(SingleAssembly)" Condition =" '$(Architecture)' == 'x64'" >
70
70
<PayloadDirectory >$(WorkItemDirectory)</PayloadDirectory >
71
71
<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 >
73
73
<PostCommands >$(Python) $(CrossgenDirectory)post.py</PostCommands >
74
74
</CrossgenSizeOnDiskWorkItem >
75
75
</ItemGroup >
78
78
<Crossgen2SizeOnDiskWorkItem Include =" @(SingleAssembly)" Condition =" '$(Architecture)' == 'x64'" >
79
79
<PayloadDirectory >$(WorkItemDirectory)</PayloadDirectory >
80
80
<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 >
82
82
<PostCommands >$(Python) $(Crossgen2Directory)post.py</PostCommands >
83
83
</Crossgen2SizeOnDiskWorkItem >
84
84
</ItemGroup >
Original file line number Diff line number Diff line change @@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
198
198
else
199
199
queue=Ubuntu.1804.Amd64.Tiger.Perf
200
200
fi
201
+ else
202
+ if [[ " $architecture " = " arm64" ]]; then
203
+ queue=ubuntu.1804.armarch.open
204
+ else
205
+ queue=Ubuntu.1804.Amd64.Open
206
+ fi
201
207
fi
202
208
203
209
if [[ " $mono_dotnet " != " " ]] && [[ " $monointerpreter " == " false" ]]; then
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ function CheckJobResult(
164
164
[ref ]$ValidationFailures ,
165
165
[switch ]$logErrors ) {
166
166
if ($result -ne ' 0' ) {
167
- if ($logError ) {
167
+ if ($logErrors ) {
168
168
Write-PipelineTelemetryError - Category ' SourceLink' - Message " $packagePath has broken SourceLink links."
169
169
}
170
170
$ValidationFailures.Value ++
Original file line number Diff line number Diff line change 11
11
"version" : " 5.0.100"
12
12
},
13
13
"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 "
16
16
}
17
17
}
You can’t perform that action at this time.
0 commit comments