Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2019-03-05 22:07:15 +0300
committerMarek Safar <marek.safar@gmail.com>2019-03-07 02:42:25 +0300
commit72406ff8023f283839a0f5d4012f26d075605a08 (patch)
tree12b1d5cc9aa1670b02042aa4e1e9e2575d237000 /netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs
parenta7963f4e51b14a6a5ee0ec06567ddf7f0f32b8e6 (diff)
Move more Assembly methods to shared partition (dotnet/coreclr#22817)
Signed-off-by: dotnet-bot <anirudhagnihotry098@gmail.com>
Diffstat (limited to 'netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs')
-rw-r--r--netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs14
1 files changed, 13 insertions, 1 deletions
diff --git a/netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs b/netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs
index f13bf5ce9cf..3bf2e3e336b 100644
--- a/netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs
+++ b/netcore/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs
@@ -280,7 +280,7 @@ namespace System.Runtime.Loader
{
VerifyIsAlive();
- return InternalLoadFromStream(arrAssembly, arrSymbols);
+ return InternalLoad(arrAssembly, arrSymbols);
}
}
@@ -367,4 +367,16 @@ namespace System.Runtime.Loader
return null;
}
}
+
+ internal sealed class IndividualAssemblyLoadContext : AssemblyLoadContext
+ {
+ internal IndividualAssemblyLoadContext() : base(false, false)
+ {
+ }
+
+ protected override Assembly Load(AssemblyName assemblyName)
+ {
+ return null;
+ }
+ }
} \ No newline at end of file