Skip to content

Commit 516b402

Browse files
authored
Merge | SqlClientPermission (#3262)
* Separate SqlClientPermissionAttribute class from SqlClientPermission.cs * Move SqlClientPermission to common project * Move NameValuePermission to be a subclass of SqlClientPermission (it's only used there) * Reorganize SqlClientPermision class * It's always bad practice to write your own escape/unescape logic for xml * Reintroduce serializable attribute and generic IComparable * What.
1 parent 0a8a2ba commit 516b402

File tree

5 files changed

+739
-727
lines changed

5 files changed

+739
-727
lines changed

src/Microsoft.Data.SqlClient/netfx/src/Common/Microsoft/Data/Common/NameValuePermission.cs

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

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,12 @@
651651
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
652652
<Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
653653
</Compile>
654+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs">
655+
<Link>Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs</Link>
656+
</Compile>
657+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs">
658+
<Link>Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs</Link>
659+
</Compile>
654660
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
655661
<Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
656662
</Compile>
@@ -890,7 +896,6 @@
890896
</Compile>
891897
</ItemGroup>
892898
<ItemGroup>
893-
<Compile Include="Common\Microsoft\Data\Common\NameValuePermission.cs" />
894899
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
895900
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
896901
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
@@ -905,7 +910,6 @@
905910
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
906911
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.netfx.cs" />
907912
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
908-
<Compile Include="Microsoft\Data\SqlClient\SqlClientPermission.cs" />
909913
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
910914
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
911915
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />

0 commit comments

Comments
 (0)