Merge branch 'main' into nullabe-process-metrics

open-telemetry · Jan 20, 2023 · b49c59c · b49c59c
2 parents eb7517b + 68f3f90
commit b49c59c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.Quartz/.publicApi/net472/PublicAPI.Shipped.txt b/src/OpenTelemetry.Instrumentation.Quartz/.publicApi/net472/PublicAPI.Shipped.txt
diff --git a/src/OpenTelemetry.Instrumentation.Quartz/.publicApi/net472/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Instrumentation.Quartz/.publicApi/net472/PublicAPI.Unshipped.txt
diff --git a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * Update OpenTelemetry.Api to 1.3.1.
   ([#889](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/889))
+* Removes .NET Framework 4.7.2. It is distributed as .NET Standard 2.0.
+  ([#911](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/911))
 
 ## 1.0.0-alpha.1
 

diff --git a/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj b/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>OpenTelemetry Quartz.NET Instrumentation</Description>
     <PackageTags>$(PackageTags);distributed-tracing</PackageTags>
     <MinVerTagPrefix>Instrumentation.Quartz-</MinVerTagPrefix>
     <IncludeSharedInstrumentationSource>true</IncludeSharedInstrumentationSource>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>OpenTelemetry.Instrumentation.Quartz</AssemblyName>
     <RootNamespace>OpenTelemetry.Instrumentation.Quartz</RootNamespace>
   </PropertyGroup>

diff --git a/...nTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj b/...nTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Unit test project for OpenTelemetry Quartz.NET instrumentation</Description>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0;net472</TargetFrameworks>
         <IncludeSharedTestSource>true</IncludeSharedTestSource>
     </PropertyGroup>