Merge branch 'main' into vibankwa/remove-netstandard-from-aspnetcore

src/OpenTelemetry.Api/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+* Updated to System.Diagnostics.DiagnosticSource preview version 7.0.0.
+
+  With this update, applications targeting .NET 5 and lower will receive a
+  warning at build time as described [here](https://github.com/dotnet/runtime/pull/72518)
+  (note: building using older versions of the .NET SDK produces an error at
+  build time). This is because .NET 5 reached EOL in May 2022 and .NET
+  Core 3.1 reaches EOL in December 2022.
+
+  There is no guarantee that System.Diagnostics.DiagnosticSource will continue
+  to work on older versions of .NET. However, the build warning can be
+  suppressed by setting the `SuppressTfmSupportBuildWarnings` MSBuild property.
+
+  This does not affect applications targeting .NET Framework.
+  [#3539](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3539)
+
 ## 1.4.0-alpha.1
 
 Released 2022-Aug-02