From 040ad5992235cd41d082fbcee4be200a3d347be8 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:09:25 +0100 Subject: [PATCH 1/8] created SQLiteRepositoryInstaller project #25 --- .../SQLiteProvider/Product.wxs | 92 +++++++++++++++++++ .../SQLiteRepositoryInstaller.wixproj | 52 +++++++++++ .../WindowsDataCenter/WindowsDataCenter.sln | 17 ++++ 3 files changed, 161 insertions(+) create mode 100644 DataCenter_Windows/WindowsDataCenter/SQLiteProvider/Product.wxs create mode 100644 DataCenter_Windows/WindowsDataCenter/SQLiteProvider/SQLiteRepositoryInstaller.wixproj diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/Product.wxs b/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/Product.wxs new file mode 100644 index 0000000..7f006ab --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/Product.wxs @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/SQLiteRepositoryInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/SQLiteRepositoryInstaller.wixproj new file mode 100644 index 0000000..5315ae2 --- /dev/null +++ b/DataCenter_Windows/WindowsDataCenter/SQLiteProvider/SQLiteRepositoryInstaller.wixproj @@ -0,0 +1,52 @@ + + + + Debug + x86 + 3.10 + 41caf3c0-ddf9-4a65-a715-da07c4178cbf + 2.0 + SQLiteRepository + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + SQLiteRepositoryInstaller + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + SQLiteRepository + {b3510c81-f069-48a2-b826-ebe0ce7ab0b2} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + + + \ No newline at end of file diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln index b72285d..a9f2e89 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln @@ -32,6 +32,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigurationHandler", "Con EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "FlexiTimeSystemInstaller", "FlexiTimeSystemInstaller\FlexiTimeSystemInstaller.wixproj", "{D38E92DB-48F9-40C3-9A6F-D76FBD07326E}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SQLiteRepositoryInstaller", "SQLiteProvider\SQLiteRepositoryInstaller.wixproj", "{41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -214,6 +216,20 @@ Global {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 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Debug|Any CPU.ActiveCfg = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Debug|x86.ActiveCfg = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Debug|x86.Build.0 = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.DebugInstallers|Any CPU.ActiveCfg = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.DebugInstallers|Any CPU.Build.0 = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.DebugInstallers|x86.ActiveCfg = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.DebugInstallers|x86.Build.0 = Debug|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Release|Any CPU.ActiveCfg = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Release|x86.ActiveCfg = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.Release|x86.Build.0 = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.ReleaseInstallers|Any CPU.ActiveCfg = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.ReleaseInstallers|Any CPU.Build.0 = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.ReleaseInstallers|x86.ActiveCfg = Release|x86 + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF}.ReleaseInstallers|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -222,5 +238,6 @@ Global {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} + {41CAF3C0-DDF9-4A65-A715-DA07C4178CBF} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} EndGlobalSection EndGlobal From 4665a72414c9412974b4687b9ad7867d28170d66 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:10:09 +0100 Subject: [PATCH 2/8] removed SQLiteRepository.wxs file from bundle installer (now got its own installer) #25 --- .../DataCenterHostInstaller.wixproj | 1 - .../SQLiteRepository.wxs | 56 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/SQLiteRepository.wxs diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj index 6ab5074..6ca1920 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj @@ -31,7 +31,6 @@ - diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/SQLiteRepository.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/SQLiteRepository.wxs deleted file mode 100644 index 61a4a38..0000000 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/SQLiteRepository.wxs +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1b5b1a86c8f1fff865b8d4023146476097d0d58b Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:10:31 +0100 Subject: [PATCH 3/8] rename install directory --- .../WebApiServerHostInstaller/DirectoryStructure.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DirectoryStructure.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DirectoryStructure.wxs index 417bcda..81910c4 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DirectoryStructure.wxs +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DirectoryStructure.wxs @@ -3,7 +3,7 @@ - + From ef46bb176cc4aefe3ae7d5e8a27abad394cee858 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:10:46 +0100 Subject: [PATCH 4/8] remove SQLite Component group reference. #25 --- .../WindowsDataCenter/WebApiServerHostInstaller/Product.wxs | 1 - 1 file changed, 1 deletion(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs index a03942d..9d69092 100644 --- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs +++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs @@ -29,7 +29,6 @@ - From 95c3d260cddd8581faf23ffe989341f777d42892 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:11:06 +0100 Subject: [PATCH 5/8] add reference to SQLiteRepositoryInstaller project #25 --- .../FlexiTimeSystemInstaller.wixproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj index 2fe0780..859047b 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj @@ -45,6 +45,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + SQLiteRepositoryInstaller + {41caf3c0-ddf9-4a65-a715-da07c4178cbf} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + DataCenterHostInstaller {c5a4cdc3-849c-4166-bdc3-56bdb307126d} From ede5a70beb7c667f09687658cb5508ade332ad32 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:16:12 +0100 Subject: [PATCH 6/8] Added SQLiteRepositoryInstaller Chain entry to install SQLite provider if chosen. Added INSTALLFOLDER configuration to set a single install directory for both data service and plugins. #25 --- .../FlexiTimeSystemInstaller/Bundle.wxs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs index f1aebcb..0d330d0 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs @@ -14,6 +14,12 @@ + + + + + + + From 10c2763b4897b885628c73ead48513f8e43a9420 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 11:17:17 +0100 Subject: [PATCH 7/8] added Database configuration radio button to UI. tied to property that conditionally installs the SQLite Database provider. #25 --- .../WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml index 543992f..f530997 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml @@ -23,6 +23,7 @@ Data Centre Website Port + From 0e709267d20135cb4539f9aad3a97c4331b50ff5 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 18 Apr 2017 16:18:23 +0100 Subject: [PATCH 8/8] stop labels being tab stops. Add label for Database Type option selection and make radio button for SQLite conform to ui layout. #25 --- .../FlexiTimeSystemInstaller/Theme.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml index f530997..bb92e5d 100644 --- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml +++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml @@ -15,15 +15,16 @@ - Install Card Service + Install Card Service - Install Data Centre + Install Data Centre - Data Centre IP Address + Data Centre IP Address - Data Centre Website Port + Data Centre Website Port - + Database Type +