Skip to content
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.

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

Remove S.S.Permissions reference from S.DirectoryServices #82453

Merged
merged 15 commits into from
Mar 16, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Add forwards to S.DS csproj impl; forward from S.S.P to S.DS for netfx
  • Loading branch information
steveharter committed Mar 16, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
kaloudis Evan Kaloudis
commit a196e1c4cbb2aa0daadfec439f326ee4b8c27300
Original file line number Diff line number Diff line change
@@ -7,68 +7,11 @@
using System.DirectoryServices.Design;
using System.Runtime.CompilerServices;

#if NETSTANDARD2_0
// These types (DirectoryServicesPermission, etc) were originally implemented in System.DirectoryServices.dll but have been
// moved and type forwarded to System.Security.Permissions in NetCore but not NetFx since they are implemented in NetFx's version
// of System.DirectoryServices.dll.
namespace System.DirectoryServices
{
[System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
public sealed partial class DirectoryServicesPermission : System.Security.Permissions.ResourcePermissionBase
{
public DirectoryServicesPermission() { }
public DirectoryServicesPermission(System.DirectoryServices.DirectoryServicesPermissionAccess permissionAccess, string path) { }
public DirectoryServicesPermission(System.DirectoryServices.DirectoryServicesPermissionEntry[] permissionAccessEntries) { }
public DirectoryServicesPermission(System.Security.Permissions.PermissionState state) { }
public System.DirectoryServices.DirectoryServicesPermissionEntryCollection PermissionEntries { get { throw null; } }
}
[System.FlagsAttribute]
public enum DirectoryServicesPermissionAccess
{
None = 0,
Browse = 2,
Write = 6,
}
[System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
[System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Constructor | System.AttributeTargets.Event | System.AttributeTargets.Method | System.AttributeTargets.Struct, AllowMultiple=true, Inherited=false)]
public partial class DirectoryServicesPermissionAttribute : System.Security.Permissions.CodeAccessSecurityAttribute
{
public DirectoryServicesPermissionAttribute(System.Security.Permissions.SecurityAction action) : base(default(System.Security.Permissions.SecurityAction)) { }
public string Path { get { throw null; } set { } }
public System.DirectoryServices.DirectoryServicesPermissionAccess PermissionAccess { get { throw null; } set { } }
public override System.Security.IPermission CreatePermission() { throw null; }
}
public partial class DirectoryServicesPermissionEntry
{
public DirectoryServicesPermissionEntry(System.DirectoryServices.DirectoryServicesPermissionAccess permissionAccess, string path) { }
public string Path { get { throw null; } }
public System.DirectoryServices.DirectoryServicesPermissionAccess PermissionAccess { get { throw null; } }
}
public partial class DirectoryServicesPermissionEntryCollection : System.Collections.CollectionBase
{
internal DirectoryServicesPermissionEntryCollection() { }
public System.DirectoryServices.DirectoryServicesPermissionEntry this[int index] { get { throw null; } set { } }
public int Add(System.DirectoryServices.DirectoryServicesPermissionEntry value) { throw null; }
public void AddRange(System.DirectoryServices.DirectoryServicesPermissionEntryCollection value) { }
public void AddRange(System.DirectoryServices.DirectoryServicesPermissionEntry[] value) { }
public bool Contains(System.DirectoryServices.DirectoryServicesPermissionEntry value) { throw null; }
public void CopyTo(System.DirectoryServices.DirectoryServicesPermissionEntry[] array, int index) { }
public int IndexOf(System.DirectoryServices.DirectoryServicesPermissionEntry value) { throw null; }
public void Insert(int index, System.DirectoryServices.DirectoryServicesPermissionEntry value) { }
protected override void OnClear() { }
protected override void OnInsert(int index, object value) { }
protected override void OnRemove(int index, object value) { }
protected override void OnSet(int index, object oldValue, object newValue) { }
public void Remove(System.DirectoryServices.DirectoryServicesPermissionEntry value) { }
}
}
#else
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermission))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAccess))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAttribute))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntry))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntryCollection))]
#endif

namespace System.DirectoryServices
{
Original file line number Diff line number Diff line change
@@ -26,184 +26,4 @@
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>ref/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>ref/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>ref/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>ref/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>ref/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>ref/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>ref/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>ref/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>ref/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>ref/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>ref/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>ref/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>ref/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>ref/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>ref/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>lib/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>lib/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>lib/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>lib/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>lib/net8.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net8.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>lib/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>lib/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>lib/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>lib/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>lib/net7.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net7.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermission</Target>
<Left>lib/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAccess</Target>
<Left>lib/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionAttribute</Target>
<Left>lib/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntry</Target>
<Left>lib/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.DirectoryServices.DirectoryServicesPermissionEntryCollection</Target>
<Left>lib/net6.0/System.DirectoryServices.dll</Left>
<Right>runtimes/win/lib/net6.0/System.DirectoryServices.dll</Right>
</Suppression>
</Suppressions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;

[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermission))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAccess))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAttribute))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntry))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntryCollection))]
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
</PropertyGroup>

<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
<Compile Include="System.DirectoryServices.Forwards.cs" />
<Compile Include="System\DirectoryServices\ActiveDirectorySecurity.cs" />
<Compile Include="System\DirectoryServices\AdsVLV.cs" />
<Compile Include="System\DirectoryServices\AuthenticationTypes.cs" />
Original file line number Diff line number Diff line change
@@ -307,7 +307,6 @@ protected override void OnSet(int index, object oldValue, object newValue) { }
public void Remove(System.Diagnostics.PerformanceCounterPermissionEntry value) { }
}
}
#if !NETSTANDARD2_0
namespace System.DirectoryServices
{
[System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
@@ -359,7 +358,6 @@ protected override void OnSet(int index, object oldValue, object newValue) { }
public void Remove(System.DirectoryServices.DirectoryServicesPermissionEntry value) { }
}
}
#endif
namespace System.Drawing.Printing
{
#if NETCOREAPP
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<Nullable>disable</Nullable>
@@ -26,6 +26,7 @@
<Reference Include="System.Net" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
Original file line number Diff line number Diff line change
@@ -6,6 +6,11 @@

using System.Runtime.CompilerServices;

[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermission))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAccess))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionAttribute))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntry))]
[assembly: TypeForwardedTo(typeof(System.DirectoryServices.DirectoryServicesPermissionEntryCollection))]
[assembly: TypeForwardedTo(typeof(System.Security.IPermission))]
[assembly: TypeForwardedTo(typeof(System.Security.ISecurityEncodable))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.CodeAccessSecurityAttribute))]
Original file line number Diff line number Diff line change
@@ -33,6 +33,11 @@
<Compile Include="System\Diagnostics\PerformanceCounterPermissionAttribute.cs" />
<Compile Include="System\Diagnostics\PerformanceCounterPermissionEntry.cs" />
<Compile Include="System\Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermission.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionAccess.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionAttribute.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionEntry.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" />
<Compile Include="System\Drawing\Printing\PrintingPermission.cs" />
<Compile Include="System\Drawing\Printing\PrintingPermissionAttribute.cs" />
<Compile Include="System\Drawing\Printing\PrintingPermissionLevel.cs" />
@@ -184,11 +189,6 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Compile Include="System\DirectoryServices\DirectoryServicesPermission.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionAccess.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionAttribute.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionEntry.cs" />
<Compile Include="System\DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" />
<Compile Include="System\Xaml\Permissions\XamlLoadPermission.cs" />
</ItemGroup>

@@ -212,6 +212,7 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<Reference Include="System.Configuration" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Net" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceProcess" />

This file was deleted.

This file was deleted.