diff options
author | Jan Kotas <jkotas@microsoft.com> | 2017-01-20 21:52:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-20 21:52:56 +0300 |
commit | d819c5eb11e066c1b608c1690ff1daad3f29c1ed (patch) | |
tree | f3404f1421c810b3a3ec57bc06d7073f58b17008 | |
parent | 60b10cefe0c8bafe896d82959e4d95462818e4d3 (diff) | |
parent | 7648852bc304e7e8d862b49696d5eca048720892 (diff) |
Merge pull request #2552 from dotnet-bot/from-tfs
Merge changes from TFS
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 } } |