Skip to content

Commit 0a8a2ba

Browse files
authored
Merge | SqlColumnEncryption*.Unix (#3305)
* Moving SqlColumnEncryption*.Unix.cs files to common project * Fixing xml doc path
1 parent 2772a8c commit 0a8a2ba

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,15 +925,21 @@
925925
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs">
926926
<Link>Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs</Link>
927927
</Compile>
928+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs">
929+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs</Link>
930+
</Compile>
931+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.Unix.cs">
932+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCngProvider.netcore.Unix.cs</Link>
933+
</Compile>
934+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.Unix.cs">
935+
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCspProvider.netcore.Unix.cs</Link>
936+
</Compile>
928937
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
929938
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
930939
</Compile>
931940

932941
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
933942
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
934-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Unix.cs" />
935-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Unix.cs" />
936-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Unix.cs" />
937943
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
938944
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
939945
</ItemGroup>
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET
6+
57
using System;
68

79
namespace Microsoft.Data.SqlClient
810
{
9-
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCertificateStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionCertificateStoreProvider"]/SqlColumnEncryptionCertificateStoreProvider/*' />
11+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCertificateStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionCertificateStoreProvider"]/SqlColumnEncryptionCertificateStoreProvider/*' />
1012
public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKeyStoreProvider
1113
{
1214
/// <summary>
@@ -66,3 +68,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
6668
}
6769
}
6870
}
71+
72+
#endif
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET
6+
57
using System;
68

79
namespace Microsoft.Data.SqlClient
@@ -76,3 +78,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
7678
}
7779
}
7880
}
81+
82+
#endif
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET
6+
57
using System;
68

79
namespace Microsoft.Data.SqlClient
@@ -78,3 +80,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
7880
}
7981
}
8082
}
83+
84+
#endif

0 commit comments

Comments
 (0)