Merge branch 'main' into fix-test_traceparent_trace_flags_illegal_cha…

…racters
open-telemetry · Oct 6, 2023 · 726c499 · 726c499
2 parents d0df3db + f01db2b
commit 726c499
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -27,7 +27,17 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.0,)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.0,)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[2.1.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="[3.1.0,)" />
+
+    <!--
+        Typically, the latest stable version of Microsoft.Extensions.Logging should be used here because:
+        1) Each major version bump will have some new API capabilities (e.g. .NET 6 introduced compile-time logging
+          source generation, .NET 8 introduced automatic event id generation).
+        2) Each minor version bump is normally security hotfixes or critical bug fixes.
+        3) Since version 3.1.0, the .NET runtime team is holding a high bar for backward compatibility on
+          Microsoft.Extensions.Logging even during major version bumps, so compatibility is not a concern here.
+    -->
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23419.4" />
+
     <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[3.1.0,)" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="[3.1.0,)" />
     <PackageVersion Include="OpenTelemetry" Version="$(OTelLatestStableVer)" />

diff --git a/docs/Directory.Packages.props b/docs/Directory.Packages.props
@@ -1,6 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
-  <ItemGroup>
-    <PackageVersion Update="Microsoft.Extensions.Logging" Version="[6.0.0,)" />
-  </ItemGroup>
 </Project>
diff --git a/examples/Directory.Packages.props b/examples/Directory.Packages.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
   <ItemGroup>
-    <PackageVersion Update="Microsoft.Extensions.Logging" Version="[6.0.0,)" />
     <PackageVersion Update="System.Text.Json" Version="6.0.5" />
   </ItemGroup>
 </Project>
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Packages.props, $(MSBuildThisFileDirectory)..))" />
   <ItemGroup>
-    <PackageVersion Update="Microsoft.Extensions.Logging" Version="[6.0.0,)" />
     <PackageVersion Update="System.Text.Json" Version="6.0.5" />
   </ItemGroup>
 </Project>