Update dependencies from https://github.com/dotnet/arcade build 20200301.1 (#19494)

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20151.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20151.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20151.1
2020-03-02 14:26:34 +00:00 · 2020-03-02 14:26:34 +00:00 · 8a406d7f68
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -336,17 +336,17 @@
      <Uri>https://github.com/dotnet/extensions</Uri>
      <Sha>519ef585cfa587010fc1b6d3051c7f67c0e3e2d6</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20126.7">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cd4164e1f3f7daf2a6f8dbd012210c93521bd82f</Sha>
+      <Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20126.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20151.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cd4164e1f3f7daf2a6f8dbd012210c93521bd82f</Sha>
+      <Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20126.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cd4164e1f3f7daf2a6f8dbd012210c93521bd82f</Sha>
+      <Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
    </Dependency>
    <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-preview.2.20128.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
      <Uri>https://github.com/dotnet/extensions</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -62,7 +62,7 @@
  -->
  <PropertyGroup Label="Automated">
    <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20126.7</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20151.1</MicrosoftDotNetGenAPIPackageVersion>
    <!-- Packages from dotnet/roslyn -->
    <MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta4-20128-01</MicrosoftNetCompilersToolsetPackageVersion>
    <!-- Packages from dotnet/core-setup -->
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@ -63,7 +63,7 @@ case $cpuname in
  amd64|x86_64)
    buildarch=x64
    ;;
-  armv7l)
+  armv*l)
    buildarch=arm
    ;;
  i686)
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@ -34,6 +34,14 @@ while (($# > 0)); do
      force=true
      shift 1
      ;;
+    --donotabortonfailure)
+      donotabortonfailure=true
+      shift 1
+      ;;
+    --donotdisplaywarnings)
+      donotdisplaywarnings=true
+      shift 1
+      ;;
    --downloadretries)
      download_retries=$2
      shift 2
@ -52,6 +60,8 @@ while (($# > 0)); do
      echo "                                          - (default) %USERPROFILE%/.netcoreeng/native"
      echo ""
      echo "  --clean                             Switch specifying not to install anything, but cleanup native asset folders"
+      echo "  --donotabortonfailure               Switch specifiying whether to abort native tools installation on failure"
+      echo "  --donotdisplaywarnings              Switch specifiying whether to display warnings during native tools installation on failure"
      echo "  --force                             Clean and then install tools"
      echo "  --help                              Print help and exit"
      echo ""
@ -92,6 +102,7 @@ if [[ -z $install_directory ]]; then
 fi

 install_bin="${native_base_dir}/bin"
+installed_any=false

 ReadGlobalJsonNativeTools

@ -103,8 +114,8 @@ else
  for tool in "${!native_assets[@]}"
  do
    tool_version=${native_assets[$tool]}
-    installer_name="install-$tool.sh"
-    installer_command="$native_installer_dir/$installer_name"
+    installer_path="$native_installer_dir/install-$tool.sh"
+    installer_command="$installer_path"
    installer_command+=" --baseuri $base_uri"
    installer_command+=" --installpath $install_bin"
    installer_command+=" --version $tool_version"
@ -118,11 +129,29 @@ else
      installer_command+=" --clean"
    fi

-    $installer_command
-
-    if [[ $? != 0 ]]; then
-      Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
-      exit 1
+    if [[ -a $installer_path ]]; then
+      $installer_command
+      if [[ $? != 0 ]]; then
+        if [[ $donotabortonfailure = true ]]; then
+          if [[ $donotdisplaywarnings != true ]]; then
+            Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
+          fi
+        else
+          Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
+          exit 1
+        fi
+      else
+        $installed_any = true
+      fi
+    else
+      if [[ $donotabortonfailure == true ]]; then
+        if [[ $donotdisplaywarnings != true ]]; then
+          Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
+        fi
+      else
+        Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
+        exit 1
+      fi
    fi
  done
 fi
@ -135,8 +164,10 @@ if [[ -d $install_bin ]]; then
  echo "Native tools are available from $install_bin"
  echo "##vso[task.prependpath]$install_bin"
 else
-  Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
-  exit 1
+  if [[ $installed_any = true ]]; then
+    Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
+    exit 1
+  fi
 fi

 exit 0
--- a/eng/common/performance/perfhelixpublish.proj
+++ b/eng/common/performance/perfhelixpublish.proj
@ -6,7 +6,7 @@
    <Python>py -3</Python>
    <CoreRun>%HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe</CoreRun>
    <BaselineCoreRun>%HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe</BaselineCoreRun>
-    <HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%</HelixPreCommands>
    <ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
    <BaselineArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
    <ResultsComparer>%HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj</ResultsComparer>
@ -99,4 +99,23 @@
      <Timeout>4:00</Timeout>
    </HelixWorkItem>
  </ItemGroup>
+
+  <ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
+    <HelixWorkItem Include="Crossgen System.Private.Xml.dll">
+      <PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
+      <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>
+    </HelixWorkItem>
+     <HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
+      <PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
+      <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>
+    </HelixWorkItem>
+     <HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
+      <PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
+      <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>
+    </HelixWorkItem>
+     <HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
+      <PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
+      <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>
+    </HelixWorkItem>
+  </ItemGroup>
 </Project>
--- a/global.json
+++ b/global.json
@ -25,7 +25,7 @@
  },
  "msbuild-sdks": {
    "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20126.7",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20126.7"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1"
  }
 }