Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 2ef483f

Browse files
authored
Add System.Security.Permissions netfx facade and mark some APIs as obsolet to match desktop (#26758)
* Add System.Security.Permissions netfx facade and mark some APIs as obsolet to match desktop * PR Feedback
1 parent ae310ef commit 2ef483f

File tree

12 files changed

+26
-9
lines changed

12 files changed

+26
-9
lines changed

src/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
3030
</Compile>
3131
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
33-
<!-- Work-around issue where we are bin-placing the netstandard ref for System.Security.Permissions for netfx. Issue #24517 -->
34-
<TargetingPackExclusions Include="System.Security.Permissions" />
35-
</ItemGroup>
3632
<ItemGroup>
3733
<EmbeddedResource Include="BinaryFormatterTests.rd.xml" />
3834
</ItemGroup>

src/System.Security.Permissions/ref/Configurations.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<BuildConfigurations>
55
netstandard;
6+
netfx;
67
</BuildConfigurations>
78
</PropertyGroup>
89
</Project>

src/System.Security.Permissions/ref/System.Security.Permissions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,6 +1571,7 @@ protected override void ParseXml(System.Security.SecurityElement e, System.Secur
15711571
public override System.Security.Policy.PolicyStatement Resolve(System.Security.Policy.Evidence evidence) { throw null; }
15721572
public override System.Security.Policy.CodeGroup ResolveMatchingCodeGroups(System.Security.Policy.Evidence evidence) { throw null; }
15731573
}
1574+
[System.ObsoleteAttribute("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
15741575
public sealed partial class FirstMatchCodeGroup : System.Security.Policy.CodeGroup
15751576
{
15761577
public FirstMatchCodeGroup(System.Security.Policy.IMembershipCondition membershipCondition, System.Security.Policy.PolicyStatement policy) : base(default(System.Security.Policy.IMembershipCondition), default(System.Security.Policy.PolicyStatement)) { }
@@ -1661,6 +1662,7 @@ public void ResetConnectAccess() { }
16611662
public override System.Security.Policy.PolicyStatement Resolve(System.Security.Policy.Evidence evidence) { throw null; }
16621663
public override System.Security.Policy.CodeGroup ResolveMatchingCodeGroups(System.Security.Policy.Evidence evidence) { throw null; }
16631664
}
1665+
[System.ObsoleteAttribute("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
16641666
public sealed partial class PermissionRequestEvidence : System.Security.Policy.EvidenceBase
16651667
{
16661668
public PermissionRequestEvidence(System.Security.PermissionSet request, System.Security.PermissionSet optional, System.Security.PermissionSet denied) { }
@@ -1693,6 +1695,7 @@ public void AddFullTrustAssembly(System.Security.Policy.StrongName sn) { }
16931695
public void AddFullTrustAssembly(System.Security.Policy.StrongNameMembershipCondition snMC) { }
16941696
public void AddNamedPermissionSet(System.Security.NamedPermissionSet permSet) { }
16951697
public System.Security.NamedPermissionSet ChangeNamedPermissionSet(string name, System.Security.PermissionSet pSet) { throw null; }
1698+
[System.ObsoleteAttribute("AppDomain policy levels are obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
16961699
public static System.Security.Policy.PolicyLevel CreateAppDomainLevel() { throw null; }
16971700
public void FromXml(System.Security.SecurityElement e) { }
16981701
public System.Security.NamedPermissionSet GetNamedPermissionSet(string name) { throw null; }
@@ -1825,6 +1828,7 @@ public enum TrustManagerUIContext
18251828
Run = 2,
18261829
Upgrade = 1,
18271830
}
1831+
[System.ObsoleteAttribute("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
18281832
public sealed partial class UnionCodeGroup : System.Security.Policy.CodeGroup
18291833
{
18301834
public UnionCodeGroup(System.Security.Policy.IMembershipCondition membershipCondition, System.Security.Policy.PolicyStatement policy) : base(default(System.Security.Policy.IMembershipCondition), default(System.Security.Policy.PolicyStatement)) { }

src/System.Security.Permissions/ref/System.Security.Permissions.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<PropertyGroup>
55
<ProjectGuid>{07CAF142-B259-418E-86EF-C4BD8B50253E}</ProjectGuid>
6-
<!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref -->
7-
<PackageTargetFramework>netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework>
6+
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == netfx">true</IsPartialFacadeAssembly>
87
</PropertyGroup>
98
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
109
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
1112
<ItemGroup>
1213
<Compile Include="System.Security.Permissions.cs" />
13-
<SuppressPackageTargetFrameworkCompatibility Include="$(UAPvNextTFM)" />
1414
</ItemGroup>
15-
<ItemGroup>
15+
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
16+
<Reference Include="mscorlib" />
17+
<Reference Include="System" />
18+
<Reference Include="System.Data" />
19+
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
1621
<ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" />
1722
</ItemGroup>
1823
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

src/System.Security.Permissions/src/System.Security.Permissions.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<RootNamespace>System.Security.Permissions</RootNamespace>
77
<AssemblyName>System.Security.Permissions</AssemblyName>
88
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
9-
<PackageAsRefAndLib Condition="'$(TargetGroup)' == 'netfx'">true</PackageAsRefAndLib>
109
</PropertyGroup>
1110
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
1211
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />

src/System.Security.Permissions/src/System/Security/Policy/FirstMatchCodeGroup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace System.Security.Policy
66
{
7+
[Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
78
public sealed partial class FirstMatchCodeGroup : CodeGroup
89
{
910
public FirstMatchCodeGroup(IMembershipCondition membershipCondition, PolicyStatement policy) : base(default(IMembershipCondition), default(PolicyStatement)) { }

src/System.Security.Permissions/src/System/Security/Policy/PermissionRequestEvidence.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace System.Security.Policy
66
{
7+
[Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
78
public sealed partial class PermissionRequestEvidence : EvidenceBase
89
{
910
public PermissionRequestEvidence(PermissionSet request, PermissionSet optional, PermissionSet denied) { }

src/System.Security.Permissions/src/System/Security/Policy/PolicyLevel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public void AddFullTrustAssembly(StrongName sn) { }
2222
public void AddFullTrustAssembly(StrongNameMembershipCondition snMC) { }
2323
public void AddNamedPermissionSet(NamedPermissionSet permSet) { }
2424
public NamedPermissionSet ChangeNamedPermissionSet(string name, PermissionSet pSet) { return default(NamedPermissionSet); }
25+
[Obsolete("AppDomain policy levels are obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
2526
public static PolicyLevel CreateAppDomainLevel() { return default(PolicyLevel); }
2627
public void FromXml(SecurityElement e) { }
2728
public NamedPermissionSet GetNamedPermissionSet(string name) { return default(NamedPermissionSet); }

src/System.Security.Permissions/src/System/Security/Policy/UnionCodeGroup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace System.Security.Policy
66
{
7+
[Obsolete("This type is obsolete. See http://go.microsoft.com/fwlink/?LinkID=155570 for more information.")]
78
public sealed partial class UnionCodeGroup : CodeGroup
89
{
910
public UnionCodeGroup(IMembershipCondition membershipCondition, PolicyStatement policy) : base(default(IMembershipCondition), default(PolicyStatement)) { }

src/System.Security.Permissions/tests/CodeGroupTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ public static void FileCodeGroupCallMethods()
2323
[Fact]
2424
public static void FirstMatchCodeGroupCallMethods()
2525
{
26+
#pragma warning disable 618
2627
FirstMatchCodeGroup fmcg = new FirstMatchCodeGroup(new GacMembershipCondition(), new PolicyStatement(new PermissionSet(new PermissionState())));
28+
#pragma warning restore 618
2729
CodeGroup cg = fmcg.Copy();
2830
PolicyStatement ps = fmcg.Resolve(new Evidence());
2931
cg = fmcg.ResolveMatchingCodeGroups(new Evidence());
@@ -48,7 +50,9 @@ public static void NetCodeGroupCallMethods()
4850
[Fact]
4951
public static void UnionCodeGroupCallMethods()
5052
{
53+
#pragma warning disable 618
5154
UnionCodeGroup ucg = new UnionCodeGroup(new GacMembershipCondition(), new PolicyStatement(new PermissionSet(new PermissionState())));
55+
#pragma warning restore 618
5256
CodeGroup cg = ucg.Copy();
5357
PolicyStatement ps = ucg.Resolve(new Evidence());
5458
cg = ucg.ResolveMatchingCodeGroups(new Evidence());

0 commit comments

Comments
 (0)