Merge master into dev/eng

3 files changed, 0 insertions, 40 deletions

diff --git a/src/System.CodeDom/ref/System.CodeDom.cs b/src/System.CodeDom/ref/System.CodeDom.cs
index 360cb0c587..705b3e78a9 100644
--- a/src/System.CodeDom/ref/System.CodeDom.cs
+++ b/src/System.CodeDom/ref/System.CodeDom.cs
@@ -1105,8 +1105,6 @@ namespace System.CodeDom.Compiler
         public string CompilerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string CoreAssemblyFileName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public System.Collections.Specialized.StringCollection EmbeddedResources { get { throw null; } }
-        [System.ObsoleteAttribute("CAS policy is obsolete and will be removed in a future release of the .NET Framework. Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
-        public System.Security.Policy.Evidence Evidence { get { throw null; } set { } }
         public bool GenerateExecutable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public bool GenerateInMemory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public bool IncludeDebugInformation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
@@ -1125,8 +1123,6 @@ namespace System.CodeDom.Compiler
         public CompilerResults(System.CodeDom.Compiler.TempFileCollection tempFiles) { }
         public System.Reflection.Assembly CompiledAssembly { get { throw null; } set { } }
         public System.CodeDom.Compiler.CompilerErrorCollection Errors { get { throw null; } }
-        [System.ObsoleteAttribute("CAS policy is obsolete and will be removed in a future release of the .NET Framework. Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
-        public System.Security.Policy.Evidence Evidence { get { throw null; } set { } }
         public int NativeCompilerReturnValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public System.Collections.Specialized.StringCollection Output { get { throw null; } }
         public string PathToAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
diff --git a/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerParameters.cs b/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerParameters.cs
index 55f6365e76..38bb90b2a0 100644
--- a/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerParameters.cs
+++ b/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerParameters.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Specialized;
-using System.Security.Policy;
 
 namespace System.CodeDom.Compiler
 {
@@ -16,8 +15,6 @@ namespace System.CodeDom.Compiler
 
         [NonSerialized]
         private TempFileCollection _tempFiles;
-        [NonSerialized]
-        private Evidence _evidence;
 
         public CompilerParameters() : this(null, null)
         {
@@ -90,21 +87,5 @@ namespace System.CodeDom.Compiler
         public StringCollection LinkedResources => _linkedResources;
 
         public IntPtr UserToken { get; set; }
-
-        [Obsolete("CAS policy is obsolete and will be removed in a future release of the .NET Framework."
-                + " Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
-        public Evidence Evidence
-        {
-            get
-            {
-                Evidence e = null;
-                if (_evidence != null)
-                {
-                    e = _evidence.Clone();
-                }
-                return e;
-            }
-            set { _evidence = value?.Clone(); }
-        }
     }
 }
diff --git a/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerResults.cs b/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerResults.cs
index a126062f26..46f12a435a 100644
--- a/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerResults.cs
+++ b/src/System.CodeDom/src/System/CodeDom/Compiler/CompilerResults.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Specialized;
 using System.Reflection;
-using System.Security.Policy;
 
 namespace System.CodeDom.Compiler
 {
@@ -14,7 +13,6 @@ namespace System.CodeDom.Compiler
         private readonly CompilerErrorCollection _errors = new CompilerErrorCollection();
         private readonly StringCollection _output = new StringCollection();
         private Assembly _compiledAssembly;
-        private Evidence _evidence;
 
         public CompilerResults(TempFileCollection tempFiles)
         {
@@ -23,21 +21,6 @@ namespace System.CodeDom.Compiler
 
         public TempFileCollection TempFiles { get; set; }
 
-        [Obsolete("CAS policy is obsolete and will be removed in a future release of the .NET Framework. Please see http://go2.microsoft.com/fwlink/?LinkId=131738 for more information.")]
-        public Evidence Evidence
-        {
-            get
-            {
-                Evidence e = null;
-                if (_evidence != null)
-                {
-                    e = _evidence.Clone();
-                }
-                return e;
-            }
-            set { _evidence = value?.Clone(); }
-        }
-
         public Assembly CompiledAssembly
         {
             get