Skip to content

Commit

Permalink
Expose AssemblyLoadContext Native Library Resolve Event (dotnet/coref…
Browse files Browse the repository at this point in the history 
…x#34668)

Expose System.Runtime.Loader.AssemblyLoadContext.ResolvingUnmanagedDll

API Review: https://github.com/dotnet/corefx/issues/32850

Implementation: https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs#L549

Tests: https://github.com/dotnet/coreclr/blob/master/tests/src/Interop/NativeLibraryResolveEvent/ResolveEventTests.cs

Commit migrated from dotnet/corefx@b7b6969
  • Loading branch information
@swaroop-sridhar @stephentoub
swaroop-sridhar authored and stephentoub committed Jan 18, 2019
1 parent e94200c commit 2047033
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ protected AssemblyLoadContext(bool isCollectible) { }
public void SetProfileOptimizationRoot(string directoryPath) { }
public void StartProfileOptimization(string profile) { }
public event Func<AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly> Resolving;
public event Func<System.Reflection.Assembly, string, System.IntPtr> ResolvingUnmanagedDll;
public event Action<AssemblyLoadContext> Unloading;
}

Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime.Loader/src/ApiCompatBaseline.netcoreappaot.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Compat issues with assembly System.Runtime.Loader:
TypesMustExist : Type 'System.Reflection.Metadata.AssemblyExtensions' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext..ctor(System.Boolean)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_ResolvingUnmanagedDll(System.Func<System.Reflection.Assembly, System.String, System.IntPtr>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Default.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.GetAssemblyName(System.String)' does not exist in the implementation but it does exist in the contract.
Expand All @@ -16,9 +17,10 @@ MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromStr
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDll(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDllFromPath(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_ResolvingUnmanagedDll(System.Func<System.Reflection.Assembly, System.String, System.IntPtr>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.SetProfileOptimizationRoot(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.StartProfileOptimization(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Unload()' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Runtime.Loader.AssemblyDependencyResolver' does not exist in the implementation but it does exist in the contract.
Total Issues: 22
Total Issues: 24
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime.Loader/src/ApiCompatBaseline.uapaot.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Compat issues with assembly System.Runtime.Loader:
TypesMustExist : Type 'System.Reflection.Metadata.AssemblyExtensions' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext..ctor(System.Boolean)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_ResolvingUnmanagedDll(System.Func<System.Reflection.Assembly, System.String, System.IntPtr>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.add_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Default.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.GetAssemblyName(System.String)' does not exist in the implementation but it does exist in the contract.
Expand All @@ -16,9 +17,10 @@ MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadFromStr
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDll(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.LoadUnmanagedDllFromPath(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Resolving(System.Func<System.Runtime.Loader.AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_ResolvingUnmanagedDll(System.Func<System.Reflection.Assembly, System.String, System.IntPtr>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.remove_Unloading(System.Action<System.Runtime.Loader.AssemblyLoadContext>)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.SetProfileOptimizationRoot(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.StartProfileOptimization(System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'System.Runtime.Loader.AssemblyLoadContext.Unload()' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.Runtime.Loader.AssemblyDependencyResolver' does not exist in the implementation but it does exist in the contract.
Total Issues: 22
Total Issues: 24

0 comments on commit 2047033

Please sign in to comment.