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 92%
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
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/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.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 650e0e6729b..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_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>