Allow embedded exe files to be discovered in installer

MediaCrush · Nov 7, 2013 · f1e609c · f1e609c
1 parent 2b76cac
commit f1e609c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Installer/App.xaml.cs b/Installer/App.xaml.cs
@@ -41,6 +41,13 @@ static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs ar
                 path = String.Format(@"{0}\{1}", assemblyName.CultureInfo, path);
 
             var stream = GetEmbeddedResource(path);
+            if (stream == null)
+            {
+                path = assemblyName.Name + ".exe";
+                if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
+                    path = String.Format(@"{0}\{1}", assemblyName.CultureInfo, path);
+                stream = GetEmbeddedResource(path);
+            }
             if (stream == null)
                 return null;