Fix Satellite Assembly loading #24191

sdmaclea · 2019-04-23T16:59:46Z

When loading satellite assemblies, we should probe next to the parent
assembly and load into the same AssemblyLoadContext as the parent
assembly.

Disable fallback probing for satellite assemblies.

Add AssemblyLoadContext.Resolving handler to probe for satellite
assemblies next to parent

Fixes #20979
Fixes #24211

sdmaclea · 2019-04-23T17:05:25Z

I have not yet tested this. I will write tests in corefx, and manually test before merging this.

I wanted to make sure we were OK w/ writing this in managed code.
The FindCaseInsensitiveSatellitePath() code could be simpler if a *.GetDirectories() existed in CoreCLR. It seems these are implemented in CoreFX on top of the same InterOp.

src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.Unix.cs

src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs

src/binder/clrprivbinderassemblyloadcontext.cpp

src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs

When loading satellite assemblies, we should probe next to the parent assembly and load into the same AssemblyLoadContext as the parent assembly. Disable fallback probing for satellite assemblies. Add AssemblyLoadContext.Resolving handler to probe for satellite assemblies next to parent Fixes #20979

Only call ResolveSatelliteAssembly from native when resolving a satellite assembly

Minimize string creation Remove unnecessary if null checks Eliminate corner cases by only allowing one case insensitive matching directory.

ResolveSatelliteAssembly should always be called on the ALC which loaded parentAssembly Simplify code. Add Debug.Assert

sdmaclea · 2019-04-25T15:49:01Z

I added the lower case culture probe since there seems to be consensus that this may be a good long term approach.
This is passing my manual testing. I'll write formal corefx testing...

src/System.Private.CoreLib/shared/System/Runtime/Loader/AssemblyLoadContext.cs

* Fix Satellite Assembly loading When loading satellite assemblies, we should probe next to the parent assembly and load into the same AssemblyLoadContext as the parent assembly. Disable fallback probing for satellite assemblies. Add AssemblyLoadContext.Resolving handler to probe for satellite assemblies next to parent Fixes #20979 * Call ResolveSatelliteAssembly from native Only call ResolveSatelliteAssembly from native when resolving a satellite assembly * PR Feedback Minimize string creation Remove unnecessary if null checks Eliminate corner cases by only allowing one case insensitive matching directory. * ResolveSatelliteAssembly should ... ResolveSatelliteAssembly should always be called on the ALC which loaded parentAssembly Simplify code. Add Debug.Assert * Remove case insensitive culture search * PR Feedback * Fix parentAssembly logic * Fixes from initial testing * Add probe for lower case culture name * PR feedback Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

* Fix Satellite Assembly loading When loading satellite assemblies, we should probe next to the parent assembly and load into the same AssemblyLoadContext as the parent assembly. Disable fallback probing for satellite assemblies. Add AssemblyLoadContext.Resolving handler to probe for satellite assemblies next to parent Fixes mono#20979 * Call ResolveSatelliteAssembly from native Only call ResolveSatelliteAssembly from native when resolving a satellite assembly * PR Feedback Minimize string creation Remove unnecessary if null checks Eliminate corner cases by only allowing one case insensitive matching directory. * ResolveSatelliteAssembly should ... ResolveSatelliteAssembly should always be called on the ALC which loaded parentAssembly Simplify code. Add Debug.Assert * Remove case insensitive culture search * PR Feedback * Fix parentAssembly logic * Fixes from initial testing * Add probe for lower case culture name * PR feedback Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

* Fix Satellite Assembly loading When loading satellite assemblies, we should probe next to the parent assembly and load into the same AssemblyLoadContext as the parent assembly. Disable fallback probing for satellite assemblies. Add AssemblyLoadContext.Resolving handler to probe for satellite assemblies next to parent Fixes #20979 * Call ResolveSatelliteAssembly from native Only call ResolveSatelliteAssembly from native when resolving a satellite assembly * PR Feedback Minimize string creation Remove unnecessary if null checks Eliminate corner cases by only allowing one case insensitive matching directory. * ResolveSatelliteAssembly should ... ResolveSatelliteAssembly should always be called on the ALC which loaded parentAssembly Simplify code. Add Debug.Assert * Remove case insensitive culture search * PR Feedback * Fix parentAssembly logic * Fixes from initial testing * Add probe for lower case culture name * PR feedback Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

Enable SatelliteAssembly tests relying on dotnet/coreclr#24191

* Fix Satellite Assembly loading When loading satellite assemblies, we should probe next to the parent assembly and load into the same AssemblyLoadContext as the parent assembly. Disable fallback probing for satellite assemblies. Add AssemblyLoadContext.Resolving handler to probe for satellite assemblies next to parent Fixes dotnet/coreclr#20979 * Call ResolveSatelliteAssembly from native Only call ResolveSatelliteAssembly from native when resolving a satellite assembly * PR Feedback Minimize string creation Remove unnecessary if null checks Eliminate corner cases by only allowing one case insensitive matching directory. * ResolveSatelliteAssembly should ... ResolveSatelliteAssembly should always be called on the ALC which loaded parentAssembly Simplify code. Add Debug.Assert * Remove case insensitive culture search * PR Feedback * Fix parentAssembly logic * Fixes from initial testing * Add probe for lower case culture name * PR feedback Commit migrated from dotnet/coreclr@a65e2b9

sdmaclea added area-AssemblyLoader area-System.Globalization labels Apr 23, 2019

sdmaclea added this to the 3.0 milestone Apr 23, 2019

sdmaclea requested review from jkotas and vitek-karas April 23, 2019 16:59

sdmaclea self-assigned this Apr 23, 2019

jkotas requested a review from tarekgh April 23, 2019 17:05

tarekgh reviewed Apr 23, 2019

View reviewed changes