From afaffb8fd4f802459dd00dab00ab3d59c27ce707 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Fri, 19 Jun 2020 10:45:55 -0400
Subject: [PATCH] Revert "Use Helix SDK to install xharness"

This reverts commit 42958debf69ba88c78274f1bf4bba917294f19c2.
---
 src/libraries/sendtohelixhelp.proj | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 3a7681941ea96..1cacc86269a18 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -64,8 +64,14 @@
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
     <IncludeDotNetCli>true</IncludeDotNetCli>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>3.1.201</DotNetCliVersion>
   </PropertyGroup>
+  <ItemGroup Condition="'$(TargetOS)' == 'Browser'">
+    <HelixPreCommand Include="${HELIX_CORRELATION_PAYLOAD}/dotnet/dotnet tool install --tool-path ${HELIX_WORKITEM_PAYLOAD}/xharness-cli --version $(MicrosoftDotNetXHarnessCLIVersion) --add-source https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet-eng/nuget/v3/index.json Microsoft.DotNet.XHarness.CLI" />
+    <HelixPreCommand Include="export DOTNET_ROOT=${HELIX_CORRELATION_PAYLOAD}/dotnet" />
+    <HelixPreCommand Include="export PATH=${HELIX_WORKITEM_PAYLOAD}/xharness-cli:$PATH" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(HelixCommand)' == '' and '$(BuildAllConfigurations)' == 'true'">
     <HelixPreCommand Include="set DOTNET_CLI_TELEMETRY_OPTOUT=1" />