Merge branch 'master' into master

AvaloniaUI · Mar 18, 2017 · 2cad826 · 2cad826
2 parents 04b35fe + 6754bda
commit 2cad826
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/packages.cake b/packages.cake
@@ -196,6 +196,7 @@ public class Packages
                     new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion },
                     //.NET Core
                     new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp1.0", Version = "4.3.0" },
+                    new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp1.0", Version = "1.1.0" },
                     new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp1.0", Version = "1.6.0" },
                     new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netcoreapp1.0", Version = "1.0.1" },
                     new NuSpecDependency() { Id = "Splat", TargetFramework = "netcoreapp1.0", Version = SplatVersion },

diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@@ -37,6 +37,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
   </ItemGroup>
   <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
 </Project>
diff --git a/src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs b/src/Avalonia.DotNetCoreRuntime/NetCoreRuntimePlatform.cs
@@ -5,6 +5,8 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.DotNet.PlatformAbstractions;
+using Microsoft.Extensions.DependencyModel;
 
 namespace Avalonia.Shared.PlatformSupport
 {
@@ -15,33 +17,26 @@ internal partial class StandardRuntimePlatform
 
         static Assembly[] LoadAssemblies()
         {
+            var assemblies = new List<Assembly>();
+            // Mostly copy-pasted from (MIT):
+            // https://github.com/StefH/System.AppDomain.Core/blob/0b35e676c2721aa367b96e62eb52c97ee0b43a70/src/System.AppDomain.NetCoreApp/AppDomain.cs
 
-            var rv = new List<Assembly>();
-            var entry = Assembly.GetEntryAssembly();
-            rv.Add(entry);
-            var queue = new Queue<AssemblyName>(entry.GetReferencedAssemblies());
-            var aset = new HashSet<string>(queue.Select(r => r.ToString()));
-
-            while (queue.Count > 0)
+            foreach (var assemblyName in
+                DependencyContext.Default.GetRuntimeAssemblyNames(RuntimeEnvironment.GetRuntimeIdentifier()))
             {
-                Assembly asm;
                 try
                 {
-                    asm = Assembly.Load(queue.Dequeue());
-                }
-                catch (Exception e)
-                {
-                    Debug.Write(e.ToString());
-                    continue;
+                    var assembly = Assembly.Load(assemblyName);
+                    // just load all types and skip this assembly if one or more types cannot be resolved
+                    assembly.DefinedTypes.ToArray();
+                    assemblies.Add(assembly);
                 }
-                rv.Add(asm);
-                foreach (var r in asm.GetReferencedAssemblies())
+                catch (Exception ex)
                 {
-                    if (aset.Add(r.ToString()))
-                        queue.Enqueue(r);
+                    Debug.Write(ex.Message);
                 }
             }
-            return rv.Distinct().ToArray();
+            return assemblies.ToArray();
         }
     }
 }