Merge | OS Flags

build.proj

@@ -153,6 +153,13 @@
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />
   </Target>
+
+  <Target Name="BuildNetCoreUnix" DependsOnTargets="RestoreNetCore">
+    <MSBuild Projects="@(NetCoreDriver)"
+             Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;"
+             RemoveProperties="TargetsWindows;TargetsUnix;" />
+   </Target>
+
   <!-- Build .NET Standard target DLLs for Lib folder from here.
    This target enables BuildForLib for the NetCore ref project. -->
   <Target Name="BuildNetStandard">
@@ -327,7 +334,7 @@
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
   </Target>
 
   <!-- Run all Manual tests applicable to Unix. -->

src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs

@@ -2,9 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Win32.SafeHandles;
+#if NET && _WINDOWS
 
-#if NET
+using Microsoft.Win32.SafeHandles;
 
 namespace Interop.Windows.Handles
 {

src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Kernel32
 {
     internal class FileTypes
@@ -12,3 +14,5 @@ internal class FileTypes
         internal const int FILE_TYPE_PIPE = 0x0003;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 
 namespace Interop.Windows.Kernel32
@@ -31,3 +33,5 @@ public enum IoControlCodeAccess
         FILE_WRITE_DATA = 0x02
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Kernel32
 {
     /// <summary>
@@ -35,3 +37,5 @@ public enum IoControlTransferType
         METHOD_NEITHER
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
@@ -92,3 +94,5 @@ internal static extern int GetFullPathName(
         internal static extern bool SetThreadErrorMode(uint dwNewMode, out uint lpOldMode);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.NtDll
 {
     /// <summary>
@@ -54,3 +56,5 @@ internal enum CreateDisposition : uint
         FILE_OVERWRITE_IF = 5
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 
 namespace Interop.Windows.NtDll
@@ -196,3 +198,5 @@ internal enum CreateOptions : uint
         // FILE_OPEN_FOR_FREE_SPACE_QUERY = 0x00800000
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 
 namespace Interop.Windows.NtDll
@@ -188,3 +190,5 @@ internal enum DesiredAccess : uint
         FILE_GENERIC_EXECUTE = 0x20000000 // GENERIC_EXECUTE
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.NtDll
@@ -35,3 +37,5 @@ internal struct FileFullEaInformation
 
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.NtDll
 {
     /// <summary>
@@ -39,3 +41,5 @@ internal enum ImpersonationLevel
         SecurityDelegation = 3,
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -42,3 +44,5 @@ public struct IoStatus
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -118,3 +120,5 @@ private static extern unsafe int NtCreateFile(
             uint EaLength);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 
 namespace Interop.Windows.NtDll
@@ -52,3 +54,5 @@ internal enum ObjectAttributeFlags : uint
         // OBJ_VALID_ATTRIBUTES = 0x000001F2
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 
 namespace Interop.Windows.NtDll
@@ -58,3 +60,5 @@ public ObjectAttributes(
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.NtDll
@@ -48,3 +50,5 @@ public SecurityQualityOfService(
         public bool IsEffectiveOnly { get; set; }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Secur32/ContextAttribute.netfx.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETFRAMEWORK
+
 namespace Interop.Windows.Secur32
 {
     internal enum ContextAttribute
@@ -29,3 +31,5 @@ internal enum ContextAttribute
         SECPKG_ATTR_UI_INFO = 0x68, // sets SEcPkgContext_UiInfo  
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.Sni
@@ -23,3 +25,5 @@ internal struct AuthProviderInfo
         public string serverCertFileName;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -16,3 +18,5 @@ internal struct ConsumerInfo
         internal IntPtr key;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Sni
 {
     internal enum ConsumerNumber
@@ -12,3 +14,5 @@ internal enum ConsumerNumber
         SNI_Consumer_Invalid,
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -12,3 +14,5 @@ namespace Interop.Windows.Sni
 
     internal delegate IntPtr SqlClientCertificateDelegate(IntPtr pCallbackContext);
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ISniNativeMethods.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -99,3 +101,5 @@ unsafe uint SniSecGenClientContextWrapper(
         uint SniWriteSyncOverAsync(SNIHandle pConn, SNIPacket pPacket);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Sni
 {
     internal enum IoType
@@ -10,3 +12,5 @@ internal enum IoType
         WRITE,
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Sni
 {
     internal enum Prefix
@@ -14,3 +16,5 @@ internal enum Prefix
         INVALID_PREFIX,
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Sni
 {
     internal enum Provider
@@ -24,3 +26,5 @@ internal enum Provider
         INVALID_PROV,
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if _WINDOWS
+
 namespace Interop.Windows.Sni
 {
     internal enum QueryType
@@ -47,3 +49,5 @@ internal enum QueryType
         #endif
     }
 }
+
+#endif