From 487fbe87c13aebfcd8a6351faf20360edc9165da Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 15 Jul 2021 12:40:30 -0700
Subject: [PATCH 1/2] Remove analyzers from framework references

These are incorrectly raised as references in pre-6.0-preview7 SDKs.
---
 Directory.Build.targets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index fcdc2c1ad0a..357f1fc182a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,4 +3,12 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="$(MSBuildThisFileDirectory)Packaging.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Publishing.targets" />
+
+  <!-- Temporarily remove analyzers from references until we can update to a Preview7 SDK which handles them correctly 
+       https://github.com/dotnet/wpf/issues/4848 -->
+  <Target Name="_RemoveAnalyzersFromReference" AfterTargets="ResolveTargetingPackAssets">
+    <ItemGroup>
+      <Reference Remove="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').Contains('analyzers', StringComparison.OrdinalIgnoreCase))" />
+    </ItemGroup>
+  </Target>
 </Project>

From 247db864a55819f1f07c0930c37fa0b8ef843d66 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 15 Jul 2021 13:31:33 -0700
Subject: [PATCH 2/2] Fix workaround on .NETFramework

---
 Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 46a96815462..f18ba68cda9 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,7 +10,7 @@
        https://github.com/dotnet/wpf/issues/4848 -->
   <Target Name="_RemoveAnalyzersFromReference" AfterTargets="ResolveTargetingPackAssets">
     <ItemGroup>
-      <Reference Remove="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').Contains('analyzers', StringComparison.OrdinalIgnoreCase))" />
+      <Reference Remove="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').IndexOf('analyzers', StringComparison.OrdinalIgnoreCase)) > 0" />
     </ItemGroup>
   </Target>
 </Project>