Merge branch 'SeparateDBInstaller-#25' into Release0.2

DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs

@@ -14,6 +14,12 @@
     <Variable Name="InstallDataCenter" Value="1" Type="numeric"/>
     <Variable Name="DataServiceIpAddress" Value="127.0.0.1" Type="string"/>
     <Variable Name="DataServicePort" Value="8800" Type="string"/>
+    <Variable Name="INSTALLFOLDER"
+          bal:Overridable="yes"
+          Type="string"
+          Value="[ProgramFilesFolder]Flexitime Data Center"/>
+    <Variable Name="InstallSQLiteDatabase" Value="1" Type="numeric"/>
+    
 		<Chain>
       <MsiPackage SourceFile="$(var.CardReaderServiceInstaller.TargetDir)CardReaderServiceInstaller.msi"
                   Compressed="yes"
@@ -29,6 +35,16 @@
                   DisplayName="Flexitime Data Center"
                   InstallCondition="InstallDataCenter = 1">
         <MsiProperty Name="ServicePort" Value="[DataServicePort]"/>
+        <MsiProperty Name="INSTALLFOLDER"
+                     Value="[INSTALLFOLDER]" />
+      </MsiPackage>
+      <MsiPackage SourceFile="$(var.SQLiteRepositoryInstaller.TargetDir)SQLiteRepository.msi"
+                  Compressed="yes"
+                  Visible="no"
+                  DisplayName="Flexitime SQLite Database Provider"
+                  InstallCondition="InstallSQLiteDatabase = 1">
+        <MsiProperty Name="INSTALLFOLDER"
+                     Value="[INSTALLFOLDER]" />
       </MsiPackage>
 		</Chain>
 	</Bundle>

DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/FlexiTimeSystemInstaller.wixproj

