Skip to content

Remove System.Security.Permissions from S.C.CM. #80347

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.

Sign up for GitHub

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

Closed
AraHaan wants to merge 4 commits into from
Closed

Remove System.Security.Permissions from S.C.CM. #80347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c58013
Remove System.Security.Permissions from S.C.CM.
AraHaan Jan 8, 2023
8b304b9
Update CompatibilitySuppressions.xml
AraHaan Jan 8, 2023
ff3d567
Update src/libraries/System.Configuration.ConfigurationManager/src/Co…
AraHaan Jan 9, 2023
d9268a4
Apply suggestions from code review
AraHaan Feb 14, 2023
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
6 changes: 0 additions & 6 deletions ...ystem.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,9 +1383,6 @@ 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
public virtual void GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord configRecord, out System.Security.PermissionSet permissionSet, out bool isHostReady) { throw null; }
#pragma warning restore SYSLIB0003
Comment on lines -1386 to -1388
Copy link
Copy Markdown
Member

@ViktorHofer ViktorHofer Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes the API from both .NETCoreApp assemblies and the netstandard2.0 assembly. Is the .NETStandard change intentional?

Copy link
Copy Markdown
Member

@ericstj ericstj Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we were exploring the intentional breaking change here. It was discussed as an option here: #64592 (comment)

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; }
Expand Down Expand Up @@ -1473,9 +1470,6 @@ 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
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);
Expand Down
5 changes: 1 addition & 4 deletions ...m.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +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>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" />
<Reference Include="System.Configuration" />
</ItemGroup>
</Project>
54 changes: 54 additions & 0 deletions src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
Comment thread
AraHaan marked this conversation as resolved.
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net462/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net462/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net6.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.IInternalConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/net7.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.get_HasLocalConfig</Target>
Expand All @@ -24,6 +54,30 @@
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net462/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net462/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/net6.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net6.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.Internal.DelegatingConfigHost.GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord, out System.Security.PermissionSet, out bool)</Target>
<Left>lib/net7.0/System.Configuration.ConfigurationManager.dll</Left>
<Right>lib/net7.0/System.Configuration.ConfigurationManager.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Configuration.SettingsAttributeDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
Expand Down
2 changes: 1 addition & 1 deletion ...m.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
</ItemGroup>

<!-- Since this package is compatible with .NETStandard, it must also ensure its .NETFramework and .NETCoreApp behavior is compatible with its .NETStandard behavior.-->
<ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
</ItemGroup>

Expand Down
7 changes: 0 additions & 7 deletions ...figuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,5 @@ public virtual void RefreshConfigPaths()

public virtual IDisposable Impersonate() => new DummyDisposable();

#pragma warning disable SYSLIB0003 // Obsolete: CAS
public virtual void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady)
{
permissionSet = new PermissionSet(null);
isHostReady = true;
}
#pragma warning restore SYSLIB0003 // Obsolete: CAS
}
}
3 changes: 0 additions & 3 deletions ...nfiguration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,5 @@ string EncryptSection(string clearTextXml, ProtectedConfigurationProvider protec

IDisposable Impersonate();

#pragma warning disable SYSLIB0003 // Obsolete: CAS
void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady);
#pragma warning restore SYSLIB0003 // Obsolete: CAS
}
}
7 changes: 0 additions & 7 deletions ...onfiguration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,5 @@ internal static bool StaticIsFile(string streamName)

public IDisposable Impersonate() => new DummyDisposable();

#pragma warning disable SYSLIB0003
public void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady)
{
permissionSet = new PermissionSet(null);
isHostReady = true;
}
#pragma warning restore SYSLIB0003
}
}
4 changes: 2 additions & 2 deletions ...ies/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,12 @@ bool IInternalConfigHost.IsTrustedConfigPath(string configPath)
throw new NotImplementedException();
}

#pragma warning disable SYSLIB0003 // Obsolete: CAS
#if NETFRAMEWORK // Obsolete: CAS (.NET Framework only)
void IInternalConfigHost.GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady)
{
throw new NotImplementedException();
}
#pragma warning restore SYSLIB0003 // Obsolete: CAS
#endif
}
}
}