From b8badfc251e3030ce22a6f5a2de6111b7f97f99d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:06:42 +0000
Subject: [PATCH 1/7] Initial plan


From 66c5eb273645d8157364c5669aacf738bf77ba66 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:11:01 +0000
Subject: [PATCH 2/7] Add buildTransitive files for net9.0 and net10.0

Co-authored-by: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
---
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ++++
 ....Extensions.Telemetry.Abstractions.targets | 36 +++++++++++++++++++
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ++++
 ....Extensions.Telemetry.Abstractions.targets | 36 +++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
new file mode 100644
index 00000000000..7009535fdef
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
+  <PropertyGroup>
+    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
+  </PropertyGroup>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
new file mode 100644
index 00000000000..650e0e6729b
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -0,0 +1,36 @@
+<Project>
+  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+    </ItemGroup>
+
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- 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">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        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>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
new file mode 100644
index 00000000000..7009535fdef
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
+  <PropertyGroup>
+    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
+  </PropertyGroup>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
new file mode 100644
index 00000000000..650e0e6729b
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -0,0 +1,36 @@
+<Project>
+  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
+  <Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+    </ItemGroup>
+
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- 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">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        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>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
+</Project>

From 1a3aa118c6d573c98a0e02d52437247ee39ebe30 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:21:56 +0000
Subject: [PATCH 3/7] Rename MSBuild targets to avoid conflict with
 Microsoft.Extensions.Logging.Abstractions

Co-authored-by: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
---
 .../Microsoft.Extensions.Telemetry.Abstractions.targets       | 4 ++--
 .../Microsoft.Extensions.Telemetry.Abstractions.targets       | 4 ++--
 .../Microsoft.Extensions.Telemetry.Abstractions.targets       | 4 ++--
 .../Microsoft.Extensions.Telemetry.Abstractions.targets       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 650e0e6729b..646aead2363 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.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_Telemetry_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
@@ -19,7 +19,7 @@
   <!-- 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"
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="RemoveDuplicateAnalyzers">
     <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 650e0e6729b..646aead2363 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_Telemetry_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
@@ -19,7 +19,7 @@
   <!-- 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"
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="RemoveDuplicateAnalyzers">
     <ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 650e0e6729b..646aead2363 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.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_Telemetry_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
@@ -19,7 +19,7 @@
   <!-- 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"
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="RemoveDuplicateAnalyzers">
     <ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
index 650e0e6729b..646aead2363 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.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_Telemetry_AbstractionsRemoveAnalyzers"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="ResolveReferences">
     <ItemGroup>
@@ -19,7 +19,7 @@
   <!-- 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"
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzersWPF"
           Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
           AfterTargets="RemoveDuplicateAnalyzers">
     <ItemGroup>

From dec1fad3d7cab34d476dbf6b5d8f7a47fde4cc68 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:56:46 +0000
Subject: [PATCH 4/7] Remove redundant net9.0 and net10.0 buildTransitive
 folders

The net8.0 buildTransitive folder is automatically selected by NuGet for net9.0 and net10.0
through nearest compatible framework selection. Only the target name fix was needed.

Co-authored-by: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
---
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ----
 ....Extensions.Telemetry.Abstractions.targets | 36 -------------------
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ----
 ....Extensions.Telemetry.Abstractions.targets | 36 -------------------
 4 files changed, 84 deletions(-)
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
deleted file mode 100644
index 7009535fdef..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
-  <PropertyGroup>
-    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
-  </PropertyGroup>
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
deleted file mode 100644
index 646aead2363..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net10.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
-  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="ResolveReferences">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
-        Include="@(Analyzer)"
-        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
-                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
-    </ItemGroup>
-
-    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
-    <ItemGroup>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 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_Telemetry_AbstractionsRemoveAnalyzersWPF"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="RemoveDuplicateAnalyzers">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
-        Include="@(Analyzer)"
-        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>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
deleted file mode 100644
index 7009535fdef..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
-  <PropertyGroup>
-    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
-  </PropertyGroup>
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
deleted file mode 100644
index 646aead2363..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
-  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="ResolveReferences">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
-        Include="@(Analyzer)"
-        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
-                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
-    </ItemGroup>
-
-    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
-    <ItemGroup>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 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_Telemetry_AbstractionsRemoveAnalyzersWPF"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="RemoveDuplicateAnalyzers">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
-        Include="@(Analyzer)"
-        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>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
-    </ItemGroup>
-  </Target>
-</Project>

