From 2729349aa164d0bba41b0f3084b21aea5d7fe1f5 Mon Sep 17 00:00:00 2001
From: joegoldman2 <147369450+joegoldman2@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:24:28 +0000
Subject: [PATCH] [Exporter.Stackdriver] Remove .NET 6 target and add .NET
 Standard 2.0 (#2127)

Co-authored-by: joegoldman2 <147369450+joegoldman@users.noreply.github.com>
Co-authored-by: Mikel Blanchard <mblanchard@macrosssoftware.com>
---
 .../CHANGELOG.md                                   |  9 +++++++++
 .../OpenTelemetry.Exporter.Stackdriver.csproj      | 14 ++++++++------
 ...OpenTelemetry.Exporter.Stackdriver.Tests.csproj |  8 +++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md
index 00a00b1c6f..5028755fcd 100644
--- a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md
@@ -5,6 +5,15 @@
 * Updated OpenTelemetry core component version(s) to `1.9.0`.
   ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888))
 
+* Drop support for .NET 6 as this target is no longer supported
+  and add .NET Standard 2.0 target.
+  ([#2127](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2127))
+
+* Update Google Cloud libraries:
+  * Google.Cloud.Monitoring.V3 3.4.0 -> 3.8.0
+  * Google.Cloud.Trace.V2 3.3.0 -> 3.5.0
+  ([#2127](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2127))
+
 ## 1.0.0-beta.6
 
 Released 2024-Apr-22
diff --git a/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj b/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj
index a4f5b0c32b..15c3b04992 100644
--- a/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj
+++ b/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj
@@ -1,21 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net8.0;net6.0;net462</TargetFrameworks>
-    <Description>Stackdriver .NET Exporter for OpenTelemetry.</Description>
+    <TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion);net462</TargetFrameworks>
+    <Description>An OpenTelemetry .NET exporter that sends telemetry to Google Stackdriver.</Description>
     <PackageTags>$(PackageTags);Stackdriver;Google;GCP;distributed-tracing</PackageTags>
     <MinVerTagPrefix>Exporter.Stackdriver-</MinVerTagPrefix>
   </PropertyGroup>
 
-  <!--Do not run Package Baseline Validation as this package has never released a stable version.
-  Remove this property once we have released a stable version and add PackageValidationBaselineVersion property.-->
+  <!-- Do not run Package Baseline Validation as this package has never released a stable version.
+  Remove this property once we have released a stable version and add PackageValidationBaselineVersion property. -->
   <PropertyGroup>
     <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Cloud.Monitoring.V3" Version="[3.4.0,4.0)" />
-    <PackageReference Include="Google.Cloud.Trace.V2" Version="[3.3.0,4.0)" />
+    <PackageReference Include="Google.Cloud.Monitoring.V3" Version="[3.8.0,4.0)" />
+    <PackageReference Include="Google.Cloud.Trace.V2" Version="[3.5.0,4.0)" />
     <PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
@@ -23,4 +24,5 @@
     <Compile Include="$(RepoRoot)\src\Shared\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
   </ItemGroup>
+
 </Project>
diff --git a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj
index ab94de47f5..9c5c605224 100644
--- a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Description>Unit test project for Stackdriver Exporter for OpenTelemetry</Description>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
+    <Description>Unit test project for Stackdriver Exporter for OpenTelemetry.</Description>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,4 +32,5 @@
       <SpecificVersion>True</SpecificVersion>
     </Reference>
   </ItemGroup>
+
 </Project>