From 309dabe0c281f0df8f1d1a3f8ffd867a8dcf8fa5 Mon Sep 17 00:00:00 2001 From: Jason Jarvis Date: Mon, 18 Apr 2016 21:33:40 -0700 Subject: [PATCH] Fix Asset DLL loading on non-iOS platforms that I broke. --- src/Shared/PlatformSupport/AssetLoader.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Shared/PlatformSupport/AssetLoader.cs b/src/Shared/PlatformSupport/AssetLoader.cs index 0072b418fc..86a4bee418 100644 --- a/src/Shared/PlatformSupport/AssetLoader.cs +++ b/src/Shared/PlatformSupport/AssetLoader.cs @@ -67,7 +67,15 @@ namespace Perspex.Shared.PlatformSupport var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name); if (match != null) { + AssemblyNameCache[name] = rv = new AssemblyDescriptor(match); + } + else + { + // iOS does not support loading assemblies dynamically! + // +#if !__IOS__ AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name)); +#endif } }