From bb05dd982873005ce9dbadd39277d1e1bcdd77cc Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 21 Feb 2017 22:24:17 +0000 Subject: [PATCH 1/7] create initial bundle installer using wix bootstrapper added custom ui elements to conditionally install the card reader and data center services. #26 --- .../FlexiTimeSystemInstaller/Bundle.wxs | 31 +++++++ .../FlexiTimeSystemInstaller.wixproj | 66 +++++++++++++++ .../FlexiTimeSystemInstaller/License.rtf | Bin 0 -> 652 bytes .../FlexiTimeSystemInstaller/Theme.xml | 79 ++++++++++++++++++ .../ThemeLocalisation.wxl | 63 ++++++++++++++ .../WindowsDataCenter/WindowsDataCenter.sln | 9 ++ 6 files changed, 248 insertions(+) create mode 100644 DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs create mode 100644 DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj create mode 100644 DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/License.rtf create mode 100644 DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml create mode 100644 DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/ThemeLocalisation.wxl diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs new file mode 100644 index 0000000..f98b537 --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj new file mode 100644 index 0000000..2fe0780 --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj @@ -0,0 +1,66 @@ + + + + Debug + x86 + 3.10 + d38e92db-48f9-40c3-9a6f-d76fbd07326e + 2.0 + FlexiTimeSystemInstaller + Bundle + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + $(WixExtDir)\WixBalExtension.dll + WixBalExtension + + + + + + + + + + + + CardReaderServiceInstaller + {119216de-fc7f-408a-9c2c-105874449e42} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + DataCenterHostInstaller + {c5a4cdc3-849c-4166-bdc3-56bdb307126d} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + \ No newline at end of file diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/License.rtf b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/License.rtf new file mode 100644 index 0000000000000000000000000000000000000000..044a0b05d5a76a1577d915f42226b54a147a46ea GIT binary patch literal 652 zcmXw1JCEBi4DK8t|ABLHFl?tyQFLv$PDQ(E;YpN3RIf->?tmcwz0|q42&6=QFZ*t) z_{Csq{C3!~E$ipiIP!irDR;Ix7L;)jFm20xI=$DPMt3(pCz0o%#cX_g;ns{V^|~5w zFIXGN48QS`BYt~4j)%MXXf{ezQF4V}Y%k>28P3yb`g)${hq*Dm{N?06nQj+29!$aN zOv81aO$+Onv!1aBS$00%{h2F8;L>^omxIDK7QjgI1U9EeR!DjUbX>SuP8(2QeQe}( z0f>8x*?~|jy3EP4W7m^F7YO*Q@IbOd6GYq+0tUWzoZycDC60;>kw2-o1ua=6C2G&?J$krlR zowL2LLq%0v2};fED2)_HQc7xjC^&pW_MR;xIBHbKYs_KDz!4B@9PNLuJx=5E9uN9s GeE0{jCG2tl literal 0 HcmV?d00001 diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml new file mode 100644 index 0000000..ef2cc2e --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml @@ -0,0 +1,79 @@ + + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + #(loc.Title) + + + #(loc.HelpHeader) + #(loc.HelpText) + + + + + #(loc.InstallAcceptCheckbox) + Install Card Service + Install Data Center + + + + + + #(loc.OptionsHeader) + #(loc.OptionsLocationLabel) + + + + + + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + + + + + + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + #(loc.ModifyHeader) + + + + + + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + + + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + \ No newline at end of file diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/ThemeLocalisation.wxl b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/ThemeLocalisation.wxl new file mode 100644 index 0000000..027be42 --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/ThemeLocalisation.wxl @@ -0,0 +1,63 @@ + + + + + + [WixBundleName] Setup + [WixBundleName] + Version [WixBundleVersion] + Are you sure you want to cancel? + Previous version + Setup Help + + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + + /passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + + /norestart - suppress any attempts to restart. By default UI will prompt before restart. + /log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + + &Close + I &agree to the license terms and conditions + &Options + &Install + &Close + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Close + Repair Successfully Completed + Uninstall Successfully Completed + Installation Successfully Completed + Setup Successful + &Launch + You must restart your computer before you can use the software. + &Restart + &Close + Setup Failed + Setup Failed + Uninstall Failed + Repair Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + Files In Use + The following applications are using files that need to be updated: + Close the &applications and attempt to restart them. + &Do not close applications. A reboot will be required. + &OK + &Cancel + No action was taken as a system reboot is required. + \ No newline at end of file diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln index 8f6ddca..2fa981c 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln @@ -30,6 +30,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigurationHandler", "ConfigurationHandler\ConfigurationHandler.csproj", "{115250F6-F8C4-4F9B-A15F-251EA258D963}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "FlexiTimeSystemInstaller", "FlexiTimeSystemInstaller\FlexiTimeSystemInstaller.wixproj", "{D38E92DB-48F9-40C3-9A6F-D76FBD07326E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -114,6 +116,12 @@ Global {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|Any CPU.Build.0 = Release|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|x86.ActiveCfg = Release|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|x86.Build.0 = Release|Any CPU + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|x86.ActiveCfg = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|x86.Build.0 = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|Any CPU.ActiveCfg = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|x86.ActiveCfg = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -121,5 +129,6 @@ Global GlobalSection(NestedProjects) = preSolution {C5A4CDC3-849C-4166-BDC3-56BDB307126D} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} {119216DE-FC7F-408A-9C2C-105874449E42} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} EndGlobalSection EndGlobal From 640ef5f2bfd923be2868d08176dc5b8fd9ef58c0 Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:21:09 +0100 Subject: [PATCH 2/7] added debug and release installers build configuration to projects/solution to enable building installers in a complete/single step, to save building them individually. --- .../CardReaderService.csproj | 20 ++++ .../CardReaderServiceHost.csproj | 20 ++++ .../ConfigurationHandler.csproj | 18 ++++ .../SQLiteRepository/SQLiteRepository.csproj | 18 ++++ .../WindowsDataCenter/WindowsDataCenter.sln | 92 +++++++++++++++++++ .../WindowsDataCenter.csproj | 21 +++++ .../WindowsDataServiceHost.csproj | 20 ++++ 7 files changed, 209 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj index ffb3c89..2f275a1 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj @@ -32,6 +32,26 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj index 5556dd0..3a3f061 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj @@ -32,6 +32,26 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + ..\CardReaderService\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj b/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj index 974cfe3..461434d 100644 --- a/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj +++ b/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj @@ -29,6 +29,24 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.csproj b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.csproj index 20ca85b..3b91eac 100644 --- a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.csproj +++ b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.csproj @@ -31,6 +31,24 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln index 2fa981c..b72285d 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln @@ -36,92 +36,184 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + DebugInstallers|Any CPU = DebugInstallers|Any CPU + DebugInstallers|x86 = DebugInstallers|x86 Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 + ReleaseInstallers|Any CPU = ReleaseInstallers|Any CPU + ReleaseInstallers|x86 = ReleaseInstallers|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A5FEE048-17A6-4966-9B6B-BF073592A470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Debug|x86.ActiveCfg = Debug|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Debug|x86.Build.0 = Debug|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Release|Any CPU.ActiveCfg = Release|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Release|Any CPU.Build.0 = Release|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Release|x86.ActiveCfg = Release|Any CPU {A5FEE048-17A6-4966-9B6B-BF073592A470}.Release|x86.Build.0 = Release|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {A5FEE048-17A6-4966-9B6B-BF073592A470}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Debug|x86.ActiveCfg = Debug|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Debug|x86.Build.0 = Debug|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Release|Any CPU.Build.0 = Release|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Release|x86.ActiveCfg = Release|Any CPU {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.Release|x86.Build.0 = Release|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {5A4E2CF2-FA51-413E-82C7-14A19A50766D}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Debug|x86.ActiveCfg = Debug|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Debug|x86.Build.0 = Debug|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Release|Any CPU.Build.0 = Release|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Release|x86.ActiveCfg = Release|Any CPU {B7347B72-E208-423A-9D99-723B558EA3D7}.Release|x86.Build.0 = Release|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {B7347B72-E208-423A-9D99-723B558EA3D7}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Debug|x86.ActiveCfg = Debug|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Debug|x86.Build.0 = Debug|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Release|Any CPU.Build.0 = Release|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Release|x86.ActiveCfg = Release|Any CPU {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.Release|x86.Build.0 = Release|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {B3510C81-F069-48A2-B826-EBE0CE7AB0B2}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Debug|x86.ActiveCfg = Debug|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Debug|x86.Build.0 = Debug|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Release|Any CPU.Build.0 = Release|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Release|x86.ActiveCfg = Release|Any CPU {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.Release|x86.Build.0 = Release|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {1C5220D6-9166-4F47-B57D-BEB4D09D2A3F}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Debug|Any CPU.ActiveCfg = Debug|x86 {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Debug|x86.ActiveCfg = Debug|x86 {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Debug|x86.Build.0 = Debug|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.DebugInstallers|Any CPU.ActiveCfg = Debug|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.DebugInstallers|Any CPU.Build.0 = Debug|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.DebugInstallers|x86.ActiveCfg = Debug|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.DebugInstallers|x86.Build.0 = Debug|x86 {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Release|Any CPU.ActiveCfg = Release|x86 {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Release|x86.ActiveCfg = Release|x86 {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.Release|x86.Build.0 = Release|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.ReleaseInstallers|Any CPU.ActiveCfg = Release|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.ReleaseInstallers|Any CPU.Build.0 = Release|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.ReleaseInstallers|x86.ActiveCfg = Release|x86 + {C5A4CDC3-849C-4166-BDC3-56BDB307126D}.ReleaseInstallers|x86.Build.0 = Release|x86 {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Debug|x86.ActiveCfg = Debug|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Debug|x86.Build.0 = Debug|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Release|Any CPU.Build.0 = Release|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Release|x86.ActiveCfg = Release|Any CPU {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.Release|x86.Build.0 = Release|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {5F30E8E4-5107-4C99-ADFF-38D735DC113D}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Debug|x86.ActiveCfg = Debug|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Debug|x86.Build.0 = Debug|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Release|Any CPU.Build.0 = Release|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Release|x86.ActiveCfg = Release|Any CPU {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.Release|x86.Build.0 = Release|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {6E48913F-9D8C-4132-93A7-C7B1C6DD5264}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {119216DE-FC7F-408A-9C2C-105874449E42}.Debug|Any CPU.ActiveCfg = Debug|x86 {119216DE-FC7F-408A-9C2C-105874449E42}.Debug|x86.ActiveCfg = Debug|x86 {119216DE-FC7F-408A-9C2C-105874449E42}.Debug|x86.Build.0 = Debug|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.DebugInstallers|Any CPU.ActiveCfg = Debug|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.DebugInstallers|Any CPU.Build.0 = Debug|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.DebugInstallers|x86.ActiveCfg = Debug|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.DebugInstallers|x86.Build.0 = Debug|x86 {119216DE-FC7F-408A-9C2C-105874449E42}.Release|Any CPU.ActiveCfg = Release|x86 {119216DE-FC7F-408A-9C2C-105874449E42}.Release|x86.ActiveCfg = Release|x86 {119216DE-FC7F-408A-9C2C-105874449E42}.Release|x86.Build.0 = Release|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.ReleaseInstallers|Any CPU.ActiveCfg = Release|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.ReleaseInstallers|Any CPU.Build.0 = Release|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.ReleaseInstallers|x86.ActiveCfg = Release|x86 + {119216DE-FC7F-408A-9C2C-105874449E42}.ReleaseInstallers|x86.Build.0 = Release|x86 {115250F6-F8C4-4F9B-A15F-251EA258D963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Debug|Any CPU.Build.0 = Debug|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Debug|x86.ActiveCfg = Debug|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Debug|x86.Build.0 = Debug|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.DebugInstallers|Any CPU.ActiveCfg = DebugInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.DebugInstallers|Any CPU.Build.0 = DebugInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.DebugInstallers|x86.ActiveCfg = DebugInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.DebugInstallers|x86.Build.0 = DebugInstallers|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|Any CPU.ActiveCfg = Release|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|Any CPU.Build.0 = Release|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|x86.ActiveCfg = Release|Any CPU {115250F6-F8C4-4F9B-A15F-251EA258D963}.Release|x86.Build.0 = Release|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.ReleaseInstallers|Any CPU.ActiveCfg = ReleaseInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.ReleaseInstallers|Any CPU.Build.0 = ReleaseInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.ReleaseInstallers|x86.ActiveCfg = ReleaseInstallers|Any CPU + {115250F6-F8C4-4F9B-A15F-251EA258D963}.ReleaseInstallers|x86.Build.0 = ReleaseInstallers|Any CPU {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|Any CPU.ActiveCfg = Debug|x86 {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|x86.ActiveCfg = Debug|x86 {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Debug|x86.Build.0 = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.DebugInstallers|Any CPU.ActiveCfg = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.DebugInstallers|Any CPU.Build.0 = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.DebugInstallers|x86.ActiveCfg = Debug|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.DebugInstallers|x86.Build.0 = Debug|x86 {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|Any CPU.ActiveCfg = Release|x86 {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|x86.ActiveCfg = Release|x86 {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.Release|x86.Build.0 = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.ReleaseInstallers|Any CPU.ActiveCfg = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.ReleaseInstallers|Any CPU.Build.0 = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.ReleaseInstallers|x86.ActiveCfg = Release|x86 + {D38E92DB-48F9-40C3-9A6F-D76FBD07326E}.ReleaseInstallers|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj index b86b216..00788ec 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj @@ -35,6 +35,27 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + bin\Debug\WindowsDataCenter.XML + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\DalSoft.WebApi.HelpPage.0.0.7.0\lib\net451\DalSoft.WebApi.HelpPage.dll diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/WindowsDataServiceHost.csproj b/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/WindowsDataServiceHost.csproj index e5f50d5..895a7b9 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/WindowsDataServiceHost.csproj +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/WindowsDataServiceHost.csproj @@ -32,6 +32,26 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll From 54b6094a43a427b88a23ad4321478cf072451092 Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:21:28 +0100 Subject: [PATCH 3/7] added debug and release installers build configuration to projects/solution to enable building installers in a complete/single step, to save building them individually. --- .../Interfaces/Interfaces.csproj | 18 ++++++++++++++++++ .../NLogLogger/NLogLogger.csproj | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj b/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj index efff1a9..70f72cc 100644 --- a/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj +++ b/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj @@ -29,6 +29,24 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/DataCenter_Windows/WindowsDataCenter/NLogLogger/NLogLogger.csproj b/DataCenter_Windows/WindowsDataCenter/NLogLogger/NLogLogger.csproj index a87fe54..82362dc 100644 --- a/DataCenter_Windows/WindowsDataCenter/NLogLogger/NLogLogger.csproj +++ b/DataCenter_Windows/WindowsDataCenter/NLogLogger/NLogLogger.csproj @@ -29,6 +29,24 @@ prompt 4 + + true + bin\DebugInstallers\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ReleaseInstallers\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\NLog.4.4.2\lib\net45\NLog.dll From cdbf5435622522fcd6503e27ff297043f1933cee Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:22:50 +0100 Subject: [PATCH 4/7] Exposed properties for setting the port in the data center installer #31 --- .../DataCenterServiceComponents.wxs | 13 ++++++++++++- .../DataCenterURLACLConfiguration.wxs | 2 +- .../WebApiServerHostInstaller/Properties.wxs | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs index 6d18551..f5a1056 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs @@ -8,6 +8,7 @@ + @@ -202,5 +203,15 @@ Checksum="yes"/> + + + + - + \ No newline at end of file diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterURLACLConfiguration.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterURLACLConfiguration.wxs index a55b324..0ec581d 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterURLACLConfiguration.wxs +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterURLACLConfiguration.wxs @@ -3,7 +3,7 @@ xmlns:http="http://schemas.microsoft.com/wix/HttpExtension"> - + diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs index a7c1387..5fd31fe 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs @@ -2,5 +2,6 @@ + From def593d3a5d7cbb3ee38340da43e4f159d3816b9 Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:23:57 +0100 Subject: [PATCH 5/7] exposed properties for configuring data center endpoint ip and port. defaults to localhost/127.0.0.1 implemented the code to configure the app.config file on install. #31 --- .../CardReaderServiceComponents.wxs | 11 +++++++++++ .../CardReaderServiceInstaller/Properties.wxs | 2 ++ 2 files changed, 13 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs index 1386663..9b96fdf 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs @@ -25,6 +25,7 @@ + + + + + diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs index a7c1387..05c41f1 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs @@ -2,5 +2,7 @@ + + From 3e2a19c0e4d664d69b75055e37c19df9179331f9 Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:24:54 +0100 Subject: [PATCH 6/7] added properties to configure the ip and port of the data center. added code to pass the configuration properties through to the msi installers. #31 #26 --- .../FlexiTimeSystemInstaller/Bundle.wxs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs index f98b537..f1aebcb 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs @@ -10,21 +10,25 @@ LicenseFile="License.rtf" ThemeFile="Theme.xml" /> - - + + + + - + + + From 97240bd752376c090bdc85bc5a1ada0f5aa27eed Mon Sep 17 00:00:00 2001 From: Watts Date: Sat, 15 Apr 2017 20:26:13 +0100 Subject: [PATCH 7/7] added configuration gui elements for the bootstrapper to enable configuration of the port and IP on install. #26 #31 --- .../FlexiTimeSystemInstaller/Theme.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml index ef2cc2e..543992f 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml @@ -15,10 +15,14 @@ - - #(loc.InstallAcceptCheckbox) - Install Card Service - Install Data Center + Install Card Service + + Install Data Centre + + Data Centre IP Address + + Data Centre Website Port +