From 60562f93150822af4d2c6d18bde5506fcfd5ad6b Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <nbalabaev@microsoft.com>
Date: Tue, 12 Mar 2024 17:21:05 +0100
Subject: [PATCH 1/7] Fix logging source-gens duplication on WPF

---
 Directory.Build.targets                       |  2 +-
 ....Extensions.Telemetry.Abstractions.targets | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 054243d1998..bcf3171ca0d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -79,7 +79,7 @@
   </Target>
 
   <!-- This target will make sure that projects targeting net462 will also have the Microsoft.Extensions.Logging.Abstractions analyzer removed. -->
-  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers" 
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index fbcd94a00ae..8b0bc3793f4 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -1,6 +1,6 @@
 <Project>
   <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator. -->
-  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers" 
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
@@ -13,4 +13,19 @@
       <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
     </ItemGroup>
   </Target>
-</Project>
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="RemoveDuplicateAnalyzers">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions' Or
+                   '%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators'" />
+    </ItemGroup>
+
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
+</oject>

From ea2c4a26d935317ea54b6418710f856cdda07c26 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <xakep139@users.noreply.github.com>
Date: Thu, 21 Mar 2024 05:51:00 +0100
Subject: [PATCH 2/7] Update
 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets

---
 .../net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 8b0bc3793f4..1b16f3d9403 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -28,4 +28,4 @@
       <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
     </ItemGroup>
   </Target>
-</oject>
+</Project>

From f4a74f61517b5db9b56dd15ef84b3470312ca7c6 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <xakep139@users.noreply.github.com>
Date: Fri, 17 May 2024 12:59:47 +0200
Subject: [PATCH 3/7] Apply suggestions from code review

---
 .../Microsoft.Extensions.Telemetry.Abstractions.targets     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 1b16f3d9403..552c763c1cb 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -15,12 +15,12 @@
   </Target>
   <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="RemoveDuplicateAnalyzers">
+          BeforeTargets="CoreCompile">
     <ItemGroup>
       <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
         Include="@(Analyzer)"
-        Condition="'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions' Or
-                   '%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators'" />
+        <_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Abstractions'" />
     </ItemGroup>
 
     <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->

From 75a0edec8499be9c348b708bf3730a81d93d5e15 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <nbalabaev@microsoft.com>
Date: Fri, 17 May 2024 13:04:48 +0200
Subject: [PATCH 4/7] CR

---
 ....Extensions.Telemetry.Abstractions.targets | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 552c763c1cb..007ee85e203 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -2,10 +2,10 @@
   <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator. -->
   <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="ResolveReferences">
+          BeforeTargets="CoreCompile">
     <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
-                                                                                           '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
+                                                                                           '%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Abstractions'" />
     </ItemGroup>
 
     <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
@@ -13,19 +13,4 @@
       <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
     </ItemGroup>
   </Target>
-  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
-        Include="@(Analyzer)"
-        <_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
-                   '%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Abstractions'" />
-    </ItemGroup>
-
-    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->
-    <ItemGroup>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
-    </ItemGroup>
-  </Target>
 </Project>

From 74f4c81095dbccf066f852fcd8050532b6918006 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <nbalabaev@microsoft.com>
Date: Thu, 23 May 2024 02:53:12 +0200
Subject: [PATCH 5/7] fixes

---
 global.json                                   |  4 +--
 ....Extensions.Telemetry.Abstractions.targets | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/global.json b/global.json
index 7c55ca32aac..f57c1e7a5ab 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.200"
+    "version": "8.0.300"
   },
   "tools": {
-    "dotnet": "8.0.200",
+    "dotnet": "8.0.300",
     "runtimes": {
       "dotnet/x64": [
         "6.0.22"
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 007ee85e203..68791be2937 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -1,11 +1,13 @@
 <Project>
-  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator. -->
+  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
   <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          BeforeTargets="CoreCompile">
+          AfterTargets="ResolveReferences">
     <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
-                                                                                           '%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
     </ItemGroup>
 
     <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
@@ -13,4 +15,20 @@
       <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
     </ItemGroup>
   </Target>
+
+  <!-- We have a separate target for WPF projects because there's "GenerateTemporaryTargetAssembly" target for those -->
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="RemoveDuplicateAnalyzers">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions' Or
+                   '%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators'" />
+    </ItemGroup>
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
 </Project>

From b638f078ec5720db9d1198cb32de166febc63069 Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <nbalabaev@microsoft.com>
Date: Thu, 23 May 2024 02:56:01 +0200
Subject: [PATCH 6/7] minor fixes

---
 .../Microsoft.Extensions.Telemetry.Abstractions.targets     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 68791be2937..c1185366a46 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -6,7 +6,7 @@
     <ItemGroup>
       <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
         Include="@(Analyzer)"
-        Condition="'%(Analyzer.Filename)' == 'Microsoft.Extensions.Logging.Generators' Or
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
                    '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
     </ItemGroup>
 
@@ -23,8 +23,8 @@
     <ItemGroup>
       <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
         Include="@(Analyzer)"
-        Condition="'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions' Or
-                   '%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators'" />
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
     </ItemGroup>
     <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->
     <ItemGroup>

From 14e39772f896d8e2b4b6157b6145726261dffcef Mon Sep 17 00:00:00 2001
From: Nikita Balabaev <nbalabaev@microsoft.com>
Date: Fri, 31 May 2024 11:24:01 +0200
Subject: [PATCH 7/7] CR; fix a warning

---
 ....AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj | 1 +
 eng/MSBuild/Shared.props                                      | 2 +-
 .../Microsoft.Extensions.Telemetry.Abstractions.targets       | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bench/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj b/bench/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj
index abdd868bfe8..06891c252fe 100644
--- a/bench/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj
+++ b/bench/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj
@@ -6,6 +6,7 @@
 
   <PropertyGroup>
     <InjectSharedPools>true</InjectSharedPools>
+    <SkipSharedPoolsReferences>true</SkipSharedPoolsReferences>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/MSBuild/Shared.props b/eng/MSBuild/Shared.props
index 6d0ced0e646..2662152ff85 100644
--- a/eng/MSBuild/Shared.props
+++ b/eng/MSBuild/Shared.props
@@ -32,7 +32,7 @@
 
   <ItemGroup Condition="'$(InjectSharedPools)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Pools\*.cs" LinkBase="Shared\Pools" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" />
+    <PackageReference Condition="'$(SkipSharedPoolsReferences)' != 'true'" Include="Microsoft.Extensions.ObjectPool" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(InjectSharedBufferWriterPool)' == 'true'">
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index c1185366a46..650e0e6729b 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -16,7 +16,9 @@
     </ItemGroup>
   </Target>
 
-  <!-- We have a separate target for WPF projects because there's "GenerateTemporaryTargetAssembly" target for those -->
+  <!-- We have a WPF-specific target because WPF projects generate and compile a temporary project (via "GenerateTemporaryTargetAssembly" target),
+       and that temp project doesn't have "ResolveReferences" target we expect.
+       This leads to the runtime's generator not being removed and to a compile-time error CS0757. This additional target resolves the problem. -->
   <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="RemoveDuplicateAnalyzers">