diff options
| author | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2019-07-01 07:15:28 +0200 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-07-01 19:47:11 -0700 |
| commit | e6e170fdec2bb20a76126bd9b40e4a284e6c92f2 (patch) | |
| tree | 1bd3a84bb9ac1dbb18241db22d5267e002a41c42 /src/System.Private.CoreLib | |
| parent | f93906ced7725b5fcd248b10950fbdfef8188c5b (diff) | |
| download | coreclr-e6e170fdec2bb20a76126bd9b40e4a284e6c92f2.tar.gz coreclr-e6e170fdec2bb20a76126bd9b40e4a284e6c92f2.tar.bz2 coreclr-e6e170fdec2bb20a76126bd9b40e4a284e6c92f2.zip | |
Use AssemblyLoadContext from shared partition (dotnet/corert#7570)
We were missing methods that got added for 3.0. The only LoadContext that works is the default one though.
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src/System.Private.CoreLib')
| -rw-r--r-- | src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems | 2 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems index 0e914fcf6b..049a914f76 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems @@ -707,7 +707,7 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector256_1.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\Vector256DebugView_1.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Enums.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Loader\AssemblyLoadContext.cs" Condition="'$(TargetsCoreRT)' != 'true'" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Loader\AssemblyLoadContext.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Loader\LibraryNameVariation.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Remoting\ObjectHandle.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Serialization\DeserializationToken.cs" /> diff --git a/src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs b/src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs index 230667b3a3..1210987fb4 100644 --- a/src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs +++ b/src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs @@ -275,6 +275,7 @@ namespace System.Runtime.Loader return null; } +#if !CORERT [System.Security.DynamicSecurityMethod] // Methods containing StackCrawlMark local var has to be marked DynamicSecurityMethod public Assembly LoadFromAssemblyName(AssemblyName assemblyName) { @@ -285,6 +286,7 @@ namespace System.Runtime.Loader StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller; return Assembly.Load(assemblyName, ref stackMark, this); } +#endif // These methods load assemblies into the current AssemblyLoadContext // They may be used in the implementation of an AssemblyLoadContext derivation |