From 6782a0c16f9e71aaec866176745083ef4e8d81ac Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:00:46 -0600
Subject: [PATCH 1/8] Remove S.S.Permissions reference from
 S.C.ConfigurationManager

---
 .../ref/System.Configuration.ConfigurationManager.csproj    | 4 ++--
 .../src/System.Configuration.ConfigurationManager.csproj    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
index bd9eab3ba5b119..51806a77f62968 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
@@ -12,8 +12,8 @@
     <Compile Include="System.Configuration.ConfigurationManager.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index dae0fa151a3c71..5ea8b851593f6f 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -272,9 +272,9 @@
     <Compile Include="System\Diagnostics\TraceUtils.cs" />
   </ItemGroup>
 
-  <!-- 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" />
+  <!-- This reference is for the System.Security.PermissionSet class, which is implemented in corelib, so the reference is only necessary for netstandard. -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">

From 2d206c377d9b030a68d421d71f8fe88c772c5ca4 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Fri, 17 Feb 2023 12:16:06 -0600
Subject: [PATCH 2/8] Add suppression for missing S.S.Permissions

---
 .../frameworkSettings/netstandard/settings.targets             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
index 523094ac931dda..8282a1f3e4a4f9 100644
--- a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
+++ b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
@@ -11,6 +11,9 @@
 
     <!-- windows.winmd is not part of the framework -->
     <IgnoredReference Include="Windows" />
+
+    <!-- System.Configuration.ConfigurationManager drops this reference because it is not needed at runtime -->
+    <IgnoredReference Include="System.Security.Permissions" />
   </ItemGroup>
 
   <!-- Include NETStandard assemblies when considering runtime assets for conflict resolution

From 36465bb814b538d0e9a81d3a8525da306d157bc2 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:19:47 -0600
Subject: [PATCH 3/8] Add the appropriate [Obsolete] attributes

---
 .../ref/System.Configuration.ConfigurationManager.cs        | 6 ++----
 .../ref/System.Configuration.ConfigurationManager.csproj    | 1 +
 .../src/System.Configuration.ConfigurationManager.csproj    | 1 +
 .../System/Configuration/Internal/DelegatingConfigHost.cs   | 3 +--
 .../System/Configuration/Internal/IInternalConfigHost.cs    | 3 +--
 .../src/System/Configuration/Internal/InternalConfigHost.cs | 3 +--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs
index 6d21ab559b502d..7ef3558b7f6649 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs
+++ b/src/libraries/System.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/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
index 51806a77f62968..bf3acba3eb09d7 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index 5ea8b851593f6f..7463343674be06 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.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>
     <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
+    <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>
   </PropertyGroup>
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs
index 46e588ce644c2e..5f26c3d9baf64c 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs
+++ b/src/libraries/System.Configuration.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/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs
index b03989bfb87097..835e424d07ff18 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs
+++ b/src/libraries/System.Configuration.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.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs
index 52a7360c506a5a..a70d38737cf33d 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs
@@ -304,12 +304,11 @@ internal static bool StaticIsFile(string streamName)
 
         public IDisposable Impersonate() => new DummyDisposable();
 
-#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 void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady)
         {
             permissionSet = new PermissionSet(null);
             isHostReady = true;
         }
-#pragma warning restore SYSLIB0003
     }
 }

From c90da5b12cdc2d664208596e4f4e28751d6e2b80 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 22 Feb 2023 09:11:41 -0600
Subject: [PATCH 4/8] Update comment

---
 .../testPackages/frameworkSettings/netstandard/settings.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
index 8282a1f3e4a4f9..ce709fb2fb7fc0 100644
--- a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
+++ b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
@@ -12,7 +12,7 @@
     <!-- windows.winmd is not part of the framework -->
     <IgnoredReference Include="Windows" />
 
-    <!-- System.Configuration.ConfigurationManager drops this reference because it is not needed at runtime -->
+    <!-- intentional dangling ref in System.Configuration.ConfigurationManager and System.DirectoryServices -->
     <IgnoredReference Include="System.Security.Permissions" />
   </ItemGroup>
 

