From 35a4b052794e9b7cc22a31c04eb685028f913734 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Fri, 2 Aug 2019 16:31:06 -0400 Subject: [PATCH] [netcore] Fix comments in ALC to use Mono terminology (mono/mono#15998) Commit migrated from https://github.com/mono/mono/commit/713df6a9c48c2c4da4037b4bbad43244fbcc505f --- .../src/System.Runtime.Loader/AssemblyLoadContext.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mono/netcore/System.Private.CoreLib/src/System.Runtime.Loader/AssemblyLoadContext.cs b/src/mono/netcore/System.Private.CoreLib/src/System.Runtime.Loader/AssemblyLoadContext.cs index 7c1d7a4..b858614 100644 --- a/src/mono/netcore/System.Private.CoreLib/src/System.Runtime.Loader/AssemblyLoadContext.cs +++ b/src/mono/netcore/System.Private.CoreLib/src/System.Runtime.Loader/AssemblyLoadContext.cs @@ -122,16 +122,14 @@ namespace System.Runtime.Loader } // Invoked by Mono to resolve using the Resolving event after - // trying the Load overried and TPA load context without + // trying the Load override and default load context without // success. private static Assembly? MonoResolveUsingResolvingEvent (IntPtr gchALC, string assemblyName) { return ResolveUsingResolvingEvent (gchALC, new AssemblyName (assemblyName)); } - // Invoked by Mono to resolve using the Resolving event after - // trying the Load overried and TPA load context without - // success. + // Invoked by Mono to resolve requests to load satellite assemblies. private static Assembly? MonoResolveUsingResolveSatelliteAssembly (IntPtr gchALC, string assemblyName) { return ResolveSatelliteAssembly (gchALC, new AssemblyName (assemblyName)); -- 2.7.4