Fixing assembly loading issues

Finally figured out the issues with assembly loading. I was relying on the AssemblyLoadContext.Resolving event to resolve assemblies at runtime when the dotnet CLI layer had changed at some point and had parsed the dependency files in native code prior to spinning up the CLR and had simply passed in everything via TRUSTED_PLATFORM_ASSEMBLIES. The CLR spinup process has been largely replaced by code in hostpolicy.cpp to ensure that we keep the load process as similar as possible to the CLI going forward. I'm doing a commit after getting everything working and will now start the cleanup process.
okwh · Sep 9, 2016 · 098b9b9 · 098b9b9
1 parent be8cc68
commit 098b9b9
Show file tree

Hide file tree

Showing 27 changed files with 3,632 additions and 565 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -53,12 53,18 @@
  'src/CoreCLREmbedding/pal/pal_utils.cpp',
  'src/CoreCLREmbedding/pal/trace.cpp',
  'src/CoreCLREmbedding/fxr/fx_ver.cpp',
  'src/CoreCLREmbedding/fxr/fx_muxer.cpp',
  'src/CoreCLREmbedding/json/casablanca/src/json/json.cpp',
  'src/CoreCLREmbedding/json/casablanca/src/json/json_parsing.cpp',
  'src/CoreCLREmbedding/json/casablanca/src/json/json_serialization.cpp',
  'src/CoreCLREmbedding/json/casablanca/src/utilities/asyncrt_utils.cpp',
  'src/CoreCLREmbedding/deps/deps_format.cpp',
- 'src/CoreCLREmbedding/deps/deps_entry.cpp'
  'src/CoreCLREmbedding/deps/deps_entry.cpp',
  'src/CoreCLREmbedding/deps/deps_resolver.cpp',
  'src/CoreCLREmbedding/host/args.cpp',
  'src/CoreCLREmbedding/host/coreclr.cpp',
  'src/CoreCLREmbedding/host/libhost.cpp',
  'src/CoreCLREmbedding/host/runtime_config.cpp'
  ],
  'include_dirs ': [
  'src/CoreCLREmbedding/json/casablanca/include'