Remove CAS attributes (#8012)

gewarren · web-flow · commit 91a82258a06b · 2022-04-29T08:50:10.000-07:00
diff --git a/snippets/csharp/System.Runtime.Hosting/ActivationArguments/Overview/Project.csproj b/snippets/csharp/System.Runtime.Hosting/ActivationArguments/Overview/Project.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net4.8</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/snippets/csharp/System.Runtime.Hosting/ActivationArguments/Overview/program.cs b/snippets/csharp/System.Runtime.Hosting/ActivationArguments/Overview/program.cs
@@ -5,14 +5,12 @@
 using System.Security.Policy;
 using System.Reflection;
 using System.Security;
-using System.Security.Permissions;
 using System.Runtime.Hosting;
 
 namespace ActivationContextSample
 {
     public class Program : MarshalByRefObject
     {
-        [SecurityPermission(SecurityAction.LinkDemand, ControlDomainPolicy=true)]
         public static void Main(string[] args)
         {
             //<Snippet2>
@@ -35,7 +33,7 @@ public static void Main(string[] args)
             //</Snippet4>
             Console.Read();
         }
-	[SecurityPermission(SecurityAction.LinkDemand, ControlDomainPolicy=true)]
+	
         public void Run()
         {
             Main(new string[] { });
diff --git a/snippets/csharp/System.Runtime.InteropServices/GCHandle/Overview/Project.csproj b/snippets/csharp/System.Runtime.InteropServices/GCHandle/Overview/Project.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+</Project>
diff --git a/snippets/csharp/System.Runtime.InteropServices/GCHandle/Overview/sample.cs b/snippets/csharp/System.Runtime.InteropServices/GCHandle/Overview/sample.cs
@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
-using System.Security.Permissions;
 
 public delegate bool CallBack(int handle, IntPtr param);
 
@@ -24,7 +23,6 @@ public static void Main()
         Run();
     }
 
-    [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
     public static void Run()
     {
         TextWriter tw = Console.Out;
diff --git a/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/app.config b/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/program.cs b/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/program.cs
@@ -3,16 +3,14 @@
 using System.Runtime.InteropServices;
 using System.IO;
 using System.ComponentModel;
-using System.Security.Permissions;
 using System.Security;
 using System.Threading;
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.ConstrainedExecution;
+using System.Security.Permissions;
 
 namespace SafeHandleDemo
 {
-    [SecurityPermission(SecurityAction.InheritanceDemand, UnmanagedCode = true)]
-    [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
     internal class MySafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         // Create a SafeHandle, informing the base class
@@ -125,7 +123,6 @@ public void Dispose()  // Follow the Dispose pattern - public nonvirtual.
         // if it hasn't already been disposed.
         // However, there may be a need for a subclass to
         // introduce a finalizer, so Dispose is properly implemented here.
-        [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
         protected virtual void Dispose(bool disposing)
         {
             // Note there are three interesting states here:
@@ -142,7 +139,6 @@ protected virtual void Dispose(bool disposing)
             // SafeHandle records the fact that we've called Dispose.
         }
 
-        [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]
         public byte[] ReadContents(int length)
         {
             if (_handle.IsInvalid)  // Is the handle disposed?
diff --git a/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/safehandle.csproj b/snippets/csharp/System.Runtime.InteropServices/SafeHandle/Overview/safehandle.csproj
@@ -1,4 +1,4 @@
-﻿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+﻿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SafeHandle</RootNamespace>
     <AssemblyName>SafeHandle</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -19,6 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +36,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -38,6 +47,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/snippets/csharp/System.Runtime.Serialization/FormatterServices/CheckTypeSecurity/FormatterServices.cs b/snippets/csharp/System.Runtime.Serialization/FormatterServices/CheckTypeSecurity/FormatterServices.cs
@@ -7,7 +7,6 @@
 using System.Runtime.Serialization.Formatters;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Reflection;
-using System.Security.Permissions;
 
 // Person is a serializable base class.
 [Serializable]
@@ -55,7 +54,6 @@ public Manager() : base("Employee")
     }
 
     //<snippet2>
-    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
     public void GetObjectData(SerializationInfo info, StreamingContext context)
     {
 
@@ -96,10 +94,8 @@ private void DisplaySerializationInfo(SerializationInfo info)
     }
     //</snippet3>
 
-    [SecurityPermissionAttribute(SecurityAction.Demand, Flags=SecurityPermissionFlag.SerializationFormatter)]
     protected Manager(SerializationInfo info, StreamingContext context) : base(null)
     {
-
         // Get the set of serializable members for the class and base classes.
         Type thisType = this.GetType();
         MemberInfo[] mi = FormatterServices.GetSerializableMembers(thisType, context);
@@ -160,4 +156,4 @@ public static void Run()
 //  Name=Employee+title, ObjectType=System.String, Value=Employee
 //  Name=Person+title, ObjectType=System.String, Value=Person
 //  Manager -> Employee -> Person
-//</snippet1>
+//</snippet1>
diff --git a/snippets/csharp/System.Runtime.Serialization/FormatterServices/GetObjectData/Populate.cs b/snippets/csharp/System.Runtime.Serialization/FormatterServices/GetObjectData/Populate.cs
@@ -4,9 +4,7 @@
 using System.Runtime.Serialization;
 using System.IO;
 using System.Reflection;
-using System.Security.Permissions;
 
-[assembly: SecurityPermission(SecurityAction.RequestMinimum)]
 namespace Examples
 {
     // The SerializableAttribute specifies that instances of the class
@@ -25,7 +23,6 @@ public Book(string newTitle, string newAuthor)
         }
     }
 
-    [SecurityPermission(SecurityAction.Demand)]
     public sealed class Test
     {
         public static void Main()
diff --git a/snippets/csharp/System.Runtime.Serialization/IObjectReference/Overview/Project.csproj b/snippets/csharp/System.Runtime.Serialization/IObjectReference/Overview/Project.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net4.8</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/snippets/csharp/System.Runtime.Serialization/IObjectReference/Overview/iobjectreference.cs b/snippets/csharp/System.Runtime.Serialization/IObjectReference/Overview/iobjectreference.cs
@@ -5,13 +5,9 @@
 using System.Collections;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
-using System.Security.Permissions;
 
 // There should be only one instance of this type per AppDomain.
 [Serializable]
-[PermissionSet(SecurityAction.Demand, Name="FullTrust")]
-[AspNetHostingPermission(SecurityAction.LinkDemand,
-    Level=AspNetHostingPermissionLevel.Minimal)]
 public sealed class Singleton : ISerializable
 {
     // This is the one instance of this type.
@@ -48,8 +44,6 @@ public static Singleton GetSingleton()
     }
 
     // A method called when serializing a Singleton.
-   [SecurityPermissionAttribute(SecurityAction.LinkDemand,
-   Flags=SecurityPermissionFlag.SerializationFormatter)]
     void ISerializable.GetObjectData(
         SerializationInfo info, StreamingContext context)
     {
@@ -64,19 +58,14 @@ void ISerializable.GetObjectData(
 }
 
 [Serializable]
-[PermissionSet(SecurityAction.Demand, Name="FullTrust")]
-[SecurityPermissionAttribute(SecurityAction.LinkDemand,
-    Flags=SecurityPermissionFlag.SerializationFormatter)]
-[AspNetHostingPermission(SecurityAction.LinkDemand,
-   Level=AspNetHostingPermissionLevel.Minimal)]
 internal sealed class SingletonSerializationHelper : IObjectReference
 {
     // This object has no fields (although it could).
 
     // GetRealObject is called after this object is deserialized.
     public Object GetRealObject(StreamingContext context)
     {
-        // When deserialiing this object, return a reference to
+        // When deserializing this object, return a reference to
         // the Singleton object instead.
         return Singleton.GetSingleton();
     }
diff --git a/snippets/csharp/System.Runtime.Serialization/ISerializable/GetObjectData/ISerializable_GetObjectData.cs b/snippets/csharp/System.Runtime.Serialization/ISerializable/GetObjectData/ISerializable_GetObjectData.cs
@@ -2,11 +2,8 @@
 using System;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
-using System.Security.Permissions;
 using System.IO;
 
-[assembly: SecurityPermission(
-SecurityAction.RequestMinimum, Execution = true)]
 namespace ISerializableExample
 {
     class Program
@@ -64,8 +61,6 @@ protected Person(SerializationInfo info, StreamingContext context)
             ID_value = (int)info.GetValue("AltID", typeof(int));
         }
 
-        [SecurityPermission(SecurityAction.LinkDemand,
-            Flags = SecurityPermissionFlag.SerializationFormatter)]
         public virtual void GetObjectData(
         SerializationInfo info, StreamingContext context)
         {
@@ -88,4 +83,4 @@ public int IdNumber
         }
     }
 }
-//</snippet0>
+//</snippet0>
diff --git a/snippets/csharp/System.Runtime.Serialization/SerializationBinder/Overview/serializationbinder.cs b/snippets/csharp/System.Runtime.Serialization/SerializationBinder/Overview/serializationbinder.cs
@@ -4,7 +4,6 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Reflection;
-using System.Security.Permissions;
 
 class App
 {
@@ -93,18 +92,12 @@ class Version2Type : ISerializable
     public Int32 x;
     public String name;
 
-    // The security attribute demands that code that calls
-    // this method have permission to perform serialization.
-    [SecurityPermissionAttribute(SecurityAction.Demand,SerializationFormatter=true)]
     void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
     {
         info.AddValue("x", x);
         info.AddValue("name", name);
     }
 
-    // The security attribute demands that code that calls
-    // this method have permission to perform serialization.
-    [SecurityPermissionAttribute(SecurityAction.Demand,SerializationFormatter=true)]
     private Version2Type(SerializationInfo info, StreamingContext context)
     {
         x = info.GetInt32("x");
@@ -152,4 +145,4 @@ public override Type BindToType(string assemblyName, string typeName)
         return typeToDeserialize;
     }
 }
-//</snippet1>
+//</snippet1>
diff --git a/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/Project.csproj b/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/Project.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net4.8</TargetFrameworks>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+  </PropertyGroup>
+</Project>
diff --git a/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/makefile b/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/makefile
diff --git a/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/streamingcontext.cs b/snippets/csharp/System.Runtime.Serialization/SerializationException/Overview/streamingcontext.cs
@@ -6,10 +6,7 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
-using System.Security.Permissions;
 
-[assembly: SecurityPermission(
-SecurityAction.RequestMinimum, Execution = true)]
 // This class includes several Win32 interop definitions.
 internal class Win32
 {
@@ -114,9 +111,6 @@ private static Boolean AnyFlagsSet(Int32 flags, Int32 flagsToTest)
         return (flags & flagsToTest) != 0;
     }
 
-    // The security attribute demands that code that calls
-    // this method have permission to perform serialization.
-    [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
     void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
     {
         // The context's State member indicates
@@ -155,9 +149,6 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
         }
     }
 
-    // The security attribute demands that code that calls
-    // this method have permission to perform serialization.
-    [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
     private SharedMemory(SerializationInfo info, StreamingContext context)
     {
         // The context's State member indicates
diff --git a/snippets/csharp/System.Runtime.Serialization/SerializationInfo/GetValue/source.cs b/snippets/csharp/System.Runtime.Serialization/SerializationInfo/GetValue/source.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Runtime.Serialization;
-using System.Security.Permissions;
 
 // <Snippet1>
 // A serializable LinkedList example.  For the full LinkedList implementation
@@ -14,7 +13,6 @@ public static void Main() {}
    Node m_tail = null;
 
    // Serializes the object.
-   [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter=true)]
    public void GetObjectData(SerializationInfo info, StreamingContext context){
       // Stores the m_head and m_tail references in the SerializationInfo info.
       info.AddValue("head", m_head, m_head.GetType());
@@ -23,7 +21,6 @@ public void GetObjectData(SerializationInfo info, StreamingContext context){
 
    // Constructor that is called automatically during deserialization.
    // Reconstructs the object from the information in SerializationInfo info
-   [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter=true)]
    private LinkedList(SerializationInfo info, StreamingContext context)
    {
       Node temp = new Node(0);
diff --git a/snippets/csharp/System.Runtime.Serialization/StreamingContext/.ctor/StreamingContext_Context.cs b/snippets/csharp/System.Runtime.Serialization/StreamingContext/.ctor/StreamingContext_Context.cs
@@ -4,7 +4,6 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
 using System.IO;
-using System.Security.Permissions;
 
 namespace StreamingContextExample
 {
@@ -29,8 +28,7 @@ static void Main(string[] args)
         static void SerializeAndDeserialize()
         {
             object myObject = DateTime.Now;
-            // Create a StreamingContext that includes a
-            // a DateTime.
+            // Create a StreamingContext that includes a DateTime.
             StreamingContext sc = new StreamingContext(
                 StreamingContextStates.CrossProcess, myObject);
             BinaryFormatter bf = new BinaryFormatter(null, sc);
@@ -50,7 +48,6 @@ static void SerializeAndDeserialize()
     }
 
     [Serializable]
-    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
     class MyClass : ISerializable
     {
         private int minValue_value;
diff --git a/xml/System.Runtime.InteropServices/Marshal.xml b/xml/System.Runtime.InteropServices/Marshal.xml
diff --git a/xml/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.xml b/xml/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.xml
diff --git a/xml/System.Runtime.Serialization.Formatters/IFieldInfo.xml b/xml/System.Runtime.Serialization.Formatters/IFieldInfo.xml
diff --git a/xml/System.Runtime.Serialization/IObjectReference.xml b/xml/System.Runtime.Serialization/IObjectReference.xml
diff --git a/xml/System.Runtime.Serialization/ISerializable.xml b/xml/System.Runtime.Serialization/ISerializable.xml
diff --git a/xml/System.Runtime.Serialization/ISerializationSurrogate.xml b/xml/System.Runtime.Serialization/ISerializationSurrogate.xml
diff --git a/xml/System.Runtime.Serialization/ISurrogateSelector.xml b/xml/System.Runtime.Serialization/ISurrogateSelector.xml

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,12 @@`
`5`	`5`	`using System.Security.Policy;`
`6`	`6`	`using System.Reflection;`
`7`	`7`	`using System.Security;`
`8`		`-using System.Security.Permissions;`
`9`	`8`	`using System.Runtime.Hosting;`
`10`	`9`
`11`	`10`	`namespace ActivationContextSample`
`12`	`11`	`{`
`13`	`12`	`public class Program : MarshalByRefObject`
`14`	`13`	`{`
`15`		`- [SecurityPermission(SecurityAction.LinkDemand, ControlDomainPolicy=true)]`
`16`	`14`	`public static void Main(string[] args)`
`17`	`15`	`{`
`18`	`16`	`//<Snippet2>`
`@@ -35,7 +33,7 @@ public static void Main(string[] args)`
`35`	`33`	`//</Snippet4>`
`36`	`34`	`Console.Read();`
`37`	`35`	`}`
`38`		`- [SecurityPermission(SecurityAction.LinkDemand, ControlDomainPolicy=true)]`
	`36`	`+`
`39`	`37`	`public void Run()`
`40`	`38`	`{`
`41`	`39`	`Main(new string[] { });`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System.Threading;`
`5`	`5`	`using System.Windows.Forms;`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`		`-using System.Security.Permissions;`
`8`	`7`
`9`	`8`	`public delegate bool CallBack(int handle, IntPtr param);`
`10`	`9`
`@@ -24,7 +23,6 @@ public static void Main()`
`24`	`23`	`Run();`
`25`	`24`	`}`
`26`	`25`
`27`		`- [SecurityPermission(SecurityAction.Demand, UnmanagedCode = true)]`
`28`	`26`	`public static void Run()`
`29`	`27`	`{`
`30`	`28`	`TextWriter tw = Console.Out;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<configuration>`
	`3`	`+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@`
`4`	`4`	`using System.Runtime.Serialization;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Reflection;`
`7`		`-using System.Security.Permissions;`
`8`	`7`
`9`		`-[assembly: SecurityPermission(SecurityAction.RequestMinimum)]`
`10`	`8`	`namespace Examples`
`11`	`9`	`{`
`12`	`10`	`// The SerializableAttribute specifies that instances of the class`
`@@ -25,7 +23,6 @@ public Book(string newTitle, string newAuthor)`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`
`28`		`- [SecurityPermission(SecurityAction.Demand)]`
`29`	`26`	`public sealed class Test`
`30`	`27`	`{`
`31`	`28`	`public static void Main()`