Skip to content

Commit 7a75ab3

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20201123.2 (#28246)
[master] Update dependencies from dotnet/arcade
1 parent e43027e commit 7a75ab3

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,17 +309,17 @@
309309
<Uri>https://github.com/dotnet/runtime</Uri>
310310
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20567.7">
312+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
314+
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20567.7">
316+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20573.2">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
318+
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20567.7">
320+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20573.2">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
322+
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
323323
</Dependency>
324324
</ToolsetDependencies>
325325
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<MicrosoftEntityFrameworkCoreVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreVersion>
142142
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreDesignVersion>
143143
<!-- Packages from dotnet/arcade -->
144-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20567.7</MicrosoftDotNetBuildTasksInstallersVersion>
144+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20573.2</MicrosoftDotNetBuildTasksInstallersVersion>
145145
</PropertyGroup>
146146
<!--
147147

eng/common/performance/crossgen_perf.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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>
@@ -69,7 +69,7 @@
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 &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
72+
<Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
7373
<PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
7474
</CrossgenSizeOnDiskWorkItem>
7575
</ItemGroup>
@@ -78,7 +78,7 @@
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 &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
81+
<Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
8282
<PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
8383
</Crossgen2SizeOnDiskWorkItem>
8484
</ItemGroup>

eng/common/performance/performance-setup.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff 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
201207
fi
202208

203209
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then

eng/common/post-build/sourcelink-validation.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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++

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.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20567.7"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20573.2"
3535
}
3636
}

0 commit comments

Comments
 (0)