Remove S.S.Permissions reference from S.DirectoryServices

src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs

@@ -262,54 +262,6 @@ public DirectoryServicesCOMException(string? message, System.Exception? inner) {
         public string? ExtendedErrorMessage { get { throw null; } }
         public override void GetObjectData(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { }
     }
-    [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) { }
-    }
     public partial class DirectorySynchronization
     {
         public DirectorySynchronization() { }

src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/libraries/System.DirectoryServices/ref/System.DirectoryServices.manual.cs

@@ -5,6 +5,13 @@
 // ------------------------------------------------------------------------------
 
 using System.DirectoryServices.Design;
+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))]
 
 namespace System.DirectoryServices
 {

src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
-    <NoWarn>$(NoWarn);IDE0059;IDE0060;CA1822</NoWarn>
+    <NoWarn>$(NoWarn);IDE0059;IDE0060;CA1822;CP0001</NoWarn>
     <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
     <IsPackable>true</IsPackable>
     <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
@@ -136,11 +136,6 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
     <Compile Include="System\DirectoryServices\ActiveDirectory\UnsafeNativeMethods.cs" />
     <Compile Include="System\DirectoryServices\ActiveDirectory\Utils.cs" />
     <Compile Include="System\DirectoryServices\ActiveDirectory\WellKnownDN.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="Interop\AdsOptions.cs" />
     <Compile Include="Interop\AdsPropertyOperation.cs" />
     <Compile Include="Interop\AdsSearchColumn.cs" />
@@ -241,7 +236,9 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
+    <!-- Use of 'PrivateAssets=all' removes the package reference to S.S.P since S.S.P has references to other packages that are not desired.
+    S.S.P only contains DirectoryServices obsolete types including DirectoryServicesPermission.-->
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">

src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- SYSLIB0003: CAS is obsolete, but we still have tests referencing it -->
     <NoWarn>$(NoWarn);SYSLIB0003</NoWarn>
@@ -32,8 +32,10 @@
     <Compile Include="System\DirectoryServices\DirectoryServicesTests.Windows.cs" />
     <Compile Include="System\DirectoryServices\ActiveDirectoryComInterop.cs" />
     <ProjectReference Include="..\src\System.DirectoryServices.csproj" />
+    <ProjectReference Include="..\..\System.Security.Permissions\src\System.Security.Permissions.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System.DirectoryServices" />
+    <ProjectReference Include="..\..\System.Security.Permissions\src\System.Security.Permissions.csproj" />
   </ItemGroup>
 </Project>

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

@@ -307,6 +307,61 @@ protected override void OnSet(int index, object oldValue, object newValue) { }
         public void Remove(System.Diagnostics.PerformanceCounterPermissionEntry value) { }
     }
 }
+namespace System.DirectoryServices
+{
+#if NETCOREAPP
+    [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+#endif    
+    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,
+    }
+#if NETCOREAPP
+    [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+#endif    
+    [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) { }
+    }
+}
 namespace System.Drawing.Printing
 {
 #if NETCOREAPP

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

@@ -3,7 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <Nullable>disable</Nullable>
-    <NoWarn>$(NoWarn);nullable</NoWarn>
+    <NoWarn>$(NoWarn);nullable;CP0001</NoWarn>
     <IsPackable>true</IsPackable>
     <PackageDescription>Provides types supporting Code Access Security (CAS).</PackageDescription>
   </PropertyGroup>
@@ -32,6 +32,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" />

src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryServicesPermission.cs → src/libraries/System.Security.Permissions/src/System/DirectoryServices/DirectoryServicesPermission.cs

@@ -5,7 +5,9 @@
 
 namespace System.DirectoryServices
 {
+#if NETCOREAPP
     [Obsolete(Obsoletions.CodeAccessSecurityMessage, DiagnosticId = Obsoletions.CodeAccessSecurityDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
+#endif
     public sealed class DirectoryServicesPermission : ResourcePermissionBase
     {
         public DirectoryServicesPermission() { }

src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryServicesPermissionAttribute.cs → src/libraries/System.Security.Permissions/src/System/DirectoryServices/DirectoryServicesPermissionAttribute.cs

@@ -6,7 +6,9 @@
 
 namespace System.DirectoryServices
 {
+#if NETCOREAPP
     [Obsolete(Obsoletions.CodeAccessSecurityMessage, DiagnosticId = Obsoletions.CodeAccessSecurityDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
+#endif
     [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct |
         AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Event,
         AllowMultiple = true, Inherited = false)]

src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj

@@ -27,6 +27,7 @@
     <Compile Include="XamlLoadPermissionTests.cs"/>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\src\System.Security.Permissions.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" />
   </ItemGroup>
 </Project>

src/libraries/testPackages/packageSettings/System.DirectoryServices/settings.targets

@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <!-- intentional dangling ref -->
+    <IgnoredReference Include="System.Security.Permissions" />
+  </ItemGroup>
+</Project>