Merge main

Author: edwardneal

.config/CredScanSuppressions.json

@@ -12,6 +12,14 @@
     {
       "file": "doc/samples/SqlConnectionStringBuilder.cs",
       "justification": "Documentation could include sample data and can be ignored"
+    },
+    {
+      "file": "src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs",
+      "justification": "Test projects should be skipped"
+    },
+    {
+      "file": "src/Microsoft.Data.SqlClient/tests/UnitTests/Resources/AlwaysEncrypted/NativeColumnEncryptionKeyBaseline/Certificate.pfx",
+      "justification": "Test projects should be skipped"
     }
   ]
 }

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">

eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml

@@ -33,7 +33,6 @@ parameters:
   # True to upload code coverage results to CodeCov.
   - name: upload
     type: boolean
-    default: true
 
 jobs:
   - job: CodeCoverage

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -171,6 +171,14 @@ stages:
             image: ADO-MMS22-CodeCov
             pool: ${{ parameters.defaultPoolName }}
             targetFrameworks: ${{ parameters.codeCovTargetFrameworks }}
+            # This is a Pipeline Variable defined in the Azure DevOps UI.  It
+            # must be defined with a true/false value for all pipelines that
+            # specify a build type of 'Project'.
+            #
+            # You can find Pipeline Variables by visiting the main page of the
+            # pipeline and choosing Edit -> Variables.
+            #
+            upload: ${{ eq(variables.ci_var_uploadTestResult, 'true') }}
 
 # test stages configurations
   # self hosted SQL Server on Windows

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

@@ -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/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -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/Handles/SafeLibraryHandle.netcore.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/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
 {
     /// <summary>
@@ -35,3 +37,5 @@ public enum IoControlTransferType
         METHOD_NEITHER
     }
 }
+
+#endif