|
|
@@ -44,7 +44,8 @@ namespace Perspex.Shared.PlatformSupport
|
|
|
{
|
|
|
if (assembly == null)
|
|
|
assembly = Assembly.GetEntryAssembly();
|
|
|
- _defaultAssembly = new AssemblyDescriptor(assembly);
|
|
|
+ if (assembly != null)
|
|
|
+ _defaultAssembly = new AssemblyDescriptor(assembly);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -99,6 +100,10 @@ namespace Perspex.Shared.PlatformSupport
|
|
|
if (qs.ContainsKey("assembly"))
|
|
|
asm = GetAssembly(qs["assembly"]);
|
|
|
|
|
|
+ if (asm == null && _defaultAssembly == null)
|
|
|
+ throw new ArgumentException(
|
|
|
+ "No defaultAssembly, entry assembly or explicit assembly specified, don't know where to look up for the resource, try specifiyng assembly explicitly");
|
|
|
+
|
|
|
IAssetDescriptor rv;
|
|
|
asm.Resources.TryGetValue(uri.AbsolutePath, out rv);
|
|
|
return rv;
|