Update dependencies from https://github.com/dotnet/arcade build 20201123.2 (#1775)

[master] Update dependencies from dotnet/arcade

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4a9d2dfc08884e53772bb742af935adbdfb5a3a2..da545bda2279f79f1e69a7b2fac8c8aad56ce2c5 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,9 +4,9 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20567.7">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20573.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
+      <Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SymbolStore" Version="1.0.156601">
       <Uri>https://github.com/dotnet/symstore</Uri>
@@ -26,9 +26,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20567.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
+      <Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-alpha.1.20577.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index cbb5bc1ab8cb1f6ee47055d2e564745e05757fa8..d47503701bf2cc0e1651191978d3741260692040 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,7 +63,7 @@
     <SystemThreadingChannelsVersion>4.7.0</SystemThreadingChannelsVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20567.7</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20573.2</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
   </PropertyGroup>
 </Project>

diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj
index cf09e40578a5b8e9bdaa94932d25d952b04ec595..eb8bdd9c440cd9c279521b2c67b292bd7c11fec4 100644 (file)
--- a/eng/common/performance/crossgen_perf.proj
+++ b/eng/common/performance/crossgen_perf.proj
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
     <Python>python3</Python>
-    <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update</HelixPreCommands>
+    <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>
     <CoreRoot>$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot>
     <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
     <CrossgenDirectory>$(ScenarioDirectory)crossgen/</CrossgenDirectory>
@@ -69,7 +69,7 @@
     <CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
       <PreCommands>$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
-      <Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
+      <Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
       <PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
     </CrossgenSizeOnDiskWorkItem>
   </ItemGroup>
@@ -78,7 +78,7 @@
     <Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
       <PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
-      <Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
+      <Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
       <PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
     </Crossgen2SizeOnDiskWorkItem>
   </ItemGroup>

diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 315815a9677743ff8d30cb6bbf37e2b0d99715f0..c8e211bcb1bb6760c58d4e0b67a796e5f590c992 100644 (file)
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
     else
         queue=Ubuntu.1804.Amd64.Tiger.Perf
     fi
+else
+    if [[ "$architecture" = "arm64" ]]; then
+        queue=ubuntu.1804.armarch.open
+    else
+        queue=Ubuntu.1804.Amd64.Open
+    fi
 fi
 
 if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then

diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 1728b742b3b7bf73867b5e562a12383e6aaf7569..1c46f7b6341482322cbd04b18e1e9b0d92fb5f30 100644 (file)
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -164,7 +164,7 @@ function CheckJobResult(
     [ref]$ValidationFailures,
     [switch]$logErrors) {
   if ($result -ne '0') {
-    if ($logError) {
+    if ($logErrors) {
       Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
     }
     $ValidationFailures.Value++

diff --git a/global.json b/global.json
index ce13ba0bb0ab03d44a628aba766327ce7d5e29ff..3026b1bd060f27c6330d3994674cef995c0c00cf 100644 (file)
--- a/global.json
+++ b/global.json
@@ -15,6 +15,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
   }
 }