From 25054c391e3778dc6efdbb5a1634d6cc93b837de Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 20 Nov 2025 19:11:52 +0000
Subject: [PATCH 5/7] Use generic buildTransitive files for all TFMs

Instead of TFM-specific folders (net6.0, net8.0, net9.0, net10.0), use generic
buildTransitive files that apply to all target frameworks. This prevents the issue
where NuGet's framework selection doesn't automatically apply net8.0 files to net9.0.

- Moved buildTransitive files to root of buildTransitive folder (no TFM subfolder)
- Disabled automatic TFM-specific buildTransitive generation via DisableNETStandardCompatErrors
- Updated packaging to only include root-level buildTransitive files

Co-authored-by: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
---
 ...t.Extensions.Telemetry.Abstractions.csproj | 17 ++-------
 ...ft.Extensions.Telemetry.Abstractions.props |  0
 ....Extensions.Telemetry.Abstractions.targets |  0
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ----
 ....Extensions.Telemetry.Abstractions.targets | 36 -------------------
 5 files changed, 3 insertions(+), 56 deletions(-)
 rename src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/{net6.0 => }/Microsoft.Extensions.Telemetry.Abstractions.props (100%)
 rename src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/{net6.0 => }/Microsoft.Extensions.Telemetry.Abstractions.targets (100%)
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
 delete mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
index a461593894e..668b9b5f146 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
@@ -20,6 +20,8 @@
     <Stage>normal</Stage>
     <MinCodeCoverage>100</MinCodeCoverage>
     <MinMutationScore>100</MinMutationScore>
+    <!-- Disable automatic generation of TFM-specific buildTransitive files - we use generic ones instead -->
+    <DisableNETStandardCompatErrors>true</DisableNETStandardCompatErrors>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,22 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="buildTransitive\**\*" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="buildTransitive\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="buildTransitive\*" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="buildTransitive\" />
   </ItemGroup>
 
-  <!-- For net462 we automatically add package buildtransitive target files, so we need to Include
-  the code that will disable the Microsoft.Extensions.Logging.Abstractions source generator. -->
-  <PropertyGroup>
-    <_AdditionalNETStandardCompatErrorFileContents>
-<![CDATA[
-  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
-  <PropertyGroup>
-    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
-  </PropertyGroup>
-]]>
-    </_AdditionalNETStandardCompatErrorFileContents>
-  </PropertyGroup>
-
   <ItemGroup>
     <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.Logging\Microsoft.Gen.Logging.csproj" />
     <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.Metrics\Microsoft.Gen.Metrics.csproj" />
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.props
similarity index 100%
rename from src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.props
rename to src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.props
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/Microsoft.Extensions.Telemetry.Abstractions.targets
similarity index 100%
rename from src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
rename to src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.targets
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
deleted file mode 100644
index 7009535fdef..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
-  <PropertyGroup>
-    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
-  </PropertyGroup>
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
deleted file mode 100644
index 646aead2363..00000000000
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
-  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="ResolveReferences">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
-        Include="@(Analyzer)"
-        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
-                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
-    </ItemGroup>
-
-    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
-    <ItemGroup>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 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_Telemetry_AbstractionsRemoveAnalyzersWPF"
-          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
-          AfterTargets="RemoveDuplicateAnalyzers">
-    <ItemGroup>
-      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
-        Include="@(Analyzer)"
-        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>
-      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
-    </ItemGroup>
-  </Target>
-</Project>

From 99a44723b9cd88531e5bcf257b4618b43f37d8ec Mon Sep 17 00:00:00 2001
From: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
Date: Fri, 12 Dec 2025 17:00:47 +0100
Subject: [PATCH 6/7] Remove extra property

---
 .../Microsoft.Extensions.Telemetry.Abstractions.csproj          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
index 668b9b5f146..727e93f7759 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
@@ -20,8 +20,6 @@
     <Stage>normal</Stage>
     <MinCodeCoverage>100</MinCodeCoverage>
     <MinMutationScore>100</MinMutationScore>
