From 12803786c800042682143e34a8198ecd195cf11f Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 10 Feb 2022 16:03:21 +0000
Subject: [PATCH] Revert System.Runtime.Experimental

Revert to the 6.0.0 release of System.Runtime.Experimental and re-apply the workaround until dotnet/runtime#65018 is resolved.
---
 Directory.Build.props    | 12 ++++++++++++
 Directory.Packages.props |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1b9a737d0..f4a828cde 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -50,4 +50,16 @@
     <Using Include="Xunit" />
     <Using Include="Xunit.Abstractions" />
   </ItemGroup>
+  <!--
+    HACK Workaround for https://github.com/dotnet/runtime/issues/65018
+  -->
+  <Target Name="RemoveSystemRuntimeFromRefPack"
+          BeforeTargets="_HandlePackageFileConflicts"
+          Condition="'@(Reference -> WithMetadataValue('NugetPackageId', 'System.Runtime.Experimental'))' != ''">
+    <ItemGroup>
+      <Reference Remove="@(Reference)"
+                 Condition="$([System.String]::Copy(%(Reference.Identity)).Contains('System.Runtime.dll')) and
+                            '%(Reference.NuGetPackageId)' == 'Microsoft.NETCore.App.Ref'" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5d3eb9069..6259ff1a6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,7 +11,7 @@
     <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.5.3" />
     <PackageVersion Include="Shouldly" Version="4.0.3" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.376" />
-    <PackageVersion Include="System.Runtime.Experimental" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageVersion Include="System.Runtime.Experimental" Version="6.0.0" />
     <PackageVersion Include="xunit" Version="2.4.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />