Reorganize project structure; Add installer project

.gitignore

@@ -4,3 +4,4 @@ obj
 *.user
 *.cache
 *.userprefs
+Staging/

NBTExplorer.Installer/NBTExplorer.Installer.wixproj

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.8</ProductVersion>
+    <ProjectGuid>a1566071-7cbb-4c54-aae1-4b81b7715db3</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>NBTExplorer</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Bitmaps\Banner.png" />
+    <Content Include="Bitmaps\Dialog.png" />
+    <Content Include="Icon.ico" />
+    <Content Include="License.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Bitmaps" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>

NBTExplorer.Installer/Product.wxs

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="*" 
+           Name="NBTExplorer" 
+           Language="1033" 
+           Version="2.6.0.0" 
+           Manufacturer="Justin Aquadro" 
+           UpgradeCode="0bfb1026-21f2-4552-ad71-ca90aae10a25">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate EmbedCab="yes" />
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+    <UI>
+      <UIRef Id="WixUI_InstallDir" />
+
+      <Publish Dialog="ExitDialog"
+               Control="Finish"
+               Event="DoAction"
+               Value="CA.LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+    </UI>
+
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+
+    <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/Banner.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/Dialog.png" />
+
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch NBTExplorer" />
+    <Property Id="WixShellExecTarget" Value="[#NBTExplorer.exe]" />
+    <CustomAction Id="CA.LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
+
+    
+
+    <Icon Id="I.MainIcon" SourceFile="Icon.ico" />
+    <Property Id="ARPPRODUCTICON" Value="I.MainIcon" />
+
+		<Feature Id="F.MainApplication" Title="NBTExplorer" Level="1">
+      <ComponentGroupRef Id="CG.StartMenu" />
+			<ComponentGroupRef Id="CG.ProductComponents" />
+		</Feature>
+	</Product>
+
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="D.StartFolder" Name="NBTExplorer" />
+      </Directory>
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="INSTALLDIR" Name="NBTExplorer" />
+			</Directory>
+		</Directory>
+
+    <ComponentGroup Id="CG.StartMenu" Directory="D.StartFolder">
+      <Component Id="C.NBTEShortcut" Guid="*">
+        <Shortcut Id="S.NBTEShortcut"
+                  Name="NBTExplorer"
+                  Target="[INSTALLDIR]NBTExplorer.exe"
+                  WorkingDirectory="INSTALLDIR" />
+        <RemoveFolder Id="RF.StartFolder" On="uninstall" />
+        <RegistryValue Id="RV.NBTEShortcut" Root="HKCU" Key="Software\NBTExplorer" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+      </Component>
+      <Component Id="C.Uninstall" Guid="*">
+        <Shortcut Id="S.Uninstall"
+                  Name="Uninstall NBTExplorer"
+                  Target="[SystemFolder]msiexec.exe"
+                  Arguments="/x [ProductCode]"
+                  Description="Uninstalls the NBTExplorer Application" />
+        <RemoveFolder Id="RF.Uninstall" On ="uninstall" />
+        <RegistryValue Id="RV.Uninstall" Root="HKCU" Key="Software\NBTExplorer" Name="uninstall" Type="integer" Value="1" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="CG.ProductComponents" Directory="INSTALLDIR">
+      <Component Id="C.NBTExplorer.exe" Guid="*">
+        <File Source="../Staging/NBTExplorer.exe" KeyPath="yes" />
+      </Component>
+      <Component Id="C.NBTExplorer.exe.config" Guid="*">
+        <File Source="../Staging/NBTExplorer.exe.config" KeyPath="yes" />
+      </Component>
+      <Component Id="C.NBTExplorer.visualelementsmanifest.xml" Guid="*">
+        <File Source="../Staging/Windows/NBTExplorer.visualelementsmanifest.xml" KeyPath="yes" />
+      </Component>
+      <Component Id="C.Substrate.dll" Guid="*">
+        <File Source="../Staging/Substrate.dll" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>

NBTExplorer.sln

@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTExplorer", "NBTExplorer.csproj", "{8A458245-8176-4599-95CD-3CA39F2435CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTExplorer", "NBTExplorer\NBTExplorer.csproj", "{8A458245-8176-4599-95CD-3CA39F2435CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTExplorerMac", "NBTExplorerMac.csproj", "{01F9A296-C477-4CBF-A0D0-41E697048257}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTExplorerMac", "NBTExplorer\NBTExplorerMac.csproj", "{01F9A296-C477-4CBF-A0D0-41E697048257}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "NBTExplorer.Installer", "NBTExplorer.Installer\NBTExplorer.Installer.wixproj", "{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -54,6 +56,21 @@ Global
 		{01F9A296-C477-4CBF-A0D0-41E697048257}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{01F9A296-C477-4CBF-A0D0-41E697048257}.Release|x86.ActiveCfg = Release|Any CPU
 		{01F9A296-C477-4CBF-A0D0-41E697048257}.Release|x86.Build.0 = Release|Any CPU
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.AppStore|Any CPU.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.AppStore|Mixed Platforms.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.AppStore|Mixed Platforms.Build.0 = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.AppStore|x86.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.AppStore|x86.Build.0 = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Debug|x86.ActiveCfg = Debug|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Debug|x86.Build.0 = Debug|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|Any CPU.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|x86.ActiveCfg = Release|x86
+		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NBTExplorer/NBTExplorer.csproj

@@ -12,6 +12,21 @@
     <AssemblyName>NBTExplorer</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -306,8 +321,21 @@
     </None>
     <None Include="Resources\arrow-090.png" />
     <None Include="Resources\arrow-270.png" />
+    <Content Include="Windows\NBTExplorer.visualelementsmanifest.xml" />
     <Content Include="Vendor\Be.Windows.Forms.HexBox\HexBox.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </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.
@@ -316,4 +344,13 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <Staging Include="$(OutputPath)\**\*.dll" />
+      <Staging Include="$(OutputPath)\**\*.exe" />
+      <Staging Include="$(OutputPath)\**\*.exe.config" />
+      <Staging Include="$(ProjectDir)\**\*.visualelementsmanifest.xml" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Staging)" DestinationFolder="..\Staging\%(RecursiveDir)" />
+  </Target>
 </Project>