Prepare for Version 0.0.1.0 Prerelease

Author: trigger-segfault

WinDirStat.Net.Wpf.Single/App.config

@@ -1,19 +1,94 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Globalization;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media.Imaging;
 using WinDirStat.Net.Wpf.Windows;
 
 namespace WinDirStat.Net.Wpf {
 	/// <summary>
-	/// Interaction logic for App.xaml
+	///  Interaction logic for App.xaml
 	/// </summary>
 	public partial class App : Application {
+		#region Constants
 
+		private static readonly string[] assemblyExtensions = { ".dll", ".exe" };
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///  Constructs the app and sets up embedded assembly resolving.
+		/// </summary>
 		public App() {
+			AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssemblies;
+			// Call this to avoid referencing assemblies before the assembly resolver can be added.
+			Initialize();
+		}
+
+		/// <summary>
+		///  Called to avoid referencing assemblies before the assembly resolver can be added.
+		/// </summary>
+		private void Initialize() {
+			ErrorMessageBox.ProgramName = "WinDirStat.Net";
+			ErrorMessageBox.HyperlinkName = "GitHub Page";
+			ErrorMessageBox.HyperlinkUri = new Uri(@"https://github.com/trigger-death/WinDirStat.Net");
+			ErrorMessageBox.ErrorIcon = new BitmapImage(new Uri("pack://application:,,,/Resources/App.ico"));
 			ErrorMessageBox.GlobalHook(this);
 		}
+
+		#endregion
+
+		#region Event Handlers
+		
+		/// <summary>
+		///  Resolves assemblies that may be embedded in the executable.
+		/// </summary>
+		private Assembly OnResolveAssemblies(object sender, ResolveEventArgs args) {
+			AssemblyName assemblyName = new AssemblyName(args.Name);
+			string assemblyPath;
+
+			if (TryResolveAssembly(assemblyName, out Assembly assembly))
+				return assembly;
+			assemblyPath = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+			if (TryResolveAssembly(assemblyPath, assemblyName, out assembly))
+				return assembly;
+			assemblyPath = CultureInfo.CurrentCulture.ToString();
+			if (TryResolveAssembly(assemblyPath, assemblyName, out assembly))
+				return assembly;
+
+			return null;
+		}
+
+		#endregion
+
+		#region TryResolveAssembly
+
+		private bool TryResolveAssembly(AssemblyName assemblyName, out Assembly assembly) {
+			return TryResolveAssembly(null, assemblyName, out assembly);
+		}
+		private bool TryResolveAssembly(string path, AssemblyName assemblyName, out Assembly assembly) {
+			foreach (string ext in assemblyExtensions) {
+				string startPath = Path.Combine(AppContext.BaseDirectory, "bin");
+				if (path != null && !Path.IsPathRooted(path))
+					startPath = Path.Combine(startPath, path);
+
+				path = Path.Combine(startPath, assemblyName.Name + ext);
+				if (File.Exists(path)) {
+					assembly = Assembly.LoadFile(path);
+					return true;
+				}
+			}
+			assembly = null;
+			return false;
+		}
+
+		#endregion
 	}
 }

WinDirStat.Net.Wpf.Single/App.xaml.cs

@@ -17,7 +17,7 @@
         DataContext="{Binding Main, Source={StaticResource Locator}}"
         Title="{Binding Title}" Height="450" Width="800" SnapsToDevicePixels="True" UseLayoutRounding="True" Background="#FFF0F0F0"
         Loaded="OnLoaded"
-        Icon="App.ico"
+        Icon="Resources/App.ico"
         cmd:RelayInfo.Collection="{StaticResource MainCommands}">
   <Window.Resources>
     <ResourceDictionary>

WinDirStat.Net.Wpf.Single/MainWindow.xaml

@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.1.0")]
+[assembly: AssemblyFileVersion("0.0.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 

WinDirStat.Net.Wpf.Single/Properties/AssemblyInfo.cs

@@ -39,7 +39,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>App.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\App.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>Properties\App.manifest</ApplicationManifest>
@@ -181,9 +181,6 @@
     </Compile>
     <None Include="Properties\App.manifest" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FunctionalFun.UI.Behaviours\FunctionalFun.UI.Behaviors.csproj">
       <Project>{7da5a107-b474-4ac0-b861-63a489db0c02}</Project>
@@ -288,7 +285,7 @@
     <Resource Include="Resources\Icons\ShowTotalSpace.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="App.ico" />
+    <Resource Include="Resources\App.ico" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\FileIcons\Missing.png" />

WinDirStat.Net.Wpf.Single/App.ico WinDirStat.Net.Wpf.Single/Resources/App.ico

@@ -11,7 +11,7 @@
         xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
         mc:Ignorable="d"
         DataContext="{Binding DriveSelect, Source={StaticResource Locator}}"
-        Title="{Binding Title}" Height="313" Width="435" SourceInitialized="OnSourceInitialized" Loaded="OnLoaded" Icon="/WinDirStat.Net;component/App.ico" WindowStartupLocation="CenterOwner"
+        Title="{Binding Title}" Height="313" Width="435" SourceInitialized="OnSourceInitialized" Loaded="OnLoaded" Icon="/WinDirStat.Net;component/Resources/App.ico" WindowStartupLocation="CenterOwner"
         Background="#FFF0F0F0" SnapsToDevicePixels="True" UseLayoutRounding="True" ShowInTaskbar="False">
   <Window.Resources>
     <ResourceDictionary>