From 1c660be4528151f6cbe63fa8471f9a4b05399469 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar <dipeshkumar@microsoft.com>
Date: Thu, 14 Jul 2022 21:25:12 +0530
Subject: [PATCH 1/2] Better fix build when using source generators coming from
 NuGet package

---
 .../Microsoft.WinFX.targets                   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 88951d23eb3..6e3f176ae9e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -435,11 +435,6 @@
           <_IntermediateOutputPathNoTargetFrameworkOrRID>$([System.Text.RegularExpressions.Regex]::Replace($(_IntermediateOutputPathNoTargetFrameworkOrRID), "$(TargetFramework)\\$",, System.Text.RegularExpressions.RegexOptions.IgnoreCase))</_IntermediateOutputPathNoTargetFrameworkOrRID>
       </PropertyGroup>
 
-      <ItemGroup>
-          <!-- Include analyzers that are coming from a FrameworkReference in the temporary target assembly project. -->
-          <_TemporaryTargetAssemblyAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />
-      </ItemGroup>
-
        <!--  Use the legacy .NET Framework/.NET Core 3.0 GenerateTemporaryTargetAssembly path if 'IncludePackageReferencesDuringMarkupCompilation' is 'false',. -->
        <GenerateTemporaryTargetAssembly
                 CurrentProject="$(MSBuildProjectFullPath)"
@@ -455,7 +450,7 @@
                 CompileTargetName="$(_CompileTargetNameForLocalType)"
                 GenerateTemporaryTargetAssemblyDebuggingInformation="$(GenerateTemporaryTargetAssemblyDebuggingInformation)"
                 IncludePackageReferencesDuringMarkupCompilation="$(IncludePackageReferencesDuringMarkupCompilation)"
-                Analyzers="@(_TemporaryTargetAssemblyAnalyzer)"
+                Analyzers="@(Analyzer)"
                 TemporaryTargetAssemblyProjectName="$(_TemporaryTargetAssemblyProjectName)"
                 MSBuildProjectExtensionsPath="$(MSBuildProjectExtensionsPath)"
                  >
@@ -491,6 +486,20 @@
                      Condition="Exists('%(Fullpath)')" />
   </Target>
 
+  <!--
+                 ===========================================
+                          RemoveDuplicateAnalyzers
+                 ===========================================
+
+                Name : RemoveDuplicateAnalyzers
+  -->
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+    <ItemGroup>
+        <FilteredAnalyzer Include="@(Analyzer->Distinct())" />
+        <Analyzer Remove="@(Analyzer)" />
+        <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+</Target>
 
 <!--
     ================================================================

From c5b6632f5f80f07869e1ae4ec3fcd976f18c2083 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar <dipeshkumar@microsoft.com>
Date: Thu, 14 Jul 2022 21:36:24 +0530
Subject: [PATCH 2/2] Formatting changes

---
 .../src/PresentationBuildTasks/Microsoft.WinFX.targets          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 6e3f176ae9e..aededb86954 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -499,7 +499,7 @@
         <Analyzer Remove="@(Analyzer)" />
         <Analyzer Include="@(FilteredAnalyzer)" />
     </ItemGroup>
-</Target>
+  </Target>
 
 <!--
     ================================================================