Fix AppDomain issues (dotnet/coreclr#25019)

Populate AppDomain.CurrentDomain when invoking events Make AppDomain method implemented in AssemblyLoadContext internal Commit migrated from dotnet/coreclr@5d94217
hgdiaz · Jun 8, 2019 · 5f3ed6e · 5f3ed6e
1 parent ecf84a9
commit 5f3ed6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/...ivate.CoreLib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs b/...ivate.CoreLib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs
@@ -19,7 +19,7 @@ internal static class WindowsRuntimeMetadata
                 {
                     DesignerNamespaceResolveEventArgs eventArgs = new DesignerNamespaceResolveEventArgs(namespaceName);
 
-                    handler(null /* AppDomain */, eventArgs);
+                    handler(AppDomain.CurrentDomain, eventArgs);
 
                     Collection<string> assemblyFilesCollection = eventArgs.ResolvedAssemblyFiles;
                     if (assemblyFilesCollection.Count > 0)

diff --git a/...reclr/src/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs b/...reclr/src/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.CoreCLR.cs
@@ -31,7 +31,7 @@ public partial class AssemblyLoadContext
         private static extern void LoadFromPath(IntPtr ptrNativeAssemblyLoadContext, string? ilPath, string? niPath, ObjectHandleOnStack retAssembly);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        public static extern Assembly[] GetLoadedAssemblies();
+        internal static extern Assembly[] GetLoadedAssemblies();
 
         private Assembly InternalLoadFromPath(string? assemblyPath, string? nativeImagePath)
         {
@@ -298,7 +298,7 @@ public void StartProfileOptimization(string profile)
         // This method is called by the VM.
         private static void OnAssemblyLoad(RuntimeAssembly assembly)
         {
-            AssemblyLoad?.Invoke(null /* AppDomain */, new AssemblyLoadEventArgs(assembly));
+            AssemblyLoad?.Invoke(AppDomain.CurrentDomain, new AssemblyLoadEventArgs(assembly));
         }
 
         // This method is called by the VM.
@@ -328,7 +328,7 @@ private static void OnAssemblyLoad(RuntimeAssembly assembly)
 
             foreach (ResolveEventHandler handler in eventHandler.GetInvocationList())
             {
-                Assembly? asm = handler(null /* AppDomain */, args);
+                Assembly? asm = handler(AppDomain.CurrentDomain, args);
                 RuntimeAssembly? ret = GetRuntimeAssembly(asm);
                 if (ret != null)
                     return ret;

diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.cs
@@ -74,7 +74,7 @@ internal static void OnProcessExit()
         {
             AssemblyLoadContext.OnProcessExit();
 
-            ProcessExit?.Invoke(null /* AppDomain */, EventArgs.Empty);
+            ProcessExit?.Invoke(AppDomain.CurrentDomain, EventArgs.Empty);
         }
 
         /// <summary>

diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs
@@ -210,18 +210,20 @@ public event Action<AssemblyLoadContext> Unloading
             }
         }
 
+#region AppDomainEvents
         // Occurs when an Assembly is loaded
-        public static event AssemblyLoadEventHandler AssemblyLoad;
+        internal static event AssemblyLoadEventHandler AssemblyLoad;
 
         // Occurs when resolution of type fails
-        public static event ResolveEventHandler TypeResolve;
+        internal static event ResolveEventHandler TypeResolve;
 
         // Occurs when resolution of resource fails
-        public static event ResolveEventHandler ResourceResolve;
+        internal static event ResolveEventHandler ResourceResolve;
 
         // Occurs when resolution of assembly fails
         // This event is fired after resolve events of AssemblyLoadContext fails
-        public static event ResolveEventHandler AssemblyResolve;
+        internal static event ResolveEventHandler AssemblyResolve;
+#endregion
 
         public static AssemblyLoadContext Default => DefaultAssemblyLoadContext.s_loadContext;