From eb7736bafa3fc846c45cad65970d3a16de1948f5 Mon Sep 17 00:00:00 2001
From: "Chris.Watts90@outlook.com" <Chris.Watts90@outlook.com>
Date: Wed, 22 Feb 2017 13:19:39 +0000
Subject: [PATCH] add Ninject.Extensions.Xml to the installer components.

add Ninject.Extensions.Xml to the packages list for CardReaderService.
add NLogConfigFilePath configuration setting to the App.config file.
added extra logging around Ninject loading.
#34
---
 .../WindowsDataCenter/CardReaderService/App.config       | 1 +
 .../CardReaderService/CardReaderService.csproj           | 4 ++++
 .../WindowsDataCenter/CardReaderService/Configuration.cs | 2 ++
 .../WindowsDataCenter/CardReaderService/packages.config  | 1 +
 .../WindowsDataCenter/CardReaderServiceHost/App.config   | 4 ++++
 .../CardReaderServiceHost/CardReaderServiceHost.csproj   | 9 +++++++++
 .../CardReaderServiceComponents.wxs                      | 6 ++++++
 7 files changed, 27 insertions(+)

diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config b/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
index da9bca9..6fda695 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
@@ -4,6 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
+    <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml"/>
     <add key="DataCenterServiceEndpoint" value="http://localhost:1234"/>
   </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
index 1480275..b2eeb62 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
@@ -41,6 +41,10 @@
       <HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Ninject.Extensions.Xml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.Extensions.Xml.3.2.0.0\lib\net45-full\Ninject.Extensions.Xml.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="pcsc-sharp, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PCSC.3.6.0\lib\net40\pcsc-sharp.dll</HintPath>
       <Private>True</Private>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
index 423413c..a045fde 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
@@ -28,6 +28,8 @@ namespace CardReaderService
                 logger = kernel.Get<ILogger>();
             }
             logger.Fatal("test message - ninject stuff loaded.");
+            logger.Trace("NinjectConfig.xml is here: {0}", ninjectConfigPath);
+            logger.Trace("got logger: {0}", logger.GetType());
 
             return kernel;
         }
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config b/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
index 0c55371..4bf2383 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
@@ -2,5 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net452" />
+  <package id="Ninject.Extensions.Xml" version="3.2.0.0" targetFramework="net452" />
   <package id="PCSC" version="3.6.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
index 88fa402..6fda695 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
@@ -3,4 +3,8 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
+  <appSettings>
+    <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml"/>
+    <add key="DataCenterServiceEndpoint" value="http://localhost:1234"/>
+  </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj
index 44c5609..5556dd0 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj
@@ -62,6 +62,15 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>mkdir "$(TargetDir)Configs"
+copy "$(SolutionDir)NLogLogger\$(OutDir)NLogLogger.dll" "$(TargetDir)"
+copy "$(SolutionDir)NLogLogger\$(OutDir)NLog.dll" "$(TargetDir)"
+copy "$(SolutionDir)NLogLogger\$(OutDir)NLogLogger.dll.config" "$(TargetDir)"
+copy "$(SolutionDir)NLogLogger\$(OutDir)NLogConfig.xml" "$(TargetDir)Configs\"
+
+copy "$(SolutionDir)WindowsDataCenter\$(OutDir)Ninject.Extensions.Xml.dll" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs
index 17fd5d3..1386663 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs
@@ -80,6 +80,12 @@
               KeyPath="yes"
               Source="$(var.CardReaderService.TargetDir)Ninject.dll" />
       </Component>
+      <Component Id="NinjectExtensionsXmlDll" Guid="{3809511F-9C51-4C05-AFE5-F59160EDCB71}">
+        <File Id="Ninject.Extensions.Xml.dll"
+              Source="$(var.CardReaderService.TargetDir)Ninject.Extensions.Xml.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
       <Component Id="NinjectConfig" Guid="{C7106002-A5E5-4223-AC34-75704C71D2F4}">
         <File Id="NinjectConfig.xml"
               Checksum="yes"