Make System.Security.Permissions dependency private

ericstj · Nov 2, 2022 · 3426ddd · 3426ddd
1 parent d1c2960
commit 3426ddd
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 66 deletions.
diff --git a/...ystem.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs b/...ystem.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs
@@ -1383,9 +1383,8 @@ public virtual void DeleteStream(string streamName) { }
         public virtual string GetConfigPathFromLocationSubPath(string configPath, string locationSubPath) { throw null; }
         public virtual System.Type GetConfigType(string typeName, bool throwOnError) { throw null; }
         public virtual string GetConfigTypeName(System.Type t) { throw null; }
-#pragma warning disable SYSLIB0003
+        [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         public virtual void GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord configRecord, out System.Security.PermissionSet permissionSet, out bool isHostReady) { throw null; }
-#pragma warning restore SYSLIB0003
         public virtual string GetStreamName(string configPath) { throw null; }
         public virtual string GetStreamNameForConfigSource(string streamName, string configSource) { throw null; }
         public virtual object GetStreamVersion(string streamName) { throw null; }
@@ -1473,9 +1472,8 @@ public partial interface IInternalConfigHost
         string GetConfigPathFromLocationSubPath(string configPath, string locationSubPath);
         System.Type GetConfigType(string typeName, bool throwOnError);
         string GetConfigTypeName(System.Type t);
-#pragma warning disable SYSLIB0003
+        [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         void GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord configRecord, out System.Security.PermissionSet permissionSet, out bool isHostReady);
-#pragma warning restore SYSLIB0003
         string GetStreamName(string configPath);
         string GetStreamNameForConfigSource(string streamName, string configSource);
         object GetStreamVersion(string streamName);

diff --git a/...m.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/...m.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,7 +14,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="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

diff --git a/...m.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/...m.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -6,6 +6,7 @@
     <!-- opt-out of trimming until it works https://github.com/dotnet/runtime/issues/49062 -->
     <IsTrimmable>false</IsTrimmable>
     <NoWarn>$(NoWarn);CA1847</NoWarn>
+    <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
     <IsPackable>true</IsPackable>
     <PackageDescription>Provides types that support using XML configuration files (app.config). This package exists only to support migrating existing .NET Framework code that already uses System.Configuration. When writing new code, use another configuration system instead, such as Microsoft.Extensions.Configuration.</PackageDescription>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -275,7 +276,7 @@
 
   <!-- Since this package is compatible with .NETStandard, it must also ensure its .NETFramework and .NETCoreApp behavior is compatible with its .NETStandard behavior.-->
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">

diff --git a/...figuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs b/...figuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs
@@ -231,12 +231,11 @@ public virtual void RefreshConfigPaths()
 
         public virtual IDisposable Impersonate() => new DummyDisposable();
 
-#pragma warning disable SYSLIB0003 // Obsolete: CAS
+        [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         public virtual void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady)
         {
             permissionSet = new PermissionSet(null);
             isHostReady = true;
         }
-#pragma warning restore SYSLIB0003 // Obsolete: CAS
     }
 }
diff --git a/...nfiguration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs b/...nfiguration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs
@@ -103,8 +103,7 @@ string EncryptSection(string clearTextXml, ProtectedConfigurationProvider protec
 
         IDisposable Impersonate();
 
-#pragma warning disable SYSLIB0003 // Obsolete: CAS
+        [System.ObsoleteAttribute("Code Access Security is not supported or honored by the runtime.", DiagnosticId = "SYSLIB0003", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
         void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady);
-#pragma warning restore SYSLIB0003 // Obsolete: CAS
     }
 }
diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs b/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() { }

diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/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'">

diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.manual.cs b/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
 {

diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -30,6 +30,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" />
@@ -138,11 +139,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" />
@@ -243,7 +239,7 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">

diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.forwards.cs b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.forwards.cs
@@ -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))]
diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.cs b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.cs
@@ -307,6 +307,57 @@ protected override void OnSet(int index, object oldValue, object newValue) { }
         public void Remove(System.Diagnostics.PerformanceCounterPermissionEntry value) { }
     }
 }
+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}")]
+    [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; }
+    }
+    [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,
+    }
+    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

diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <Nullable>disable</Nullable>
+    <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
+    <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);nullable</NoWarn>
     <IsPackable>true</IsPackable>
@@ -31,7 +32,11 @@
     <Compile Include="System\Diagnostics\PerformanceCounterPermissionAccess.cs" />
     <Compile Include="System\Diagnostics\PerformanceCounterPermissionAttribute.cs" />
     <Compile Include="System\Diagnostics\PerformanceCounterPermissionEntry.cs" />
-    <Compile Include="System\Diagnostics\PerformanceCounterPermissionEntryCollection.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" />

diff --git a/...ryServices/DirectoryServicesPermission.cs → ...ryServices/DirectoryServicesPermission.cs b/...ryServices/DirectoryServicesPermission.cs → ...ryServices/DirectoryServicesPermission.cs
diff --git a/...ices/DirectoryServicesPermissionAccess.cs → ...ices/DirectoryServicesPermissionAccess.cs b/...ices/DirectoryServicesPermissionAccess.cs → ...ices/DirectoryServicesPermissionAccess.cs
diff --git a/...s/DirectoryServicesPermissionAttribute.cs → ...s/DirectoryServicesPermissionAttribute.cs b/...s/DirectoryServicesPermissionAttribute.cs → ...s/DirectoryServicesPermissionAttribute.cs
diff --git a/...vices/DirectoryServicesPermissionEntry.cs → ...vices/DirectoryServicesPermissionEntry.cs b/...vices/DirectoryServicesPermissionEntry.cs → ...vices/DirectoryServicesPermissionEntry.cs
diff --git a/...ctoryServicesPermissionEntryCollection.cs → ...ctoryServicesPermissionEntryCollection.cs b/...ctoryServicesPermissionEntryCollection.cs → ...ctoryServicesPermissionEntryCollection.cs