Skip to content

Merge | SqlColumnEncryption*.Unix #3305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benrr101 merged 3 commits into from
May 6, 2025
Merged

Merge | SqlColumnEncryption*.Unix #3305

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dac3199
Moving SqlColumnEncryption*.Unix.cs files to common project
benrr101 Apr 25, 2025
9a40848
Fixing xml doc path
benrr101 Apr 30, 2025
f2737d9
Merge branch 'main' into dev/russellben/merge/sqlcolumnencryption-unix
benrr101 May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,12 +925,18 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs">
<Link>Microsoft\Data\SqlClient\SessionHandle.netcore.Unix.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs">
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCertificateStoreProvider.netcore.Unix.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.Unix.cs">
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCngProvider.netcore.Unix.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.Unix.cs">
<Link>Microsoft\Data\SqlClinet\SqlColumnEncryptionCspProvider.netcore.Unix.cs</Link>
</Compile>

<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlFileStream.Unsupported.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
Expand Down
4 changes: 4 additions & 0 deletions ...ncryptionCertificateStoreProvider.Unix.cs → ...nCertificateStoreProvider.netcore.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 NET

using System;

namespace Microsoft.Data.SqlClient
Expand Down Expand Up @@ -66,3 +68,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
}
}
}

#endif
4 changes: 4 additions & 0 deletions ...nt/SqlColumnEncryptionCngProvider.Unix.cs → ...lumnEncryptionCngProvider.netcore.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 NET

using System;

namespace Microsoft.Data.SqlClient
Expand Down Expand Up @@ -76,3 +78,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
}
}
}

#endif
4 changes: 4 additions & 0 deletions ...nt/SqlColumnEncryptionCspProvider.Unix.cs → ...lumnEncryptionCspProvider.netcore.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 NET

using System;

namespace Microsoft.Data.SqlClient
Expand Down Expand Up @@ -78,3 +80,5 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
}
}
}

#endif
Loading