Switch SYSLIB0003 suppression to pragma rather than project-level

castleproject · Apr 30, 2022 · 9da21a7 · 9da21a7
1 parent 2de4707
commit 9da21a7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -4,13 +4,6 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
-
-		<NoWarn>$(NoWarn);SYSLIB0003</NoWarn>
-		<!--
-			Code Access Security is not available in Core, and obsolete in net5.0+
-			This stops warnings about SYSLIB0003 (https://docs.microsoft.com/en-us/dotnet/fundamentals/syslib-diagnostics/syslib0003)
-			Depending on how these are deprecated in a future dotnet release, may need to wrap relevant code with "#if NET462_OR_GREATER" or similar at some point.
-		-->
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/AttributesToAvoidReplicatingTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/AttributesToAvoidReplicatingTestCase.cs
@@ -67,6 +67,7 @@ public class AttributedClass_Inheritable
 		{
 		}
 
+#pragma warning disable SYSLIB0003
 		[Test]
 		public void SecurityPermissionAttribute_should_not_be_replicated_as_it_is_part_of_cas()
 		{
@@ -90,6 +91,7 @@ public void ReflectionPermissionAttribute_should_not_be_replicated_as_it_is_part
 		public class AttributedClass_ReflectionPermission
 		{
 		}
+#pragma warning restore SYSLIB0003
 
 		private int AttributeCount<TAttribute>(object proxy)
 			where TAttribute : Attribute

diff --git a/src/Castle.Core/Castle.Core.csproj b/src/Castle.Core/Castle.Core.csproj
@@ -4,14 +4,6 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
-
-		<NoWarn>$(NoWarn);SYSLIB0003</NoWarn>
-		<!--
-			Code Access Security is not available in Core, and obsolete in net5.0+
-			This stops warnings about SYSLIB0003 (https://docs.microsoft.com/en-us/dotnet/fundamentals/syslib-diagnostics/syslib0003)
-			Depending on how these are deprecated in a future dotnet release, may need to wrap relevant code with "#if NET462_OR_GREATER" or similar instead.
-		-->
-
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/src/Castle.Core/DynamicProxy/Generators/AttributesToAvoidReplicating.cs b/src/Castle.Core/DynamicProxy/Generators/AttributesToAvoidReplicating.cs
@@ -32,7 +32,9 @@ static AttributesToAvoidReplicating()
 				typeof(System.Runtime.InteropServices.ComImportAttribute),
 				typeof(System.Runtime.InteropServices.MarshalAsAttribute),
 				typeof(System.Runtime.InteropServices.TypeIdentifierAttribute),
+#pragma warning disable SYSLIB0003
 				typeof(System.Security.Permissions.SecurityAttribute),
+#pragma warning restore SYSLIB0003
 			};
 		}