Skip to content

Commit 467701e

Browse files
authored
Merge SqlColumnEncryptionEnclaveProvider, SqlColumnEncryptionCspProvider, SqlColumnEncryptionCngProvider (#2501)
Thanks @edwardneal ! * Merged SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs * Merged SqlColumnEncryptionEnclaveProvider * Merged SqlColumnEncryptionCspProvider * Merged SqlColumnEncryptionCngProvider * Corrected project files post-merge
1 parent 9b9bdc1 commit 467701e

File tree

9 files changed

+35
-897
lines changed

9 files changed

+35
-897
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,9 @@
386386
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
387387
<Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
388388
</Compile>
389+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
390+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
391+
</Compile>
389392
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
390393
<Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
391394
</Compile>
@@ -651,8 +654,6 @@
651654
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnostic.cs" />
652655
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
653656
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
654-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs" />
655-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs" />
656657
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
657658
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
658659
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
@@ -730,6 +731,12 @@
730731
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs">
731732
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.Windows.cs</Link>
732733
</Compile>
734+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs">
735+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs</Link>
736+
</Compile>
737+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
738+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs</Link>
739+
</Compile>
733740
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
734741
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
735742
</Compile>
@@ -779,8 +786,6 @@
779786
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Windows.cs" />
780787
<Compile Include="Microsoft\Data\SqlClient\SessionHandle.Windows.cs" />
781788
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Windows.cs" />
782-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs" />
783-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs" />
784789
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
785790
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
786791
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionEnclaveProvider.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,15 @@
472472
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
473473
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
474474
</Compile>
475+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs">
476+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs</Link>
477+
</Compile>
478+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs">
479+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs</Link>
480+
</Compile>
481+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
482+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
483+
</Compile>
475484
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
476485
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
477486
</Compile>
@@ -710,9 +719,6 @@
710719
<Compile Include="Microsoft\Data\SqlClient\SqlClientPermission.cs" />
711720
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
712721
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
713-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs" />
714-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs" />
715-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs" />
716722
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
717723
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
718724
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />

0 commit comments

Comments
 (0)