Browse Source

XAML Designer Demo Project -> Fix for Assembly search

pull/586/head
jogibear9988 11 years ago
parent
commit
517a3929fb
  1. 13
      samples/XamlDesigner/App.xaml.cs

13
samples/XamlDesigner/App.xaml.cs

@ -31,9 +31,16 @@ namespace ICSharpCode.XamlDesigner
private static bool internalLoad = false; private static bool internalLoad = false;
private static string lastRequesting = null; private static string lastRequesting = null;
Assembly AppDomain_CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) Assembly AppDomain_CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
{ {
var assList = AppDomain.CurrentDomain.GetAssemblies();
var loaded = assList.FirstOrDefault(x => x.FullName == args.Name);
if (loaded != null)
{
return loaded;
}
if (internalLoad) if (internalLoad)
return null; return null;
@ -48,7 +55,7 @@ namespace ICSharpCode.XamlDesigner
ass = Assembly.Load(args.Name); ass = Assembly.Load(args.Name);
} }
catch (Exception) { } catch (Exception) { }
if (ass == null && args.RequestingAssembly != null) { if (ass == null && args.RequestingAssembly != null) {
lastRequesting = args.RequestingAssembly.Location; lastRequesting = args.RequestingAssembly.Location;
var dir = Path.GetDirectoryName(args.RequestingAssembly.Location); var dir = Path.GetDirectoryName(args.RequestingAssembly.Location);
@ -68,7 +75,7 @@ namespace ICSharpCode.XamlDesigner
} }
internalLoad = false; internalLoad = false;
return ass; return ass;
} }

Loading…
Cancel
Save