From 976e32dfd62c92d194fd477482a019a47e3b2461 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Thu, 14 May 2020 18:51:24 -0700
Subject: [PATCH] Update XHarness for latest fixes

---
 .config/dotnet-tools.json                                     | 2 +-
 eng/Version.Details.xml                                       | 4 ++--
 eng/Versions.props                                            | 2 +-
 .../Common/tests/AndroidTestRunner/AndroidTestRunner.cs       | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 73baf5d1e3a84..fa001915d85d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.20264.2",
+      "version": "1.0.0-prerelease.20264.9",
       "commands": [
         "xharness"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 668b9bba02fb9..700894376a9d9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -174,9 +174,9 @@
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>e9f0009b3bd7e42fdc7db6e416b9182828006309</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.Tests.Runners" Version="1.0.0-prerelease.20264.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.Tests.Runners" Version="1.0.0-prerelease.20264.9">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>c6fd4f291bfc2a8dfb7d46577959e3a9ba0fa132</Sha>
+      <Sha>bf6773e982acd8a8923b58de140843d9cebc9f69</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3588f19c0d159..05c5bf40f96e6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -113,7 +113,7 @@
     <SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
     <!-- Testing -->
     <MicrosoftNETTestSdkVersion>16.7.0-preview-20200429-01</MicrosoftNETTestSdkVersion>
-    <MicrosoftDotNetXHarnessTestsRunnersVersion>1.0.0-prerelease.20264.1</MicrosoftDotNetXHarnessTestsRunnersVersion>
+    <MicrosoftDotNetXHarnessTestsRunnersVersion>1.0.0-prerelease.20264.9</MicrosoftDotNetXHarnessTestsRunnersVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <CoverletCollectorVersion>1.2.1</CoverletCollectorVersion>
     <TraceEventVersion>2.0.5</TraceEventVersion>
diff --git a/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.cs b/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.cs
index cd02378f62542..9f232f549ba92 100644
--- a/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.cs
+++ b/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.cs
@@ -92,9 +92,7 @@ protected override void TerminateWithSuccess() {}
 
     public string? Locale { get; }
 
-#pragma warning disable CS8764
     public override TextWriter? Logger => null;
-#pragma warning restore CS8764
 
     public override string TestsResultsFinalPath
     {