-    <!-- Disable automatic generation of TFM-specific buildTransitive files - we use generic ones instead -->
-    <DisableNETStandardCompatErrors>true</DisableNETStandardCompatErrors>
   </PropertyGroup>
 
   <ItemGroup>

From d864ca36ed81ced2592f64b529ae9638d2ca18f5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Dec 2025 16:26:10 +0000
Subject: [PATCH 7/7] Restore framework-specific buildTransitive folders and
 add net9.0

- Reverted from generic buildTransitive files to TFM-specific folders (net6.0, net8.0, net9.0)
- Restored _AdditionalNETStandardCompatErrorFileContents for net462 compatibility
- Kept renamed targets (_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers) to prevent collision
- This addresses feedback that generic buildTransitive files get overridden by netstandard compat errors

Co-authored-by: evgenyfedorov2 <25526458+evgenyfedorov2@users.noreply.github.com>
---
 ...t.Extensions.Telemetry.Abstractions.csproj | 15 +++++++-
 ...ft.Extensions.Telemetry.Abstractions.props |  0
 ....Extensions.Telemetry.Abstractions.targets |  0
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ++++
 ....Extensions.Telemetry.Abstractions.targets | 36 +++++++++++++++++++
 ...ft.Extensions.Telemetry.Abstractions.props |  6 ++++
 ....Extensions.Telemetry.Abstractions.targets | 36 +++++++++++++++++++
 7 files changed, 98 insertions(+), 1 deletion(-)
 rename src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/{ => net6.0}/Microsoft.Extensions.Telemetry.Abstractions.props (100%)
 rename src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/{ => net6.0}/Microsoft.Extensions.Telemetry.Abstractions.targets (100%)
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
 create mode 100644 src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets

diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
index 727e93f7759..a461593894e 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.csproj
@@ -27,9 +27,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="buildTransitive\*" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="buildTransitive\" />
+    <None Include="buildTransitive\**\*" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="buildTransitive\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
+  <!-- For net462 we automatically add package buildtransitive target files, so we need to Include
+  the code that will disable the Microsoft.Extensions.Logging.Abstractions source generator. -->
+  <PropertyGroup>
+    <_AdditionalNETStandardCompatErrorFileContents>
+<![CDATA[
+  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
+  <PropertyGroup>
+    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
+  </PropertyGroup>
+]]>
+    </_AdditionalNETStandardCompatErrorFileContents>
+  </PropertyGroup>
+
   <ItemGroup>
     <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.Logging\Microsoft.Gen.Logging.csproj" />
     <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.Metrics\Microsoft.Gen.Metrics.csproj" />
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.props
similarity index 100%
rename from src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.props
rename to src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.props
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
similarity index 100%
rename from src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/Microsoft.Extensions.Telemetry.Abstractions.targets
rename to src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
new file mode 100644
index 00000000000..7009535fdef
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.props
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
+  <PropertyGroup>
+    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
+  </PropertyGroup>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
new file mode 100644
index 00000000000..646aead2363
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net8.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -0,0 +1,36 @@
+<Project>
+  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+    </ItemGroup>
+
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- 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_Telemetry_AbstractionsRemoveAnalyzersWPF"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="RemoveDuplicateAnalyzers">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        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>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
new file mode 100644
index 00000000000..7009535fdef
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.props
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator, so we set the property to remove the source generator from the project. -->
+  <PropertyGroup>
+    <DisableMicrosoftExtensionsLoggingSourceGenerator>true</DisableMicrosoftExtensionsLoggingSourceGenerator>
+  </PropertyGroup>
+</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
new file mode 100644
index 00000000000..646aead2363
--- /dev/null
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buildTransitive/net9.0/Microsoft.Extensions.Telemetry.Abstractions.targets
@@ -0,0 +1,36 @@
+<Project>
+  <!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
+  <Target Name="_Microsoft_Extensions_Telemetry_AbstractionsRemoveAnalyzers"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzer
+        Include="@(Analyzer)"
+        Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
+                   '%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+    </ItemGroup>
+
+    <!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
+    <ItemGroup>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- 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_Telemetry_AbstractionsRemoveAnalyzersWPF"
+          Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
+          AfterTargets="RemoveDuplicateAnalyzers">
+    <ItemGroup>
+      <_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
+        Include="@(Analyzer)"
+        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>
+      <Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
+    </ItemGroup>
+  </Target>
+</Project>