From f449cd3a9b6dc05a8c8d79cc0ad44c76af4d2c3d Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:02:06 -0600
Subject: [PATCH 5/8] Add ref to S.S.P for test project

---
 .../tests/System.DirectoryServices.Tests.csproj                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
index 37e3b348cb575c..f994d3e8cb87f8 100644
--- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
+++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
@@ -35,5 +35,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.Security.Permissions" />
   </ItemGroup>
 </Project>

From 79a3ce72d15784592e3d0a574557666d58029732 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:47:42 -0600
Subject: [PATCH 6/8] Revert "Add ref to S.S.P for test project"

This reverts commit f449cd3a9b6dc05a8c8d79cc0ad44c76af4d2c3d.
---
 .../tests/System.DirectoryServices.Tests.csproj                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
index f994d3e8cb87f8..37e3b348cb575c 100644
--- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
+++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
@@ -35,6 +35,5 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Security.Permissions" />
   </ItemGroup>
 </Project>

From fff2a36ebd2a69483af296d630f8e53dec1a8841 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:15:29 -0600
Subject: [PATCH 7/8] Use per-package suppression file for testPackages

---
 .../frameworkSettings/netstandard/settings.targets          | 3 ---
 .../netstandard/settings.targets                            | 6 ++++++
 .../System.Runtime.Caching/netstandard/settings.targets     | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 src/libraries/testPackages/packageSettings/System.Configuration.ConfigurationManager/netstandard/settings.targets
 create mode 100644 src/libraries/testPackages/packageSettings/System.Runtime.Caching/netstandard/settings.targets

diff --git a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
index ce709fb2fb7fc0..523094ac931dda 100644
--- a/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
+++ b/src/libraries/testPackages/frameworkSettings/netstandard/settings.targets
@@ -11,9 +11,6 @@
 
     <!-- windows.winmd is not part of the framework -->
     <IgnoredReference Include="Windows" />
-
-    <!-- intentional dangling ref in System.Configuration.ConfigurationManager and System.DirectoryServices -->
-    <IgnoredReference Include="System.Security.Permissions" />
   </ItemGroup>
 
   <!-- Include NETStandard assemblies when considering runtime assets for conflict resolution
diff --git a/src/libraries/testPackages/packageSettings/System.Configuration.ConfigurationManager/netstandard/settings.targets b/src/libraries/testPackages/packageSettings/System.Configuration.ConfigurationManager/netstandard/settings.targets
new file mode 100644
index 00000000000000..2b225059876410
--- /dev/null
+++ b/src/libraries/testPackages/packageSettings/System.Configuration.ConfigurationManager/netstandard/settings.targets
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <!-- intentional dangling ref -->
+    <IgnoredReference Include="System.Security.Permissions" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/testPackages/packageSettings/System.Runtime.Caching/netstandard/settings.targets b/src/libraries/testPackages/packageSettings/System.Runtime.Caching/netstandard/settings.targets
new file mode 100644
index 00000000000000..9a2d7cd0482f45
--- /dev/null
+++ b/src/libraries/testPackages/packageSettings/System.Runtime.Caching/netstandard/settings.targets
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <!-- intentional dangling ref in System.Configuration.ConfigurationManager -->
+    <IgnoredReference Include="System.Security.Permissions" />
+  </ItemGroup>
+</Project>

From 25506a95e476fb0fb5d9d2ea9db9020066551373 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:45:32 -0600
Subject: [PATCH 8/8] Add same comment to ref file

---
 .../ref/System.Configuration.ConfigurationManager.csproj         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
index bf3acba3eb09d7..cdd04d9ab8a1dd 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
@@ -13,6 +13,7 @@
     <Compile Include="System.Configuration.ConfigurationManager.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
   </ItemGroup>
 
+  <!-- This reference is for the System.Security.PermissionSet class, which is implemented in corelib, so the reference is only necessary for netstandard. -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" PrivateAssets="all" />
   </ItemGroup>