From b169cf85f481003f4d59e4de5f024d90445b441d Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <utpilla@microsoft.com>
Date: Mon, 6 Jun 2022 23:27:06 -0700
Subject: [PATCH] Update Preprocessor directives

---
 src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs        | 2 +-
 src/OpenTelemetry.Exporter.Geneva/GenevaLoggingExtensions.cs  | 2 +-
 .../ServiceProviderExtensions.cs                              | 4 ++--
 .../Internal/ActivityEventAttachingLogProcessor.cs            | 2 +-
 .../Internal/DefaultLogStateConverter.cs                      | 2 +-
 .../Logs/LogToActivityEventConversionOptions.cs               | 2 +-
 .../Logs/OpenTelemetryLoggingExtensions.cs                    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs b/src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs
index a22c7eb013..8f75cf94d4 100644
--- a/src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs
+++ b/src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/OpenTelemetry.Exporter.Geneva/GenevaLoggingExtensions.cs b/src/OpenTelemetry.Exporter.Geneva/GenevaLoggingExtensions.cs
index e7331a66e7..63905c96f6 100644
--- a/src/OpenTelemetry.Exporter.Geneva/GenevaLoggingExtensions.cs
+++ b/src/OpenTelemetry.Exporter.Geneva/GenevaLoggingExtensions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
 using System;
 using OpenTelemetry;
 using OpenTelemetry.Exporter.Geneva;
diff --git a/src/OpenTelemetry.Exporter.Geneva/ServiceProviderExtensions.cs b/src/OpenTelemetry.Exporter.Geneva/ServiceProviderExtensions.cs
index 096eda95ac..dbfc46ea62 100644
--- a/src/OpenTelemetry.Exporter.Geneva/ServiceProviderExtensions.cs
+++ b/src/OpenTelemetry.Exporter.Geneva/ServiceProviderExtensions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 using Microsoft.Extensions.Options;
 #endif
 
@@ -34,7 +34,7 @@ internal static class ServiceProviderExtensions
     public static T GetOptions<T>(this IServiceProvider serviceProvider)
         where T : class, new()
     {
-#if NET461 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER
         IOptions<T> options = (IOptions<T>)serviceProvider.GetService(typeof(IOptions<T>));
 
         // Note: options could be null if user never invoked services.AddOptions().
diff --git a/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs b/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs
index 2db1c1e820..c8e28310fe 100644
--- a/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs
+++ b/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461_OR_GREATER || NETSTANDARD2_0 || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NET5_0_OR_GREATER
 using System;
 using System.Diagnostics;
 using OpenTelemetry.Internal;
diff --git a/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs b/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs
index fc2687ef5c..557ffda920 100644
--- a/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs
+++ b/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461_OR_GREATER || NETSTANDARD2_0 || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NET5_0_OR_GREATER
 using System.Collections.Generic;
 using System.Diagnostics;
 
diff --git a/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs b/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs
index 93910b8a41..eb73da3ccc 100644
--- a/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs
+++ b/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461_OR_GREATER || NETSTANDARD2_0 || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NET5_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/OpenTelemetry.Extensions/Logs/OpenTelemetryLoggingExtensions.cs b/src/OpenTelemetry.Extensions/Logs/OpenTelemetryLoggingExtensions.cs
index ed9dd8748d..83b17bafa4 100644
--- a/src/OpenTelemetry.Extensions/Logs/OpenTelemetryLoggingExtensions.cs
+++ b/src/OpenTelemetry.Extensions/Logs/OpenTelemetryLoggingExtensions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461_OR_GREATER || NETSTANDARD2_0 || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NET5_0_OR_GREATER
 using System;
 using System.Diagnostics;
 using OpenTelemetry.Internal;