Skip to content

Merge | SqlClientPermission #3262

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 9 commits into from
May 6, 2025
Merged

Merge | SqlClientPermission #3262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
249a967
Separate SqlClientPermissionAttribute class from SqlClientPermission.cs
benrr101 Apr 8, 2025
b0909f3
Move SqlClientPermission to common project
benrr101 Apr 8, 2025
d2faeb7
Move NameValuePermission to be a subclass of SqlClientPermission (it'…
benrr101 Apr 8, 2025
b06a4c9
Reorganize SqlClientPermision class
benrr101 Apr 8, 2025
90a2beb
It's always bad practice to write your own escape/unescape logic for xml
benrr101 Apr 8, 2025
9a792d0
Merge branch 'main' into dev/russellben/merge/sqlclientpermission
benrr101 Apr 15, 2025
83d7846
Reintroduce serializable attribute and generic IComparable
benrr101 Apr 15, 2025
6bee96f
Merge branch 'main' into dev/russellben/merge/sqlclientpermission
benrr101 Apr 16, 2025
beb9014
What.
benrr101 Apr 16, 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
293 changes: 0 additions & 293 deletions src/Microsoft.Data.SqlClient/netfx/src/Common/Microsoft/Data/Common/NameValuePermission.cs
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,12 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
<Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs">
<Link>Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs">
<Link>Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
<Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
</Compile>
Expand Down Expand Up @@ -890,7 +896,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Common\Microsoft\Data\Common\NameValuePermission.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
Expand All @@ -905,7 +910,6 @@
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.netfx.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientPermission.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
Expand Down
Loading
Loading