diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs index 9a9ae9ee79..be1a98de78 100644 --- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs +++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs @@ -375,7 +375,7 @@ public static partial class SqlClientMetaDataCollectionNames /// public static readonly string ColumnSetColumns; } -#if NETCORE || NETSTANDARD21_AND_ABOVE +#if NETCOREAPP || NETSTANDARD21_AND_ABOVE /// public enum SqlConnectionAttestationProtocol { @@ -848,7 +848,7 @@ public SqlConnectionStringBuilder(string connectionString) { } [System.ComponentModel.DisplayNameAttribute("Data Source")] [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)] public string DataSource { get { throw null; } set { } } -#if NETCORE || NETSTANDARD21_AND_ABOVE +#if NETCOREAPP || NETSTANDARD21_AND_ABOVE /// [System.ComponentModel.DisplayNameAttribute("Attestation Protocol")] [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)] diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj index 81399b6022..9a6db6b167 100644 --- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj @@ -12,11 +12,11 @@ netstandard AnyCPU;x64;x86 - + $(DefineConstants);NETSTANDARD21_AND_ABOVE - $(DefineConstants);NETCORE + $(DefineConstants);NETCOREAPP diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index f717a72a6a..2eaa0c9b08 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -20,13 +20,13 @@ Core $(BaseProduct) - $(DefineConstants);netcoreapp; + $(DefineConstants);NETCOREAPP; - $(DefineConstants);netstandard; + $(DefineConstants);NETSTANDARD; - - $(DefineConstants);NETCORE3 + + $(DefineConstants);NETCOREAPP31_AND_ABOVE portable diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs index ee9544b4ce..eb23fcdfef 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs @@ -780,7 +780,7 @@ internal static partial class DbConnectionStringKeywords internal const string MaxPoolSize = "Max Pool Size"; internal const string Pooling = "Pooling"; internal const string MinPoolSize = "Min Pool Size"; -#if netcoreapp +#if NETCOREAPP internal const string PoolBlockingPeriod = "Pool Blocking Period"; #endif } @@ -839,7 +839,7 @@ internal static class DbConnectionStringSynonyms internal const string NET = "net"; internal const string NETWORK = "network"; -#if netcoreapp +#if NETCOREAPP //internal const string PoolBlockingPeriod = POOLBLOCKINGPERIOD; internal const string POOLBLOCKINGPERIOD = "PoolBlockingPeriod"; #endif diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs index 9099427e7f..b072a4fa01 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs @@ -815,7 +815,7 @@ public override void KillConnection() internal static void SetKeepAliveValues(ref Socket socket) { -#if NETCORE3 +#if NETCOREAPP31_AND_ABOVE socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1); socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30); diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionString.cs index 7e58eaf4a2..aa9023139c 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionString.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionString.cs @@ -63,7 +63,7 @@ internal static class KEY internal const string Application_Name = "application name"; internal const string AsynchronousProcessing = "asynchronous processing"; internal const string AttachDBFilename = "attachdbfilename"; -#if netcoreapp +#if NETCOREAPP internal const string PoolBlockingPeriod = "pool blocking period"; #endif internal const string ColumnEncryptionSetting = "column encryption setting"; @@ -141,7 +141,7 @@ private static class SYNONYM // network library internal const string NET = "net"; internal const string NETWORK = "network"; -#if netcoreapp +#if NETCOREAPP // pool blocking period internal const string POOLBLOCKINGPERIOD = "poolblockingperiod"; #endif @@ -159,7 +159,7 @@ private static class SYNONYM // make sure to update SynonymCount value below when adding or removing synonyms } -#if netcoreapp +#if NETCOREAPP internal const int SynonymCount = 25; #else internal const int SynonymCount = 24; @@ -258,7 +258,7 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G } _integratedSecurity = ConvertValueToIntegratedSecurity(); -#if netcoreapp +#if NETCOREAPP _poolBlockingPeriod = ConvertValueToPoolBlockingPeriod(); #endif _encrypt = ConvertValueToBoolean(KEY.Encrypt, DEFAULT.Encrypt); @@ -511,7 +511,7 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS _commandTimeout = connectionOptions._commandTimeout; _connectTimeout = connectionOptions._connectTimeout; _loadBalanceTimeout = connectionOptions._loadBalanceTimeout; -#if netcoreapp +#if NETCOREAPP _poolBlockingPeriod = connectionOptions._poolBlockingPeriod; #endif _maxPoolSize = connectionOptions._maxPoolSize; @@ -650,7 +650,7 @@ internal static Dictionary GetParseSynonyms() { KEY.Application_Name, KEY.Application_Name }, { KEY.AsynchronousProcessing, KEY.AsynchronousProcessing }, { KEY.AttachDBFilename, KEY.AttachDBFilename }, -#if netcoreapp +#if NETCOREAPP { KEY.PoolBlockingPeriod, KEY.PoolBlockingPeriod}, #endif { KEY.Command_Timeout, KEY.Command_Timeout }, @@ -703,7 +703,7 @@ internal static Dictionary GetParseSynonyms() { SYNONYM.MULTIPLEACTIVERESULTSETS, KEY.MARS }, { SYNONYM.MULTISUBNETFAILOVER, KEY.MultiSubnetFailover }, { SYNONYM.NETWORK_ADDRESS, KEY.Data_Source }, -#if netcoreapp +#if NETCOREAPP { SYNONYM.POOLBLOCKINGPERIOD, KEY.PoolBlockingPeriod}, #endif { SYNONYM.SERVER, KEY.Data_Source }, diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs index 2c4d110254..0a7a06659a 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs @@ -33,7 +33,7 @@ private enum Keywords Pooling, MinPoolSize, MaxPoolSize, -#if netcoreapp +#if NETCOREAPP PoolBlockingPeriod, #endif MultipleActiveResultSets, @@ -114,7 +114,7 @@ private static string[] CreateValidKeywords() validKeywords[(int)Keywords.ApplicationIntent] = DbConnectionStringKeywords.ApplicationIntent; validKeywords[(int)Keywords.ApplicationName] = DbConnectionStringKeywords.ApplicationName; validKeywords[(int)Keywords.AttachDBFilename] = DbConnectionStringKeywords.AttachDBFilename; -#if netcoreapp +#if NETCOREAPP validKeywords[(int)Keywords.PoolBlockingPeriod] = DbConnectionStringKeywords.PoolBlockingPeriod; #endif validKeywords[(int)Keywords.CommandTimeout] = DbConnectionStringKeywords.CommandTimeout; @@ -158,7 +158,7 @@ private static Dictionary CreateKeywordsDictionary() hash.Add(DbConnectionStringKeywords.ApplicationIntent, Keywords.ApplicationIntent); hash.Add(DbConnectionStringKeywords.ApplicationName, Keywords.ApplicationName); hash.Add(DbConnectionStringKeywords.AttachDBFilename, Keywords.AttachDBFilename); -#if netcoreapp +#if NETCOREAPP hash.Add(DbConnectionStringKeywords.PoolBlockingPeriod, Keywords.PoolBlockingPeriod); #endif hash.Add(DbConnectionStringKeywords.CommandTimeout, Keywords.CommandTimeout); @@ -208,7 +208,7 @@ private static Dictionary CreateKeywordsDictionary() hash.Add(DbConnectionStringSynonyms.MULTIPLEACTIVERESULTSETS, Keywords.MultipleActiveResultSets); hash.Add(DbConnectionStringSynonyms.MULTISUBNETFAILOVER, Keywords.MultiSubnetFailover); hash.Add(DbConnectionStringSynonyms.NETWORKADDRESS, Keywords.DataSource); -#if netcoreapp +#if NETCOREAPP hash.Add(DbConnectionStringSynonyms.POOLBLOCKINGPERIOD, Keywords.PoolBlockingPeriod); #endif hash.Add(DbConnectionStringSynonyms.SERVER, Keywords.DataSource); @@ -326,7 +326,7 @@ public override object this[string keyword] case Keywords.AttestationProtocol: AttestationProtocol = ConvertToAttestationProtocol(keyword, value); break; -#if netcoreapp +#if NETCOREAPP case Keywords.PoolBlockingPeriod: PoolBlockingPeriod = ConvertToPoolBlockingPeriod(keyword, value); break; #endif case Keywords.Encrypt: @@ -914,7 +914,7 @@ private object GetAt(Keywords index) return ApplicationName; case Keywords.AttachDBFilename: return AttachDBFilename; -#if netcoreapp +#if NETCOREAPP case Keywords.PoolBlockingPeriod: return PoolBlockingPeriod; #endif case Keywords.CommandTimeout: @@ -1029,7 +1029,7 @@ private void Reset(Keywords index) case Keywords.Authentication: _authentication = DbConnectionStringDefaults.Authentication; break; -#if netcoreapp +#if NETCOREAPP case Keywords.PoolBlockingPeriod: _poolBlockingPeriod = DbConnectionStringDefaults.PoolBlockingPeriod; break; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs index 70cecd2e3f..c4c27098ca 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs @@ -1658,7 +1658,7 @@ internal void WriteInt(int v, TdsParserStateObject stateObj) internal static void WriteInt(Span buffer, int value) { -#if netcoreapp +#if NETCOREAPP BitConverter.TryWriteBytes(buffer, value); #else buffer[0] = (byte)(value & 0xff); diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsValueSetter.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsValueSetter.cs index 7ab4ad5403..08e0aefaec 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsValueSetter.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsValueSetter.cs @@ -561,7 +561,7 @@ internal void SetDateTime(DateTime value) _stateObj.Parser.WriteInt(dt.time, _stateObj); } - // Clean the variant metadata to prevent sharing it with next row. + // Clean the variant metadata to prevent sharing it with next row. // As a reminder, SetVariantType raises an assert if _variantType is not clean _variantType = null; } @@ -601,7 +601,7 @@ internal void SetGuid(Guid value) Debug.Assert( SmiXetterAccessMap.IsSetterAccessValid(_metaData, SmiXetterTypeCode.XetGuid)); -#if netcoreapp +#if NETCOREAPP Span bytes = stackalloc byte[16]; value.TryWriteBytes(bytes); @@ -620,7 +620,7 @@ internal void SetGuid(Guid value) _stateObj.WriteByte((byte)_metaData.MaxLength); } -#if netcoreapp +#if NETCOREAPP _stateObj.WriteByteSpan(bytes); #else _stateObj.WriteByteArray(bytes, bytes.Length, 0); @@ -660,7 +660,7 @@ internal void SetDateTimeOffset(DateTimeOffset value) byte length; if (SqlDbType.Variant == _metaData.SqlDbType) { - // VSTFDevDiv #885208 - DateTimeOffset throws ArgumentException for when passing DateTimeOffset value to a sql_variant TVP + // VSTFDevDiv #885208 - DateTimeOffset throws ArgumentException for when passing DateTimeOffset value to a sql_variant TVP // using a SqlDataRecord or SqlDataReader SmiMetaData dateTimeOffsetMetaData = SmiMetaData.DefaultDateTimeOffset; scale = MetaType.MetaDateTimeOffset.Scale; diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index 7b3a6a1181..b12183ebdd 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -20,7 +20,7 @@ True - $(DefineConstants);netfx; + $(DefineConstants);NETFRAMEWORK; diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs index 801b4df97a..507d34b103 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs @@ -66,14 +66,14 @@ public override void BeforeUnload(SqlAuthenticationMethod authentication) _logger.LogInfo(_type, "BeforeUnload", $"being unloaded from SqlAuthProviders for {authentication}."); } -#if netstandard +#if NETSTANDARD private Func parentActivityOrWindowFunc = null; /// public void SetParentActivityOrWindowFunc(Func parentActivityOrWindowFunc) => this.parentActivityOrWindowFunc = parentActivityOrWindowFunc; #endif -#if netfx +#if NETFRAMEWORK private Func _iWin32WindowFunc = null; /// @@ -101,16 +101,16 @@ public override Task AcquireTokenAsync(SqlAuthentication return new SqlAuthenticationToken(result.AccessToken, result.ExpiresOn); } - /* + /* * Today, MSAL.NET uses another redirect URI by default in desktop applications that run on Windows * (urn:ietf:wg:oauth:2.0:oob). In the future, we'll want to change this default, so we recommend * that you use https://login.microsoftonline.com/common/oauth2/nativeclient. - * + * * https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-desktop-app-registration#redirect-uris */ string redirectURI = "https://login.microsoftonline.com/common/oauth2/nativeclient"; -#if netcoreapp +#if NETCOREAPP if (parameters.AuthenticationMethod != SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow) { redirectURI = "http://localhost"; @@ -118,7 +118,7 @@ public override Task AcquireTokenAsync(SqlAuthentication #endif IPublicClientApplication app; -#if netstandard +#if NETSTANDARD if (parentActivityOrWindowFunc != null) { app = PublicClientApplicationBuilder.Create(_applicationClientId) @@ -130,7 +130,7 @@ public override Task AcquireTokenAsync(SqlAuthentication .Build(); } #endif -#if netfx +#if NETFRAMEWORK if (_iWin32WindowFunc != null) { app = PublicClientApplicationBuilder.Create(_applicationClientId) @@ -142,7 +142,7 @@ public override Task AcquireTokenAsync(SqlAuthentication .Build(); } #endif -#if !netcoreapp +#if !NETCOREAPP else #endif { @@ -229,14 +229,14 @@ private async Task AcquireTokenInteractiveDeviceFlowAsync( SqlAuthenticationMethod authenticationMethod) { CancellationTokenSource cts = new CancellationTokenSource(); -#if netcoreapp +#if NETCOREAPP /* * On .NET Core, MSAL will start the system browser as a separate process. MSAL does not have control over this browser, * but once the user finishes authentication, the web page is redirected in such a way that MSAL can intercept the Uri. * MSAL cannot detect if the user navigates away or simply closes the browser. Apps using this technique are encouraged * to define a timeout (via CancellationToken). We recommend a timeout of at least a few minutes, to take into account * cases where the user is prompted to change password or perform 2FA. - * + * * https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/System-Browser-on-.Net-Core#system-browser-experience */ cts.CancelAfter(180000); @@ -257,7 +257,7 @@ private async Task AcquireTokenInteractiveDeviceFlowAsync( { /* * We will use the MSAL Embedded or System web browser which changes by Default in MSAL according to this table: - * + * * Framework Embedded System Default * ------------------------------------------- * .NET Classic Yes Yes^ Embedded @@ -267,9 +267,9 @@ private async Task AcquireTokenInteractiveDeviceFlowAsync( * Xamarin.Android Yes Yes System * Xamarin.iOS Yes Yes System * Xamarin.Mac Yes No Embedded - * + * * ^ Requires "http://localhost" redirect URI - * + * * https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/MSAL.NET-uses-web-browser#at-a-glance */ return await app.AcquireTokenInteractive(scopes) @@ -296,11 +296,11 @@ private async Task AcquireTokenInteractiveDeviceFlowAsync( private Task DefaultDeviceFlowCallback(DeviceCodeResult result) { - // This will print the message on the console which tells the user where to go sign-in using + // This will print the message on the console which tells the user where to go sign-in using // a separate browser and the code to enter once they sign in. // The AcquireTokenWithDeviceCode() method will poll the server after firing this // device code callback to look for the successful login of the user via that browser. - // This background polling (whose interval and timeout data is also provided as fields in the + // This background polling (whose interval and timeout data is also provided as fields in the // deviceCodeCallback class) will occur until: // * The user has successfully logged in via browser and entered the proper code // * The timeout specified by the server for the lifetime of this code (typically ~15 minutes) has been reached diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.Windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.Windows.cs index f9af6024e4..2249bd747f 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.Windows.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.Windows.cs @@ -35,7 +35,7 @@ protected override void OnEventCommand(EventCommandEventArgs e) // If registration fails, all write and unregister commands will be a no-op. // If managed networking is enabled, don't call native wrapper methods -#if netcoreapp +#if NETCOREAPP if (AppContext.TryGetSwitch("Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows", out bool isEnabled) && isEnabled) { return; diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs index dc85dab6dd..3d0588ece9 100644 --- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs @@ -67,7 +67,7 @@ public class SqlConnectionStringBuilderTest [InlineData("PersistSecurityInfo = true")] [InlineData("Pooling = no")] [InlineData("Pooling = false")] -#if netcoreapp +#if NETCOREAPP // PoolBlockingPeriod is not supported in .NET Standard [InlineData("PoolBlockingPeriod = Auto")] [InlineData("PoolBlockingperiod = NeverBlock")] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs index 48a9be0b22..726aeafe47 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs @@ -180,7 +180,7 @@ private TException VerifyConnectionFailure(Action connectAction, str TException ex = Assert.Throws(connectAction); // Some exception messages are different between Framework and Core -#if netfx +#if NETFRAMEWORK Assert.Contains(expectedExceptionMessage, ex.Message); #endif Assert.True(exVerifier(ex), "FAILED Exception verifier failed on the exception."); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs index 1d90c31261..3015d11c70 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs @@ -268,7 +268,7 @@ private static void TestUdtSqlDataReaderGetStream(CommandBehavior behavior) } } } -#if netcoreapp +#if NETCOREAPP // Synapse: Parse error at line: 1, column: 41: Incorrect syntax near 'hierarchyid'. [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestUdtSchemaMetadata() diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/DiscovererHelpers.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/DiscovererHelpers.cs index b8b92d9423..5dab843fab 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/DiscovererHelpers.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/DiscovererHelpers.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.DotNet.XUnitExtensions @@ -10,7 +11,7 @@ namespace Microsoft.DotNet.XUnitExtensions internal static class DiscovererHelpers { internal static bool TestPlatformApplies(TestPlatforms platforms) => -#if netcoreapp +#if NETCOREAPP (platforms.HasFlag(TestPlatforms.FreeBSD) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"))) || (platforms.HasFlag(TestPlatforms.Linux) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) || (platforms.HasFlag(TestPlatforms.NetBSD) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"))) ||