Skip to content

Commit 8777fce

Browse files
authored
Merge SqlColumnEncryptionCertificateStoreProvider (#2521)
1 parent 55f48c5 commit 8777fce

File tree

4 files changed

+35
-620
lines changed

4 files changed

+35
-620
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,9 @@
833833
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs">
834834
<Link>Microsoft\Data\SqlClient\SSPI\NativeSSPIContextProvider.cs</Link>
835835
</Compile>
836+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
837+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs</Link>
838+
</Compile>
836839
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs">
837840
<Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs</Link>
838841
</Compile>
@@ -844,7 +847,6 @@
844847
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Windows.cs" />
845848
<Compile Include="Microsoft\Data\SqlClient\SessionHandle.Windows.cs" />
846849
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Windows.cs" />
847-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs" />
848850
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Windows.cs" />
849851
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Windows.cs" />
850852
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,9 @@
438438
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
439439
<Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
440440
</Compile>
441+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Windows.cs">
442+
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
443+
</Compile>
441444
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
442445
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
443446
</Compile>
@@ -675,7 +678,6 @@
675678
<Compile Include="Microsoft\Data\SqlClient\SqlClientPermission.cs" />
676679
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
677680
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
678-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs" />
679681
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs" />
680682
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs" />
681683
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs" />

0 commit comments

Comments
 (0)