x86 & x64 versions now use the same .exe file (both versions are packaged inside the .exe)

DependencyPacker/DependencyPacker.csproj

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{AABB5225-3A49-47FF-8A48-031673CADCE9}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DependencyPacker</RootNamespace>
+    <AssemblyName>DependencyPacker</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\Any CPU\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Any CPU\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

DependencyPacker/Program.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using System.IO.Compression;
+
+namespace DependencyPacker
+{
+	class Program
+	{
+		static void Main(string[] args)
+		{
+			if(File.Exists("Dependencies.zip")) {
+				File.Delete("Dependencies.zip");
+			}
+			ZipFile.CreateFromDirectory("Dependencies", "Dependencies.zip");
+		}
+	}
+}

DependencyPacker/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DependencyPacker")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Mesen")]
+[assembly: AssemblyProduct("DependencyPacker")]
+[assembly: AssemblyCopyright("Copyright © Mesen 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2cbd9a92-f7b8-4d71-bec3-2fd8810871f5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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")]

GUI.NET/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-</configuration>

GUI.NET/GUI.NET.csproj

@@ -59,6 +59,27 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\Any CPU\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>..\bin\Any CPU\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -444,17 +465,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <EmbeddedResource Include="$(OutputPath)Dependencies.zip">
-  </ItemGroup>
+      <Link>Dependencies\Dependencies.zip</Link>
-  <ItemGroup>
-    <EmbeddedResource Include="$(OutputPath)\BlipBuffer.dll">
-      <Link>Dependencies\BlipBuffer.dll</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(OutputPath)\NesNtsc.dll">
-      <Link>Dependencies\NesNtsc.dll</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(OutputPath)\WinMesen.dll">
-      <Link>Dependencies\WinMesen.dll</Link>
     </EmbeddedResource>
     <EmbeddedResource Include="..\Windows\Resources\MesenIcon.bmp">
       <Link>Dependencies\MesenIcon.bmp</Link>
@@ -469,6 +481,18 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>mkdir "Dependencies"
+copy "$(SolutionDir)bin\x86\$(ConfigurationName)\WinMesen.dll" "Dependencies\WinMesen.x86.dll"
+copy "$(SolutionDir)bin\x86\$(ConfigurationName)\BlipBuffer.dll" "Dependencies\BlipBuffer.x86.dll"
+copy "$(SolutionDir)bin\x86\$(ConfigurationName)\NesNtsc.dll" "Dependencies\NesNtsc.x86.dll"
+
+copy "$(SolutionDir)bin\x64\$(ConfigurationName)\WinMesen.dll" "Dependencies\WinMesen.x64.dll"
+copy "$(SolutionDir)bin\x64\$(ConfigurationName)\BlipBuffer.dll" "Dependencies\BlipBuffer.x64.dll"
+copy "$(SolutionDir)bin\x64\$(ConfigurationName)\NesNtsc.dll" "Dependencies\NesNtsc.x64.dll"
+
+call DependencyPacker.exe "$(OutDir)"</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

