Skip to content

Commit d8a4c47

Browse files
committed
Addressing comments from @paulmedynski
1 parent 615c30c commit d8a4c47

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
<!-- OS Constants ==================================================== -->
4343
<PropertyGroup>
44-
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='UNIX'">_UNIX</DefineConstants>
45-
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">_WINDOWS</DefineConstants>
44+
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='UNIX'">$(DefineConstants),_UNIX</DefineConstants>
45+
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
4646
</PropertyGroup>
4747

4848
<!-- Compiled Files ================================================== -->

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
<!-- OS Constants ==================================================== -->
105105
<PropertyGroup>
106-
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">_WINDOWS</DefineConstants>
106+
<DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
107107
</PropertyGroup>
108108

109109
<!-- Compiled Files ================================================== -->

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
1919
<!-- flags. Those only apply to OS-specific target frameworks, and would interfere here. -->
20-
<DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">_UNIX</DefineConstants>
21-
<DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">_WINDOWS</DefineConstants>
20+
<DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants),_UNIX</DefineConstants>
21+
<DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
2222
</PropertyGroup>
2323

2424
<!-- Embedded resources ============================================== -->

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,9 @@ public static bool UseManagedNetworking
465465
}
466466
#else
467467
/// <summary>
468-
/// .NET Core on Unix does not support the native SNI, so this will always be false.
468+
/// .NET Core on Unix does not support the native SNI, so this will always be true.
469469
/// </summary>
470-
public static bool UseManagedNetworking => false;
470+
public static bool UseManagedNetworking => true;
471471
#endif
472472

473473
#else

0 commit comments

Comments
 (0)