diff --git a/Directory.Build.targets b/Directory.Build.targets
index f8b66f3c3b6..3d858bb878f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -16,16 +16,6 @@
     <!-- This is false for local development, but set to true in the CI system -->
     <TreatWarningsAsErrors Condition=" '$(TreatWarningsAsErrors)' == '' ">false</TreatWarningsAsErrors>
 
-    <!--
-      TODO: to be resolved (https://github.com/dotnet/extensions/issues/4128)
-
-      warning CS0436: (NETCORE_ENGINEERING_TELEMETRY=Build) The type '__Attributes' in
-      'Microsoft.Extensions.Options.SourceGeneration/Microsoft.Extensions.Options.Generators.Generator/Validators.g.cs' conflicts with the imported type
-      '__Attributes' in 'Microsoft.Extensions.Telemetry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.
-      Using the type defined in 'Microsoft.Extensions.Options.SourceGeneration/Microsoft.Extensions.Options.Generators.Generator/Validators.g.cs'.
-     -->
-    <NoWarn>$(NoWarn);CS0436</NoWarn>
-
     <!-- TODO: to be re-enabled and all warnings fixed (https://github.com/dotnet/extensions/issues/4002) -->
     <NoWarn>$(NoWarn);IL2026;IL2087;IL2067;IL2075;IL2091;IL2072;IL2090;CA1825;IL2070;IL2098;IL2057</NoWarn>
 
diff --git a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/Microsoft.Extensions.Telemetry.PerformanceTests.csproj b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/Microsoft.Extensions.Telemetry.PerformanceTests.csproj
index 43083ace97e..f4a9c88010d 100644
--- a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/Microsoft.Extensions.Telemetry.PerformanceTests.csproj
+++ b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/Microsoft.Extensions.Telemetry.PerformanceTests.csproj
@@ -4,7 +4,6 @@
     <Description>Benchmarks for Microsoft.Extensions.Telemetry.</Description>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <InjectSharedPools>true</InjectSharedPools>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/MSBuild/Shared.props b/eng/MSBuild/Shared.props
index ec8b0ca2163..6d0ced0e646 100644
--- a/eng/MSBuild/Shared.props
+++ b/eng/MSBuild/Shared.props
@@ -1,5 +1,5 @@
 <Project>
-  <ItemGroup>
+  <ItemGroup Condition="'$(InjectSharedDiagnosticIds)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\DiagnosticIds\*.cs" LinkBase="Shared\DiagnosticIds" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.csproj b/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.csproj
index 5f76b47fd7a..6fee5f91737 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.csproj
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.csproj
@@ -8,6 +8,7 @@
   <PropertyGroup>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectSharedPools>true</InjectSharedPools>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Abstractions/Microsoft.Extensions.Compliance.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.Compliance.Abstractions/Microsoft.Extensions.Compliance.Abstractions.csproj
index aca8bce3ebe..b5f59b1d980 100644
--- a/src/Libraries/Microsoft.Extensions.Compliance.Abstractions/Microsoft.Extensions.Compliance.Abstractions.csproj
+++ b/src/Libraries/Microsoft.Extensions.Compliance.Abstractions/Microsoft.Extensions.Compliance.Abstractions.csproj
@@ -9,6 +9,7 @@
     <InjectSkipLocalsInitAttributeOnLegacy>true</InjectSkipLocalsInitAttributeOnLegacy>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <InjectSharedRentedSpan>true</InjectSharedRentedSpan>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
   </PropertyGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj
index 94805a22c97..96e016d5b24 100644
--- a/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj
+++ b/src/Libraries/Microsoft.Extensions.DependencyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.csproj
@@ -7,6 +7,7 @@
 
   <PropertyGroup>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ExceptionSummarization/Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.ExceptionSummarization/Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj
index 0f91252406c..5d49c87228b 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ExceptionSummarization/Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ExceptionSummarization/Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj
@@ -8,6 +8,7 @@
   <PropertyGroup>
     <InjectStringHashOnLegacy>true</InjectStringHashOnLegacy>
     <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <UseEnumStringsGenerator>true</UseEnumStringsGenerator>
   </PropertyGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Microsoft.Extensions.Diagnostics.HealthChecks.Common.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Microsoft.Extensions.Diagnostics.HealthChecks.Common.csproj
index a1163612236..e1e270051a1 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Microsoft.Extensions.Diagnostics.HealthChecks.Common.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Microsoft.Extensions.Diagnostics.HealthChecks.Common.csproj
@@ -10,6 +10,7 @@
     <UseMeteringGenerator>true</UseMeteringGenerator>
     <UseEnumStringsGenerator>true</UseEnumStringsGenerator>
     <InjectSharedPools>true</InjectSharedPools>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
   </PropertyGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
index bbaf3b5cb5c..4c720f0a08c 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
@@ -15,6 +15,7 @@
     <InjectSharedRentedSpan>true</InjectSharedRentedSpan>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectSharedBufferWriterPool>true</InjectSharedBufferWriterPool>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj
index 983a13410fd..c8d63fd7e8c 100644
--- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj
+++ b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj
@@ -9,6 +9,7 @@
   <PropertyGroup>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
index 1dc52a58abf..0963765caae 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
@@ -17,6 +17,7 @@
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
     <InjectSharedPools>true</InjectSharedPools>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/Microsoft.Extensions.ObjectPool.DependencyInjection.csproj b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/Microsoft.Extensions.ObjectPool.DependencyInjection.csproj
index 9c403868506..c66fc3894ab 100644
--- a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/Microsoft.Extensions.ObjectPool.DependencyInjection.csproj
+++ b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/Microsoft.Extensions.ObjectPool.DependencyInjection.csproj
@@ -7,6 +7,7 @@
 
   <PropertyGroup>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj b/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
index 7908185a2ab..db7d2e8e5f0 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
@@ -15,6 +15,7 @@
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
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 64aa0f8c237..ff19123874c 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
@@ -7,6 +7,7 @@
 
   <PropertyGroup>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectSharedPools>true</InjectSharedPools>
     <DisableSourceGeneratorPropertyName>DisableMicrosoftExtensionsTelemetrySourceGeneration</DisableSourceGeneratorPropertyName>
     <BuildAnalyzerReferences>true</BuildAnalyzerReferences>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.csproj b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.csproj
index a5278048ac2..f6737b37058 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.csproj
@@ -9,6 +9,7 @@
   <PropertyGroup>
     <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
index fe7ec5334bb..2375a28dee0 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
@@ -13,6 +13,7 @@
     <InjectSharedPools>true</InjectSharedPools>
     <InjectSharedRentedSpan>true</InjectSharedRentedSpan>
     <InjectSharedMemoization>true</InjectSharedMemoization>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
     <UseLoggingGenerator>true</UseLoggingGenerator>
   </PropertyGroup>
diff --git a/src/Libraries/System.Cloud.DocumentDb.Abstractions/System.Cloud.DocumentDb.Abstractions.csproj b/src/Libraries/System.Cloud.DocumentDb.Abstractions/System.Cloud.DocumentDb.Abstractions.csproj
index 760deddf9b6..828118f07d5 100644
--- a/src/Libraries/System.Cloud.DocumentDb.Abstractions/System.Cloud.DocumentDb.Abstractions.csproj
+++ b/src/Libraries/System.Cloud.DocumentDb.Abstractions/System.Cloud.DocumentDb.Abstractions.csproj
@@ -9,6 +9,7 @@
   <PropertyGroup>
     <InjectSharedEmptyCollections>true</InjectSharedEmptyCollections>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
+    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
   </PropertyGroup>
 
diff --git a/src/Shared/DiagnosticIds/README.md b/src/Shared/DiagnosticIds/README.md
new file mode 100644
index 00000000000..a9485983c3e
--- /dev/null
+++ b/src/Shared/DiagnosticIds/README.md
@@ -0,0 +1,11 @@
+# Buffer Writer Pool
+
+Gives access to diagnostics ids for the [Experimental] attribute.
+
+To use this in your project, add the following to your `.csproj` file:
+
+```xml
+<PropertyGroup>
+  <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
+</PropertyGroup>
+```
diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj
index 4e241163eb4..1d8c3d2a6f8 100644
--- a/src/Shared/Shared.csproj
+++ b/src/Shared/Shared.csproj
@@ -39,9 +39,4 @@
     <InternalsVisibleToTest Include="$(AssemblyName).Tests" />
     <InternalsVisibleToDynamicProxyGenAssembly2 Include="*" />
   </ItemGroup>
-
-  <!-- WarningDefinitions.cs is included globally via eng\MSBuild\Shared.props -->
-  <ItemGroup>
-    <Compile Remove="DiagnosticIds\Experiments.cs" />
-  </ItemGroup>
 </Project>