From 693355380d37c1515ea3698191ec44789266e594 Mon Sep 17 00:00:00 2001
From: "chris.watts90@outlook.com" <chris.watts90@outlook.com>
Date: Sat, 18 Feb 2017 21:37:46 +0000
Subject: [PATCH] added logging dlls and configs for card reader service.

#22
---
 .../CardReaderServiceInstaller.wixproj        | 19 +++++++++++
 .../CardReaderServiceInstaller/Common.wxs     | 13 ++++++++
 .../DirectoryStructure.wxs                    |  4 ++-
 .../LoggerComponents.wxs                      | 33 +++++++++++++++++++
 .../CardReaderServiceInstaller/Product.wxs    |  2 ++
 .../CardReaderServiceInstaller/Properties.wxs |  6 ++++
 6 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
 create mode 100644 DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/LoggerComponents.wxs
 create mode 100644 DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs

diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
index 02c8244..a8847dc 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
@@ -22,8 +22,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CardReaderServiceComponents.wxs" />
+    <Compile Include="Common.wxs" />
     <Compile Include="DirectoryStructure.wxs" />
+    <Compile Include="LoggerComponents.wxs" />
     <Compile Include="Product.wxs" />
+    <Compile Include="Properties.wxs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CardReaderService\CardReaderService.csproj">
@@ -34,6 +37,22 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\Interfaces\Interfaces.csproj">
+      <Name>Interfaces</Name>
+      <Project>{b7347b72-e208-423a-9d99-723b558ea3d7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\NLogLogger\NLogLogger.csproj">
+      <Name>NLogLogger</Name>
+      <Project>{1c5220d6-9166-4f47-b57d-beb4d09d2a3f}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUtilExtension">
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
new file mode 100644
index 0000000..9bb6fef
--- /dev/null
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <ComponentGroup Id="CommonComponents" Directory="INSTALLFOLDER">
+      <Component Id="Interfaces" Guid="{B13D293D-FCA6-49C3-878A-0ECDCE724672}">
+        <File Id="Interfaces.dll"
+              Checksum="yes"
+              KeyPath="yes"
+              Source="$(var.Interfaces.TargetDir)Interfaces.dll" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/DirectoryStructure.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/DirectoryStructure.wxs
index 63a0b33..ad5e28c 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/DirectoryStructure.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/DirectoryStructure.wxs
@@ -4,7 +4,9 @@
     
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="CardReaderServiceInstaller" />
+        <Directory Id="INSTALLFOLDER" Name="CardReaderServiceInstaller" >
+          <Directory Id="CONFIGSFOLDER" Name="Configs" />
+        </Directory>
       </Directory>
     </Directory>
   
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/LoggerComponents.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/LoggerComponents.wxs
new file mode 100644
index 0000000..ab84978
--- /dev/null
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/LoggerComponents.wxs
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <ComponentGroup Id="LoggerComponents">
+      <ComponentGroupRef Id="LoggerConfigComponents"/>
+      <ComponentGroupRef Id="LoggerBinaryComponents"/>
+    </ComponentGroup>
+    
+    <ComponentGroup Id="LoggerBinaryComponents" Directory="INSTALLFOLDER">
+      <Component Id="NLog" Guid="{3CF61D98-23E5-4042-9325-B1CB25752B6E}">
+        <File Id="NLog.dll"
+              Checksum="yes"
+              KeyPath="yes"
+              Source="$(var.NLogLogger.TargetDir)NLog.dll" />
+      </Component>
+      <Component Id="NLogLogger" Guid="{37C18A51-7934-469E-8DA3-8214754798A6}">
+        <File Id="NLogLogger.dll"
+              Checksum="yes"
+              KeyPath="yes"
+              Source="$(var.NLogLogger.TargetDir)NLogLogger.dll" />
+      </Component>
+    </ComponentGroup>
+    
+    <ComponentGroup Id="LoggerConfigComponents" Directory="CONFIGSFOLDER">
+      <Component Id="NLogConfig" Guid="{B4252427-AE6A-4AC5-AA7C-B87C37AF3EB4}">
+        <File Id="NLogConfig.xml"
+              Checksum="yes"
+              KeyPath="yes"
+              Source="$(var.NLogLogger.TargetDir)NLogConfig.xml" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Product.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Product.wxs
index 464fe2e..c841e72 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Product.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Product.wxs
@@ -21,6 +21,8 @@
 
 	<Fragment>
 		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <ComponentGroupRef Id="CommonComponents"/>
+      <ComponentGroupRef Id="LoggerComponents"/>
       <ComponentGroupRef Id="CardReaderServiceComponents"/>
 		</ComponentGroup>
 	</Fragment>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs
new file mode 100644
index 0000000..a7c1387
--- /dev/null
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Properties.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <Property Id="STARTSERVICEONINSTALL" Value="false" />
+	</Fragment>
+</Wix>