@@ -45,6 +45,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\SQLiteProvider\SQLiteRepositoryInstaller.wixproj">
+      <Name>SQLiteRepositoryInstaller</Name>
+      <Project>{41caf3c0-ddf9-4a65-a715-da07c4178cbf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\WebApiServerHostInstaller\DataCenterHostInstaller.wixproj">
       <Name>DataCenterHostInstaller</Name>
       <Project>{c5a4cdc3-849c-4166-bdc3-56bdb307126d}</Project>

DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml

@@ -15,14 +15,16 @@
     <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
   </Page>
   <Page Name="Install">
-    <Text Name="InstCardSvcLbl" X="20" Y="80" Width="200" Height="17" TabStop="yes" FontId="3">Install Card Service</Text>
+    <Text Name="InstCardSvcLbl" X="20" Y="80" Width="200" Height="17" TabStop="no" FontId="3">Install Card Service</Text>
     <Checkbox Name="InstallCardService" X="230" Y="80" Width="200" Height="17" TabStop="yes" FontId="3"></Checkbox>
-    <Text Name="InstDataCntrSvcLbl" X="20" Y="110" Width="200" Height="17" TabStop="yes" FontId="3">Install Data Centre</Text>
+    <Text Name="InstDataCntrSvcLbl" X="20" Y="110" Width="200" Height="17" TabStop="no" FontId="3">Install Data Centre</Text>
     <Checkbox Name="InstallDataCenter" X="230" Y="110" Width="200" Height="17" TabStop="yes" FontId="3"></Checkbox>
-    <Text Name="DataCenterIPLbl" X="20" Y="140" Width="200" Height="17" TabStop="yes" FontId="3">Data Centre IP Address</Text>
+    <Text Name="DataCenterIPLbl" X="20" Y="140" Width="200" Height="17" TabStop="no" FontId="3">Data Centre IP Address</Text>
     <Editbox Name="DataServiceIpAddress" X="230" Y="140" Width="100" Height="17" TabStop="yes" FontId="3"></Editbox>
-    <Text Name="PortLabel" X="20" Y="170" Width="200" Height="17" TabStop="yes" FontId="3">Data Centre Website Port</Text>
+    <Text Name="PortLabel" X="20" Y="170" Width="200" Height="17" TabStop="no" FontId="3">Data Centre Website Port</Text>
     <Editbox Name="DataServicePort" X="230" Y="170" Width="100" Height="17" TabStop="yes" FontId="3"></Editbox>
+    <Text Name="DatabaseLabel" X="20" Y="200" Width="100" Height="17" TabStop="no" FontId="3">Database Type</Text>
+    <Button Name="InstallSQLiteDatabase" X="230" Y="200" Width="100" Height="23" TabStop="yes" FontId="0" HexStyle="000009">SQLite</Button>
     <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
     <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
     <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>

DataCenter_Windows/WindowsDataCenter/SQLiteProvider/Product.wxs

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<Product Id="{34DA87B7-752D-4A37-928B-650160269E70}" 
+           Name="SQLiteRepositoryInstaller" 
+           Language="1033" 
+           Version="1.0.0.0" 
+           Manufacturer="Chris Watts" UpgradeCode="ec13c45c-6b63-49a6-b058-39e3069a0d6b">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate EmbedCab="yes"/>
+    
+		<Feature Id="ProductFeature" Title="SQLiteProvider" Level="1">
+			<ComponentGroupRef Id="SQLiteRepositoryComponents" />
+		</Feature>
+	</Product>
+
+	<Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="SQLiteRepository" />
+      </Directory>
+    </Directory>
+	</Fragment>
+
+	<Fragment>
+    
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="SQLITEX86" Name="x86" />
+      <Directory Id="SQLITEX64" Name="x64" />
+    </DirectoryRef>
+
+    <ComponentGroup Id="SQLiteRepositoryComponents" >
+      <ComponentGroupRef Id="SQLiteRepository" />
+      <ComponentGroupRef Id="SQLiteInterop" />
+      <ComponentRef Id="RepositoryConfiguration"/>
+    </ComponentGroup>
+    
+    <Component Id="RepositoryConfiguration" Directory="INSTALLFOLDER" Guid="{E49ABD61-0CCA-45A2-A525-DF85A0493FF7}" KeyPath="yes">
+      <util:XmlFile Id="SetServicePort"
+                Action="setValue"
+                ElementPath="/module[\[]@name='NinjectAssemblies'[\]]/bind[\[]@service='Interfaces.IRepository, Interfaces'[\]]//@to"
+                Value="SQLiteRepository.SQLiteRepository, SQLiteRepository"
+                File="[INSTALLFOLDER]NinjectConfig.xml"
+                SelectionLanguage="XPath"
+                Sequence="1" />
+    </Component>
+
+    <ComponentGroup Id="SQLiteRepository" Directory="INSTALLFOLDER">
+      <Component Id="SQLiteNet" Guid="{4295A808-7CB1-4EFC-BC94-136F22AF7A78}">
+        <File Id="SQLiteNet.dll"
+              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.dll"
+              KeyPath="yes"
+              Checksum="yes" />
+      </Component>
+      <Component Id="SQLiteNetPlatformGeneric" Guid="{BBDE8C94-FBBE-413E-83B8-B4248F3B718C}">
+        <File Id="SQLiteNetPlatformGenericDll"
+              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.Platform.Generic.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SQLiteNetPlatformWin32" Guid="{4FE0506E-1A8A-45DF-A2C8-C461332406C8}">
+        <File Id="SQLiteNetPlatformWin32.dll"
+              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.Platform.Win32.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SQLiteRepository" Guid="{4E68CF6F-7F31-4F59-AC93-F48EFE9E1445}">
+        <File Id="SQLiteRepository.dll"
+              Source="$(var.SQLiteRepository.TargetDir)\SQLiteRepository.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SQLiteInterop">
+      <Component Id="SQLiteInteropx86" Guid="{14F1C2DD-5D3D-49DF-B466-21AF881FCEAF}" Directory="SQLITEX86">
+        <File Id="SQLite.Interop.dllx86"
+              Source="$(var.SQLiteRepository.TargetDir)x86\SQLite.Interop.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SQLiteInteropx64" Guid="{45C77D89-8037-48CE-8B78-34C937ECBE83}" Directory="SQLITEX64">
+        <File Id="SQLite.Interop.dllx64"
+              Source="$(var.SQLiteRepository.TargetDir)x64\SQLite.Interop.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>

DataCenter_Windows/WindowsDataCenter/SQLiteProvider/SQLiteRepositoryInstaller.wixproj

@@ -0,0 +1,52 @@
+<?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.10</ProductVersion>
+    <ProjectGuid>41caf3c0-ddf9-4a65-a715-da07c4178cbf</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>SQLiteRepository</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>
+    <Name>SQLiteRepositoryInstaller</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="..\SQLiteRepository\SQLiteRepository.csproj">
+      <Name>SQLiteRepository</Name>
+      <Project>{b3510c81-f069-48a2-b826-ebe0ce7ab0b2}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </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>

DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj

@@ -31,7 +31,6 @@
     <Compile Include="NLog.wxs" />
     <Compile Include="Product.wxs" />
     <Compile Include="Properties.wxs" />
-    <Compile Include="SQLiteRepository.wxs" />
     <Compile Include="WebPages.wxs" />
   </ItemGroup>
   <ItemGroup>

DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DirectoryStructure.wxs

@@ -3,7 +3,7 @@
 	<Fragment>
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="WebApiServerHostInstaller" >
+        <Directory Id="INSTALLFOLDER" Name="Flexitime Data Center" >
           <Directory Id="CONFIGFILES" Name="Configs" />
         </Directory>
 			</Directory>

DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs

@@ -29,7 +29,6 @@
       <ComponentGroupRef Id="DalSoftWebApiHelpComponents" />
       <ComponentGroupRef Id="DataCenterComponents"/>
       <ComponentGroupRef Id="NLogComponents" />
-      <ComponentGroupRef Id="SQLiteRepositoryComponents" />
       <ComponentGroupRef Id="WebSiteComponents" />
     </ComponentGroup>
   </Fragment>

DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/SQLiteRepository.wxs

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Directory Id="SQLITEX86" Name="x86" />
-      <Directory Id="SQLITEX64" Name="x64" />
-    </DirectoryRef>
-    
-    <ComponentGroup Id="SQLiteRepositoryComponents" >
-      <ComponentGroupRef Id="SQLiteRepository" />
-      <ComponentGroupRef Id="SQLiteInterop" />
-    </ComponentGroup>
-    
-    <ComponentGroup Id="SQLiteRepository" Directory="INSTALLFOLDER">
-      <Component Id="SQLiteNet" Guid="{65D7D3DB-AB4A-41DE-956E-ACBC1EC1E5B7}">
-        <File Id="SQLiteNet.dll"
-              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.dll"
-              KeyPath="yes"
-              Checksum="yes" />
-      </Component>
-      <Component Id="SQLiteNetPlatformGeneric" Guid="{6E540212-B40B-41EB-BD81-1D8625F330D3}">
-        <File Id="SQLiteNetPlatformGenericDll"
-              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.Platform.Generic.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SQLiteNetPlatformWin32" Guid="{41E99987-0901-44D8-A2E8-2BCE18660298}">
-        <File Id="SQLiteNetPlatformWin32.dll"
-              Source="$(var.SQLiteRepository.TargetDir)\SQLite.Net.Platform.Win32.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SQLiteRepository" Guid="{B109C5DD-FD21-4078-9534-6065753F2900}">
-        <File Id="SQLiteRepository.dll"
-              Source="$(var.SQLiteRepository.TargetDir)\SQLiteRepository.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SQLiteInterop">
-      <Component Id="SQLiteInteropx86" Guid="{7D4C1BF5-A6B5-4379-B040-4AD6BABBB526}" Directory="SQLITEX86">
-        <File Id="SQLite.Interop.dllx86"
-              Source="$(var.WindowsDataCenter.TargetDir)x86\SQLite.Interop.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SQLiteInteropx64" Guid="{3591D185-ECBA-4382-BE75-FF6A271CEE3B}" Directory="SQLITEX64">
-        <File Id="SQLite.Interop.dllx64"
-              Source="$(var.WindowsDataCenter.TargetDir)x64\SQLite.Interop.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-	</Fragment>
-</Wix>

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