Merge pull request #2557 from dotnet/nmirror

Merge nmirror to master

2 files changed, 31 insertions, 0 deletions

diff --git a/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/Assemblies/RuntimeAssembly.cs b/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/Assemblies/RuntimeAssembly.cs
index 40991424c..09b31f967 100644
--- a/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/Assemblies/RuntimeAssembly.cs
+++ b/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/Assemblies/RuntimeAssembly.cs
@@ -19,6 +19,7 @@ using Internal.Reflection.Core;
 using Internal.Reflection.Core.Execution;
 
 using Internal.Reflection.Tracing;
+using System.Security;
 
 namespace System.Reflection.Runtime.Assemblies
 {
@@ -181,6 +182,35 @@ namespace System.Reflection.Runtime.Assemblies
             }
         }
 
+        public sealed override bool GlobalAssemblyCache
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public sealed override long HostContext
+        {
+            get
+            {
+                return 0;
+            }
+        }
+
+        public sealed override Module LoadModule(string moduleName, byte[] rawModule, byte[] rawSymbolStore)
+        {
+            throw new PlatformNotSupportedException();
+        }
+
+        public sealed override SecurityRuleSet SecurityRuleSet
+        {
+            get
+            {
+                return SecurityRuleSet.None;
+            }
+        }
+
         private volatile CaseSensitiveTypeCache _lazyCaseSensitiveTypeTable;
 
         private sealed class CaseSensitiveTypeCache : ConcurrentUnifier<string, RuntimeTypeInfo>
diff --git a/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/General/NonOverriddenApis.cs b/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/General/NonOverriddenApis.cs
index a747fab31..fb38ee000 100644
--- a/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/General/NonOverriddenApis.cs
+++ b/src/System.Private.Reflection.Core/src/System/Reflection/Runtime/General/NonOverriddenApis.cs
@@ -36,6 +36,7 @@ namespace System.Reflection.Runtime.Assemblies
         public sealed override Type GetType(string name, bool throwOnError) => base.GetType(name, throwOnError);
         public sealed override bool IsDynamic => base.IsDynamic;
         public sealed override string ToString() => base.ToString();
+        public sealed override string EscapedCodeBase => base.EscapedCodeBase;
 #endif //DEBUG
     }
 }