GUI.NET/Program.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,54 +23,67 @@ namespace Mesen.GUI
 			MessageBox.Show(e.Exception.ToString(), "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 		}
 		
+		private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+		{
+			MessageBox.Show(e.ExceptionObject.ToString(), "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+		}
+
 		/// <summary>
 		/// The main entry point for the application.
 		/// </summary>
 		[STAThread]
+		[HandleProcessCorruptedStateExceptions]
 		private static void Main(string[] args)
 		{
-			Application.ThreadException += Application_ThreadException;
+			try {
+				Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+				Application.ThreadException += Application_ThreadException;
+				AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
-			Directory.SetCurrentDirectory(ConfigManager.HomeFolder);
+				Directory.CreateDirectory(ConfigManager.HomeFolder);
-			ResourceManager.ExtractResources();
+				Directory.SetCurrentDirectory(ConfigManager.HomeFolder);
+				ResourceManager.ExtractResources();
 
-			if(!RuntimeChecker.TestDll()) {
+				if(!RuntimeChecker.TestDll()) {
-				return;
+					return;
-			}
+				}
 
-			Guid guid = new Guid("{A46606B7-2D1C-4CC5-A52F-43BCAF094AED}");
+				Guid guid = new Guid("{A46606B7-2D1C-4CC5-A52F-43BCAF094AED}");
-			using(SingleInstance singleInstance = new SingleInstance(guid)) {
+				using(SingleInstance singleInstance = new SingleInstance(guid)) {
-				if(singleInstance.FirstInstance || !Config.ConfigManager.Config.PreferenceInfo.SingleInstance) {
+					if(singleInstance.FirstInstance || !Config.ConfigManager.Config.PreferenceInfo.SingleInstance) {
-					Application.EnableVisualStyles();
-					Application.SetCompatibleTextRenderingDefault(false);
-
-					Mesen.GUI.Forms.frmMain frmMain = new Mesen.GUI.Forms.frmMain(args);
-
-					if(Config.ConfigManager.Config.PreferenceInfo.SingleInstance) {
-						singleInstance.ListenForArgumentsFromSuccessiveInstances();
-						singleInstance.ArgumentsReceived += (object sender, ArgumentsReceivedEventArgs e) => {
-							frmMain.BeginInvoke((MethodInvoker)(() => {
-								frmMain.ProcessCommandLineArguments(e.Args);
-							}));
-						};
-					}
-
-					Application.Run(frmMain);
-				} else {
-					if(singleInstance.PassArgumentsToFirstInstance(args)) {
-						Process current = Process.GetCurrentProcess();
-						foreach(Process process in Process.GetProcessesByName(current.ProcessName)) {
-							if(process.Id != current.Id) {
-								Program.SetForegroundWindow(process.MainWindowHandle);
-								break;
-							}
-						}
-					} else {
 						Application.EnableVisualStyles();
 						Application.SetCompatibleTextRenderingDefault(false);
-						Application.Run(new Mesen.GUI.Forms.frmMain(args));
+
+						Mesen.GUI.Forms.frmMain frmMain = new Mesen.GUI.Forms.frmMain(args);
+
+						if(Config.ConfigManager.Config.PreferenceInfo.SingleInstance) {
+							singleInstance.ListenForArgumentsFromSuccessiveInstances();
+							singleInstance.ArgumentsReceived += (object sender, ArgumentsReceivedEventArgs e) => {
+								frmMain.BeginInvoke((MethodInvoker)(() => {
+									frmMain.ProcessCommandLineArguments(e.Args);
+								}));
+							};
+						}
+
+						Application.Run(frmMain);
+					} else {
+						if(singleInstance.PassArgumentsToFirstInstance(args)) {
+							Process current = Process.GetCurrentProcess();
+							foreach(Process process in Process.GetProcessesByName(current.ProcessName)) {
+								if(process.Id != current.Id) {
+									Program.SetForegroundWindow(process.MainWindowHandle);
+									break;
+								}
+							}
+						} else {
+							Application.EnableVisualStyles();
+							Application.SetCompatibleTextRenderingDefault(false);
+							Application.Run(new Mesen.GUI.Forms.frmMain(args));
+						}
 					}
 				}
+			} catch(Exception e) {
+				MessageBox.Show(e.ToString(), "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 	}

GUI.NET/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Mesen")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Mesen")]
 [assembly: AssemblyProduct("Mesen")]
 [assembly: AssemblyCopyright("Copyright © 2015")]
 [assembly: AssemblyTrademark("")]

GUI.NET/ResourceManager.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Mesen.GUI.Config;
+using System.IO.Compression;
 
 namespace Mesen.GUI
 {
@@ -12,13 +14,16 @@ namespace Mesen.GUI
 	{
 		private static void ExtractResource(string resourceName, string filename)
 		{
-			if(!System.IO.File.Exists(filename)) {
+			if(File.Exists(filename)) {
-				System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly();
+				try {
-				using(Stream s = a.GetManifestResourceStream(resourceName)) {
+					File.Delete(filename);
-					byte[] buffer = new byte[s.Length];
+				} catch { } 
-					s.Read(buffer, 0, (int)s.Length);
+			}
-					File.WriteAllBytes(Path.Combine(ConfigManager.HomeFolder, filename), buffer);
+			Assembly a = Assembly.GetExecutingAssembly();
-				}
+			using(Stream s = a.GetManifestResourceStream(resourceName)) {
+				byte[] buffer = new byte[s.Length];
+				s.Read(buffer, 0, (int)s.Length);
+				File.WriteAllBytes(Path.Combine(ConfigManager.HomeFolder, filename), buffer);
 			}
 		}
 
@@ -26,10 +31,22 @@ namespace Mesen.GUI
 		{
 			Directory.CreateDirectory(Path.Combine(ConfigManager.HomeFolder, "Resources"));
 
+			ZipArchive zip = new ZipArchive(Assembly.GetExecutingAssembly().GetManifestResourceStream("Mesen.GUI.Dependencies.Dependencies.zip"));
+						
 			//Extract all needed files
-			ExtractResource("Mesen.GUI.Dependencies.WinMesen.dll", "WinMesen.dll");
+			string suffix = IntPtr.Size == 4 ? ".x86" : ".x64";
-			ExtractResource("Mesen.GUI.Dependencies.BlipBuffer.dll", "BlipBuffer.dll");
+			foreach(ZipArchiveEntry entry in zip.Entries) {
-			ExtractResource("Mesen.GUI.Dependencies.NesNtsc.dll", "NesNtsc.dll");
+				if(entry.Name.Contains(suffix)) {
+					string outputFilename = Path.Combine(ConfigManager.HomeFolder, entry.Name.Replace(suffix, ""));
+
+					if(File.Exists(outputFilename)) {
+						try {
+							File.Delete(outputFilename);
+						} catch { }
+					}
+					entry.ExtractToFile(outputFilename);
+				}
+			}
 
 			ExtractResource("Mesen.GUI.Dependencies.MesenIcon.bmp", Path.Combine("Resources", "MesenIcon.bmp"));
 			ExtractResource("Mesen.GUI.Dependencies.Roboto.12.spritefont", Path.Combine("Resources", "Roboto.12.spritefont"));

GUI.NET/RuntimeChecker.cs

@@ -22,7 +22,7 @@ namespace Mesen.GUI
 			if(!File.Exists("WinMesen.dll")) {
 				MessageBox.Show("Mesen was unable to start due to missing files." + Environment.NewLine + Environment.NewLine + "Error: WinMesen.dll is missing.", "Mesen", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			} else {
-				if(MessageBox.Show("Mesen was unable to start due to missing dependencies."  + Environment.NewLine + Environment.NewLine + "Mesen requires the the Visual Studio 2013 runtime.  Would you like to download the runtime from Microsoft's website and install it?", "Mesen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
+				if(MessageBox.Show("Mesen was unable to start due to missing dependencies."  + Environment.NewLine + Environment.NewLine + "Mesen requires the Visual Studio 2013 runtime.  Would you like to download the runtime from Microsoft's website and install it?", "Mesen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
 					if(!RuntimeChecker.DownloadRuntime()) {
 						MessageBox.Show("The Visual Studio Runtime could not be installed properly.", "Mesen", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					} else {

NES.sln

@@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utilities", "Utilities\Util
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI.NET", "GUI.NET\GUI.NET.csproj", "{08D83A7E-52A9-451E-A53A-1A7946F8BB77}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AABB5225-3A49-47FF-8A48-031673CADCE9} = {AABB5225-3A49-47FF-8A48-031673CADCE9}
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19} = {37749BB2-FA78-4EC9-8990-5628FC0BBA19}
 	EndProjectSection
 EndProject
@@ -44,86 +45,122 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHelper", "TestHelper\Te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NesNtsc", "NesNtsc\NesNtsc.vcxproj", "{65DB72B1-A45A-4475-90C1-60596B3ABEB3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyPacker", "DependencyPacker\DependencyPacker.csproj", "{AABB5225-3A49-47FF-8A48-031673CADCE9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Debug|x64.ActiveCfg = Debug|x64
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Debug|x64.Build.0 = Debug|x64
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Debug|x86.ActiveCfg = Debug|Win32
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Debug|x86.Build.0 = Debug|Win32
+		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Release|x64.ActiveCfg = Release|x64
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Release|x64.Build.0 = Release|x64
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Release|x86.ActiveCfg = Release|Win32
 		{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}.Release|x86.Build.0 = Release|Win32
+		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Debug|x64.ActiveCfg = Debug|x64
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Debug|x64.Build.0 = Debug|x64
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Debug|x86.ActiveCfg = Debug|Win32
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Debug|x86.Build.0 = Debug|Win32
+		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Release|x64.ActiveCfg = Release|x64
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Release|x64.Build.0 = Release|x64
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Release|x86.ActiveCfg = Release|Win32
 		{B5330148-E8C7-46BA-B54E-69BE59EA337D}.Release|x86.Build.0 = Release|Win32
+		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|x64.ActiveCfg = Debug|x64
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|x64.Build.0 = Debug|x64
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|x86.ActiveCfg = Debug|x86
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Debug|x86.Build.0 = Debug|x86
+		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|x64.ActiveCfg = Release|x64
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|x64.Build.0 = Release|x64
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|x86.ActiveCfg = Release|x86
 		{08D83A7E-52A9-451E-A53A-1A7946F8BB77}.Release|x86.Build.0 = Release|x86
+		{7761E790-B42C-4179-8550-8365FF9EB23E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Debug|x64.ActiveCfg = Debug|x64
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Debug|x64.Build.0 = Debug|x64
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Debug|x86.ActiveCfg = Debug|Win32
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Debug|x86.Build.0 = Debug|Win32
+		{7761E790-B42C-4179-8550-8365FF9EB23E}.Release|Any CPU.ActiveCfg = Release|Win32
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Release|x64.ActiveCfg = Release|x64
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Release|x64.Build.0 = Release|x64
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Release|x86.ActiveCfg = Release|Win32
 		{7761E790-B42C-4179-8550-8365FF9EB23E}.Release|x86.Build.0 = Release|Win32
+		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Debug|x64.ActiveCfg = Debug|x64
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Debug|x64.Build.0 = Debug|x64
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Debug|x86.ActiveCfg = Debug|Win32
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Debug|x86.Build.0 = Debug|Win32
+		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Release|Any CPU.ActiveCfg = Release|Win32
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Release|x64.ActiveCfg = Release|x64
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Release|x64.Build.0 = Release|x64
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Release|x86.ActiveCfg = Release|Win32
 		{37749BB2-FA78-4EC9-8990-5628FC0BBA19}.Release|x86.Build.0 = Release|Win32
+		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Debug|x64.ActiveCfg = Debug|x64
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Debug|x64.Build.0 = Debug|x64
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Debug|x86.ActiveCfg = Debug|Win32
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Debug|x86.Build.0 = Debug|Win32
+		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|Any CPU.ActiveCfg = Release|Win32
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x64.ActiveCfg = Release|x64
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x64.Build.0 = Release|x64
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x86.ActiveCfg = Release|Win32
 		{38D74EE1-5276-4D24-AABC-104B912A27D2}.Release|x86.Build.0 = Release|Win32
+		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x64.ActiveCfg = Debug|x64
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x64.Build.0 = Debug|x64
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x86.ActiveCfg = Debug|Win32
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Debug|x86.Build.0 = Debug|Win32
+		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|Any CPU.ActiveCfg = Release|Win32
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x64.ActiveCfg = Release|x64
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x64.Build.0 = Release|x64
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x86.ActiveCfg = Release|Win32
 		{CF35D78C-F710-41D2-968F-C46ACCFF6F07}.Release|x86.Build.0 = Release|Win32
+		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x64.ActiveCfg = Debug|x64
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x64.Build.0 = Debug|x64
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x86.ActiveCfg = Debug|Win32
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Debug|x86.Build.0 = Debug|Win32
+		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x64.ActiveCfg = Release|x64
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x64.Build.0 = Release|x64
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x86.ActiveCfg = Release|Win32
 		{2A607369-8B5D-494A-9E40-C5DC8D821AA3}.Release|x86.Build.0 = Release|Win32
+		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x64.ActiveCfg = Debug|x64
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x64.Build.0 = Debug|x64
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x86.ActiveCfg = Debug|Win32
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Debug|x86.Build.0 = Debug|Win32
+		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|Any CPU.ActiveCfg = Release|Win32
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x64.ActiveCfg = Release|x64
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x64.Build.0 = Release|x64
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x86.ActiveCfg = Release|Win32
 		{65DB72B1-A45A-4475-90C1-60596B3ABEB3}.Release|x86.Build.0 = Release|Win32
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|x64.ActiveCfg = Debug|x64
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|x64.Build.0 = Debug|x64
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|x86.ActiveCfg = Debug|x86
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Debug|x86.Build.0 = Debug|x86
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|x64.ActiveCfg = Release|x64
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|x64.Build.0 = Release|x64
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|x86.ActiveCfg = Release|x86
+		{AABB5225-3A49-47FF-8A48-031673CADCE9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE