dotnet · jkotas · Feb 5, 2020 · Jan 27, 2020 · Jan 28, 2020 · Feb 1, 2020
diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json
@@ -17,12 +17,6 @@
       "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs",
       "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs",
       "/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs",
-      "/src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/TdsEnums.cs",
-      "/src/libraries/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs",
-      "/src/libraries/System.Data.SqlClient/tests/FunctionalTests/ExceptionTest.cs",
-      "/src/libraries/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs",
-      "/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDSServerArguments.cs",
-      "/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TdsServerCertificate.pfx",
       "/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs",
       "/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs",
       "/src/libraries/System.DirectoryServices.AccountManagement/tests/PrincipalTest.cs",

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -110,8 +110,8 @@
     <RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion>
     <RefOnlyNugetProjectModelVersion>4.9.4</RefOnlyNugetProjectModelVersion>
     <RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion>
-    <!-- sni -->
-    <RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>
+    <!-- System.Data.SqlClient -->
+    <SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
     <!-- Testing -->
     <MicrosoftNETTestSdkVersion>16.5.0</MicrosoftNETTestSdkVersion>
     <XUnitVersion>2.4.1</XUnitVersion>

diff --git a/src/coreclr/tests/scripts/run-corefx-tests.bat b/src/coreclr/tests/scripts/run-corefx-tests.bat
@@ -27,7 +27,7 @@ echo control, but is easy to implement. This file should be a list of assembly n
 echo without filename extension, one per line, e.g.:
 echo.
 echo     System.Console.Tests
-echo     System.Data.SqlClient.Tests
+echo     System.Data.Common.Tests
 echo     System.Diagnostics.Process.Tests
 echo.
 echo The ^<exclusion rsp file^> is in the form expected by xunit.console.dll as a response file.

diff --git a/src/libraries/Native/pkg/Directory.Build.props b/src/libraries/Native/pkg/Directory.Build.props
diff --git a/src/libraries/Native/pkg/Directory.Build.targets b/src/libraries/Native/pkg/Directory.Build.targets
diff --git a/src/libraries/Native/pkg/_.pdb b/src/libraries/Native/pkg/_.pdb
diff --git a/...runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj b/...runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -76,6 +76,7 @@
     <Compile Include="System\Data\DeletedRowInaccessibleExceptionTest.cs" />
     <Compile Include="System\Data\DuplicateNameExceptionTest.cs" />
     <Compile Include="System\Data\EvaluateExceptionTest.cs" />
+    <Compile Include="System\Data\FacadeTest.cs" />
     <Compile Include="System\Data\ForeignKeyConstraintTest.cs" />
     <Compile Include="System\Data\ForeignKeyConstraintTest2.cs" />
     <Compile Include="System\Data\InRowChangingEventExceptionTest.cs" />
@@ -119,4 +120,7 @@
       <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Data.Common/tests/System/Data/FacadeTest.cs b/src/libraries/System.Data.Common/tests/System/Data/FacadeTest.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace System.Data.Tests
+{
+    public class FacadeTest
+    {
+        [Theory]
+        [InlineData("Microsoft.SqlServer.Server.SqlMetaData")] // Type from System.Data.SqlClient
+        [InlineData("System.Data.SqlTypes.SqlBytes")] // Type from System.Data.Common
+        public void TestSystemData(string typeName)
+        {
+            // Verify that the type can be loaded via .NET Framework compat facade
+            Type.GetType(typeName + ", System.Data", throwOnError: true);
+        }
+    }
+}
diff --git a/src/libraries/System.Data.OleDb/src/DbConnectionStringCommon.cs b/src/libraries/System.Data.OleDb/src/DbConnectionStringCommon.cs
@@ -6,7 +6,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.Data.SqlClient;
 
 namespace System.Data.Common
 {

diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
@@ -102,7 +102,6 @@
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <Reference Include="Microsoft.Win32.Registry" />
     <Reference Include="System.Memory" />
-    <Reference Include="System.Data.SqlClient" />
     <Reference Include="System.Configuration.ConfigurationManager" />
     <Reference Include="System.Diagnostics.PerformanceCounter" />
     <Reference Include="System.Security.Principal.Windows" />

diff --git a/src/libraries/System.Data.SqlClient/Directory.Build.props b/src/libraries/System.Data.SqlClient/Directory.Build.props