Code health - preprocessor directives (#2990)

MichelZ · web-flow · commit 5744b5180061 · 2024-11-14T17:09:32.000-08:00
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -3169,7 +3169,7 @@ public Customer(int id, string firstName, string lastName)
         public string LastName { get; set; }
     }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
     public record CustomerDateOnly(int Id, string FirstName, string LastName, DateOnly DateOfBirth, TimeOnly TimeOfDay);
 #endif
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
@@ -9,7 +9,7 @@
 using Xunit;
 using System.Collections.Generic;
 using static Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.CertificateUtilityWin;
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
 using System.Runtime.Versioning;
 #endif
 
@@ -19,7 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     /// Always Encrypted public CspProvider Manual tests.
     /// TODO: These tests are marked as Windows only for now but should be run for all platforms once the Master Key is accessible to this app from Azure Key Vault.
     /// </summary>
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
     [SupportedOSPlatform("windows")]
 #endif
     [PlatformSpecific(TestPlatforms.Windows)]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/DatabaseHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/DatabaseHelper.cs
@@ -31,7 +31,7 @@ internal static void InsertCustomerData(SqlConnection sqlConnection, SqlTransact
             sqlCommand.ExecuteNonQuery();
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         /// <summary>
         /// Insert CustomerDateOnly record into table
         /// </summary>
@@ -176,7 +176,7 @@ public static void CompareResults(SqlDataReader sqlDataReader, string[] paramete
                     case "int":
                         Assert.True(sqlDataReader.GetInt32(columnsRead) == 45, "FAILED: read int value does not match.");
                         break;
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                     case "DateOnly":
                         Assert.True(sqlDataReader.GetFieldValue<DateOnly>(columnsRead) == new DateOnly(2001, 1, 31), "FAILED: read DateOnly value does not match.");
                         break;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CertificateUtilityWin.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CertificateUtilityWin.cs
@@ -9,13 +9,13 @@
 using Xunit;
 using System.Collections.Generic;
 using static System.Net.Mime.MediaTypeNames;
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
 using System.Runtime.Versioning;
 #endif
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
     [SupportedOSPlatform("windows")]
 #endif
     [PlatformSpecific(TestPlatforms.Windows)]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -359,7 +359,7 @@ public static bool IsAdmin
         {
             get
             {
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                 System.Diagnostics.Debug.Assert(OperatingSystem.IsWindows());
 #endif
                 return new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
@@ -472,7 +472,7 @@ public static TokenCredential GetTokenCredential()
         public static bool IsTargetReadyForAeWithKeyStore()
         {
             return DataTestUtility.AreConnStringSetupForAE()
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                 // AE tests on Windows will use the Cert Store. On non-Windows, they require AKV.
                 && (OperatingSystem.IsWindows() || DataTestUtility.IsAKVSetupAvailable())
 #endif
@@ -495,7 +495,7 @@ public static bool IsSupportingDistributedTransactions()
         public static bool IsNotUsingManagedSNIOnWindows() => !UseManagedSNIOnWindows;
 
         public static bool IsUsingNativeSNI() =>
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
             IsNotUsingManagedSNIOnWindows();
 #else 
             true;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
@@ -348,7 +348,7 @@ public static void SqlDataReader_SqlBuffer_GetFieldValue()
                         Assert.Equal(dtoffset, reader.GetFieldValue<DateTimeOffset>(11));
                         Assert.Equal(new DateTime(2022, 10, 23), reader.GetFieldValue<DateTime>(12));
                         Assert.Equal(new TimeSpan(0, 22, 7, 44), reader.GetFieldValue<TimeSpan>(13));
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                         Assert.Equal(new DateOnly(2022, 10, 23), reader.GetFieldValue<DateOnly>(12));
                         Assert.Equal(new TimeOnly(22, 7, 44), reader.GetFieldValue<TimeOnly>(13));
 #endif
@@ -367,7 +367,7 @@ public static void SqlDataReader_SqlBuffer_GetFieldValue()
             }
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         /// <summary>
         /// Covers GetFieldValue<T> for SqlBuffer class
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
@@ -472,7 +472,7 @@ public static void InvalidCastExceptionStream(CommandBehavior behavior, Accessor
             }
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         [ConditionalFact(typeof(DataTestUtility),nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static async Task ReadAsyncContentsCompletes()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs
@@ -212,7 +212,7 @@ public static void ReaderParameterTest()
                             Assert.True(IsValidParam(SqlDbType.Date, "c1", new DateTime(1753, 1, 1, 0, 0, 0, DateTimeKind.Local), conn, tableName), "FAILED: Invalid param for Date SqlDbType");
                             Assert.False(IsValidParam(SqlDbType.Date, "c1", new TimeSpan(), conn, tableName), "FAILED: Invalid param for Date SqlDbType");
                             Assert.True(IsValidParam(SqlDbType.Date, "c1", "1753-1-1", conn, tableName), "FAILED: Invalid param for Date SqlDbType");
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                             Assert.True(IsValidParam(SqlDbType.Date, "c1", new DateOnly(1753, 1, 1), conn, tableName), "FAILED: Invalid param for Date SqlDbType");
                             Assert.False(IsValidParam(SqlDbType.Date, "c1", new TimeOnly(), conn, tableName), "FAILED: Invalid param for Date SqlDbType");
 #endif
@@ -225,7 +225,7 @@ public static void ReaderParameterTest()
                             Assert.False(IsValidParam(SqlDbType.Time, "c2", new DateTime(1753, 1, 1, 0, 0, 0, DateTimeKind.Local), conn, tableName), "FAILED: Invalid param for Time SqlDbType");
                             Assert.True(IsValidParam(SqlDbType.Time, "c2", TimeSpan.Parse("20:12:13.36"), conn, tableName), "FAILED: Invalid param for Time SqlDbType");
                             Assert.True(IsValidParam(SqlDbType.Time, "c2", "20:12:13.36", conn, tableName), "FAILED: Invalid param for Time SqlDbType");
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                             Assert.False(IsValidParam(SqlDbType.Time, "c2", new DateOnly(1753, 1, 1), conn, tableName), "FAILED: Invalid param for Time SqlDbType");
                             Assert.True(IsValidParam(SqlDbType.Time, "c2", new TimeOnly(20, 12, 13, 360), conn, tableName), "FAILED: Invalid param for Time SqlDbType");
 #endif
@@ -382,7 +382,7 @@ public static void ReaderParameterTest()
                             Assert.True(IsValidParam(DbType.Date, "c1", new DateTime(1753, 1, 1, 0, 0, 0, DateTimeKind.Local), conn, tableName), "FAILED: Invalid param for Date DbType");
                             Assert.False(IsValidParam(DbType.Date, "c1", new TimeSpan(), conn, tableName), "FAILED: Invalid param for Date DbType");
                             Assert.True(IsValidParam(DbType.Date, "c1", "1753-1-1", conn, tableName), "FAILED: Invalid param for Date DbType");
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                             Assert.True(IsValidParam(DbType.Date, "c1", new DateOnly(1753, 1, 1), conn, tableName), "FAILED: Invalid param for Date DbType");
                             Assert.False(IsValidParam(DbType.Date, "c1", new TimeOnly(), conn, tableName), "FAILED: Invalid param for Date DbType");
 #endif
@@ -396,7 +396,7 @@ public static void ReaderParameterTest()
                             Assert.False(IsValidParam(DbType.Time, "c2", new DateTime(1753, 1, 1, 0, 0, 0, DateTimeKind.Local), conn, tableName), "FAILED: Invalid param for Time DbType");
                             Assert.True(IsValidParam(DbType.Time, "c2", TimeSpan.Parse("20:12:13.36"), conn, tableName), "FAILED: Invalid param for Time DbType");
                             Assert.True(IsValidParam(DbType.Time, "c2", "20:12:13.36", conn, tableName), "FAILED: Invalid param for Time DbType");
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
                             Assert.False(IsValidParam(DbType.Time, "c2", new DateOnly(1753, 1, 1), conn, tableName), "FAILED: Invalid param for Time DbType");
                             Assert.True(IsValidParam(DbType.Time, "c2", new TimeOnly(20, 12, 13, 360), conn, tableName), "FAILED: Invalid param for Time DbType");
 #endif
@@ -520,7 +520,7 @@ public static void ReaderParameterTest()
             }
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         // Synapse: CREATE or ALTER PROCEDURE statement uses syntax or features that are not supported in SQL Server PDW.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void ReaderParameterTest_DateOnly_TimeOnly()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
@@ -87,7 +87,7 @@ public static void ConnectManagedWithInstanceNameTest(bool useMultiSubnetFailove
             }
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         [ConditionalFact(nameof(IsSPNPortNumberTestForTCP))]
         public static void SPNTestForTCPMustReturnPortNumber()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -9,7 +9,7 @@
 using System.Data.SqlTypes;
 using System.Threading;
 using Xunit;
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
 using Microsoft.SqlServer.Types;
 using Microsoft.Data.SqlClient.Server;
 #endif
@@ -310,7 +310,7 @@ public static void TestParametersWithDatatablesTVPInsert()
             }
         }
 
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'TYPE'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestParametersWithSqlRecordsTVPInsert()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicConfigHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicConfigHelper.cs
@@ -86,7 +86,7 @@ public static object CreateLoader(RetryLogicConfigs cnnConfig, RetryLogicConfigs
 
         public static void ApplyContextSwitchByManager(string name, bool value)
         {
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
             var appCtxType = s_sqlClientAssembly.GetType(AppCtxCfgTypeName);
             var appCtxObj = Activator.CreateInstance(appCtxType);
             SetValue(appCtxObj, appCtxType, "Value", string.Concat(name, "=", value));
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
         [System.Runtime.Versioning.SupportedOSPlatform("windows")]
 #endif
     public class SqlDataSourceEnumeratorTest

Original file line number	Diff line number	Diff line change
`@@ -3169,7 +3169,7 @@ public Customer(int id, string firstName, string lastName)`
`3169`	`3169`	`public string LastName { get; set; }`
`3170`	`3170`	`}`
`3171`	`3171`
`3172`		`-#if NET6_0_OR_GREATER`
	`3172`	`+#if !NETFRAMEWORK`
`3173`	`3173`	`public record CustomerDateOnly(int Id, string FirstName, string LastName, DateOnly DateOfBirth, TimeOnly TimeOfDay);`
`3174`	`3174`	`#endif`
`3175`	`3175`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ public static void InvalidCastExceptionStream(CommandBehavior behavior, Accessor`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`
`475`		`-#if NET6_0_OR_GREATER`
	`475`	`+#if !NETFRAMEWORK`
`476`	`476`	`[ConditionalFact(typeof(DataTestUtility),nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]`
`477`	`477`	`public static async Task ReadAsyncContentsCompletes()`
`478`	`478`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public static void ConnectManagedWithInstanceNameTest(bool useMultiSubnetFailove`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-#if NET6_0_OR_GREATER`
	`90`	`+#if !NETFRAMEWORK`
`91`	`91`	`[ConditionalFact(nameof(IsSPNPortNumberTestForTCP))]`
`92`	`92`	`public static void SPNTestForTCPMustReturnPortNumber()`
`93`	`93`	`{`