From cfe0605af0fdd9dba77edbfa4c6de5dfade5abf8 Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Wed, 27 Jun 2018 00:39:01 -0700 Subject: [PATCH] First pass at installer, rename sln and bring up to VS format v15 --- ECUEditor.sln => ECUFlasher.sln | 20 +++++++-- Installer/Installer.wixproj | 54 ++++++++++++++++++++++ Installer/Product.wxs | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 4 deletions(-) rename ECUEditor.sln => ECUFlasher.sln (85%) create mode 100644 Installer/Installer.wixproj create mode 100644 Installer/Product.wxs diff --git a/ECUEditor.sln b/ECUFlasher.sln similarity index 85% rename from ECUEditor.sln rename to ECUFlasher.sln index 1ca4b5f..0b2f609 100644 --- a/ECUEditor.sln +++ b/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 new file mode 100644 index 0000000..885d7b6 --- /dev/null +++ b/Installer/Installer.wixproj @@ -0,0 +1,54 @@ + + + + Debug + x86 + 3.10 + 3a9ffb8d-401c-4c18-97e7-34b6e94cca88 + 2.0 + NefMotoECUFlasher + Package + Installer + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + ECUFlasher + {d342d285-ac8c-40b2-8a85-83cfb9c1ce2a} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Installer/Product.wxs b/Installer/Product.wxs new file mode 100644 index 0000000..ca4965b --- /dev/null +++ b/Installer/Product.wxs @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +