First pass at installer, rename sln and bring up to VS format v15

NefMoto · Jun 27, 2018 · cfe0605 · cfe0605
1 parent 510f5a4
commit cfe0605
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 4 deletions.
diff --git a/ECUEditor.sln → ECUFlasher.sln b/ECUEditor.sln → ECUFlasher.sln
@@ -1,6 +1,7 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{4AF7BCCB-A6E0-4543-853A-ABBADC3C862D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communication", "Communication\Communication.csproj", "{5E2416AA-BF43-4754-B1CF-913080C1B104}"
@@ -15,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Checksum", "Checksum\Checks
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationShared", "ApplicationShared\ApplicationShared.csproj", "{A72B0474-F8FB-4F9A-A1DB-0269BE9EB1FD}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,15 +74,24 @@ Global
 		{A72B0474-F8FB-4F9A-A1DB-0269BE9EB1FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A72B0474-F8FB-4F9A-A1DB-0269BE9EB1FD}.Release|x86.ActiveCfg = Release|x86
 		{A72B0474-F8FB-4F9A-A1DB-0269BE9EB1FD}.Release|x86.Build.0 = Release|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Debug|x86.ActiveCfg = Debug|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Debug|x86.Build.0 = Debug|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Release|Any CPU.ActiveCfg = Release|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Release|x86.ActiveCfg = Release|x86
+		{3A9FFB8D-401C-4C18-97E7-34B6E94CCA88}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5E2416AA-BF43-4754-B1CF-913080C1B104} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
 		{4AF7BCCB-A6E0-4543-853A-ABBADC3C862D} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
+		{5E2416AA-BF43-4754-B1CF-913080C1B104} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
 		{8966A890-1A9B-42E4-B0B6-181627310D7E} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
 		{7D8C0D8C-A7B5-446F-AD38-08E24D72C882} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
 		{A72B0474-F8FB-4F9A-A1DB-0269BE9EB1FD} = {D5966760-5B3C-49E7-AF91-09DBDBD7EF8D}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E0D07F86-F532-40C5-8A14-AEBAA6091D0C}
+	EndGlobalSection
 EndGlobal
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>3a9ffb8d-401c-4c18-97e7-34b6e94cca88</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>NefMotoECUFlasher</OutputName>
+    <OutputType>Package</OutputType>
+    <Name>Installer</Name>
+  </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>
+    <ProjectReference Include="..\ECUFlasher\ECUFlasher.csproj">
+      <Name>ECUFlasher</Name>
+      <Project>{d342d285-ac8c-40b2-8a85-83cfb9c1ce2a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <Target Name="BeforeBuild">
+    <GetAssemblyIdentity AssemblyFiles="$(SolutionDir)ECUFlasher\bin\msil\$(Configuration)\NefMotoECUFlasher.exe">
+      <Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
+    </GetAssemblyIdentity>
+    <CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
+      <Output TaskParameter="Value" PropertyName="TargetName" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetName)$(TargetExt)">
+      <Output TaskParameter="Value" PropertyName="TargetFileName" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetDir)$(TargetFileName)">
+      <Output TaskParameter="Value" PropertyName="TargetPath" />
+    </CreateProperty>
+  </Target>
+</Project>
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?define ProductName="NefMotoECUFlasher"?>
+  <?define Version="!(bind.fileVersion.NefMotoECUFlasher.exe)"?>
+  <?define ECUFlasher_TargetDir=$(var.ECUFlasher.TargetDir)?>
+  <?define FTD2XX_NET_TargetDir=$(var.ECUFlasher.TargetDir)?>
+  <?define Communication_TargetDir=$(var.ECUFlasher.TargetDir)?>
+  <?define Shared_TargetDir=$(var.ECUFlasher.TargetDir)?>
+  <?define ApplicationShared_TargetDir=$(var.ECUFlasher.TargetDir)?>
+  <Product Id="*"
+    Name="$(var.ProductName)"
+    Language="1033"
+    Version="$(var.Version)"
+    Manufacturer="Nefmoto"
+    UpgradeCode="2d104af1-44d2-4686-b3e0-a860cb092af1">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="$(var.ProductName)" Level="1">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+	<Directory Id="INSTALLFOLDER" Name="$(var.ProductName)" />
+      </Directory>
+    </Directory>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component Id="$(var.ProductName).exe" Guid="d2e4f421-0c73-4562-9af9-4f10dd16f278">
+	<File Id="$(var.ProductName).exe" Name="$(var.ProductName).exe" Source="$(var.ECUFlasher_TargetDir)$(var.ProductName).exe" />
+      </Component>
+      <Component Id="$(var.ProductName).exe.config" Guid="5d029180-2042-4344-b43b-e5b0809e9887">
+	<File Id="$(var.ProductName).exe.config" Name="$(var.ProductName).exe.config" Source="$(var.ECUFlasher_TargetDir)$(var.ProductName).exe.config" />
+      </Component>
+      <Component Id="FTD2XX_NET.dll" Guid="21949804-55a9-4cf1-b856-ce5b72fd3f6d">
+	<File Id="FTD2XX_NET.dll" Name="FTD2XX_NET.dll" Source="$(var.FTD2XX_NET_TargetDir)FTD2XX_NET.dll" />
+      </Component>
+      <Component Id="Communication.dll" Guid="d4cf033c-6330-4e20-9130-f26ef46bbcc9">
+	<File Id="Communication.dll" Name="Communication.dll" Source="$(var.Communication_TargetDir)Communication.dll" />
+      </Component>
+      <Component Id="ECUShared.dll" Guid="1161e03f-3326-4297-b492-1d333630dbae">
+	<File Id="ECUShared.dll" Name="ECUShared.dll" Source="$(var.Shared_TargetDir)ECUShared.dll" />
+      </Component>
+      <Component Id="ApplicationShared.dll" Guid="d42fabc7-0a7b-48b2-8104-3b8f85d8d525">
+	<File Id="ApplicationShared.dll" Name="ApplicationShared.dll" Source="$(var.ApplicationShared_TargetDir)ApplicationShared.dll" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
+<!--
+  <UI>
+    <Property Id="DefaultUIFont">DlgFont8</Property>
+
+    <Dialog Id="InstallDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
+      <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+	<Text>{\DlgTitleFont}Ready to Install</Text>
+      </Control>
+      <Control Id="Install" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="Install">
+	<Publish Event="EndDialog" Value="Return" />
+      </Control>
+    </Dialog>
+
+    <TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
+    <TextStyle Id="DlgTitleFont" FaceName="Tahoma" Size="8" Bold="yes" />
+
+    <InstallUISequence>
+      <Show Dialog="InstallDlg" After="CostFinalize" />
+    </InstallUISequence>
+  </UI>
+  <Icon Id="$(var.ProductName).exe" SourceFile="$(var.ProductName).exe" />
+-->
+
+</Wix>