From b557174ef94b3101bd8b460f96cda49dcb288a76 Mon Sep 17 00:00:00 2001
From: "Chris.Watts90@outlook.com" <Chris.Watts90@outlook.com>
Date: Thu, 31 May 2018 14:08:41 +0100
Subject: [PATCH] set .net versions to .net 4.5 for interfaces,
 ConfigurationHandler, CardReaderService projects in order to target mono
 framework.

update ninject to 3.3.1 to attempt compatibility with mono framework.
switch ninject config to use logfile logger not nlog..for now..
---
 .../CardReaderService/App.config              |  18 ++-
 .../CardReaderService.csproj                  |   4 +-
 .../DefaultComponents/LogFileLogger.cs        | 122 ++++++++++++++++++
 .../CardReaderService/NinjectConfig.xml       |   2 +-
 .../CardReaderService/packages.config         |   8 +-
 .../CardReaderServiceHost/App.config          |  14 +-
 .../ConfigurationHandler.csproj               |   3 +-
 .../Interfaces/Interfaces.csproj              |   3 +-
 .../WindowsDataCenter/App.config              |  18 ++-
 .../WindowsDataCenter/packages.config         |  20 +--
 .../WindowsDataServiceHost/App.config         |  14 +-
 11 files changed, 197 insertions(+), 29 deletions(-)
 create mode 100644 DataCenter_Windows/WindowsDataCenter/CardReaderService/DefaultComponents/LogFileLogger.cs

diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config b/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
index a1f8f1f..ed0e97f 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
@@ -1,10 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
   <appSettings>
-    <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml"/>
-    <add key="DataCenterServiceEndpoint" value="http://localhost:8800"/>
+    <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml" />
+    <add key="DataCenterServiceEndpoint" value="http://localhost:8800" />
   </appSettings>
-</configuration>
\ No newline at end of file
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
index 2f275a1..9ce3d75 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CardReaderService</RootNamespace>
     <AssemblyName>CardReaderService</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -85,6 +86,7 @@
     <Compile Include="ConfigureService.cs" />
     <Compile Include="DataCenterHelper.cs" />
     <Compile Include="DefaultComponents\DefaultLogger.cs" />
+    <Compile Include="DefaultComponents\LogFileLogger.cs" />
     <Compile Include="NinjectHelper.cs" />
     <Compile Include="CardReaderService.cs">
       <SubType>Component</SubType>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/DefaultComponents/LogFileLogger.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/DefaultComponents/LogFileLogger.cs
new file mode 100644
index 0000000..2a12080
--- /dev/null
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/DefaultComponents/LogFileLogger.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Interfaces;
+
+namespace CardReaderService.DefaultComponents
+{
+    class LogFileLogger: ILogger
+    {
+        public bool IsDebugEnabled => true;
+        public bool IsErrorEnabled => true;
+        public bool IsFatalEnabled => true;
+        public bool IsInfoEnabled => true;
+        public bool IsTraceEnabled => true;
+        public bool IsWarnEnabled => true;
+
+        public void Debug(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Debug(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Debug(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        public void Error(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Error(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Error(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        public void Fatal(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Fatal(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Fatal(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        public void Info(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Info(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Info(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        public void Trace(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Trace(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Trace(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        public void Warn(Exception exception)
+        {
+            Log(exception.ToString());
+        }
+
+        public void Warn(string format, params object[] args)
+        {
+            Log(string.Format(format, args));
+        }
+
+        public void Warn(Exception exception, string format, params object[] args)
+        {
+            Log(exception.ToString());
+            Log(string.Format(format, args));
+        }
+
+        private static string _logPath = "log.txt";
+
+        public static void Log(string message)
+        {
+            System.IO.File.WriteAllText(_logPath, string.Format("{0}  |  {1}", DateTime.Now, message));
+        }
+    }
+}
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/NinjectConfig.xml b/DataCenter_Windows/WindowsDataCenter/CardReaderService/NinjectConfig.xml
index 71ad73d..e9e7cb1 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/NinjectConfig.xml
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/NinjectConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <module name="NinjectAssemblies">
   <bind service="Interfaces.ILogger, Interfaces"
-        to="NLogLogger.NLogger, NLogLogger" scope="singleton" />
+        to="CardReaderService.DefaultComponents.LogFileLogger, CardReaderService" scope="singleton" />
 </module>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config b/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
index 4bf2383..ac42eb0 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Ninject" version="3.3.4" targetFramework="net45" />
+  <package id="Ninject.Extensions.Xml" version="3.3.0" targetFramework="net45" />
+  <package id="PCSC" version="3.6.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
index 6fda695..ed16304 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
@@ -1,10 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <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"/>
+    <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml" />
+    <add key="DataCenterServiceEndpoint" value="http://localhost:1234" />
   </appSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj b/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj
index 461434d..456c1dc 100644
--- a/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj
+++ b/DataCenter_Windows/WindowsDataCenter/ConfigurationHandler/ConfigurationHandler.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ConfigurationHandler</RootNamespace>
     <AssemblyName>ConfigurationHandler</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj b/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj
index 2a53dee..84f5ae8 100644
--- a/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj
+++ b/DataCenter_Windows/WindowsDataCenter/Interfaces/Interfaces.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Interfaces</RootNamespace>
     <AssemblyName>Interfaces</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
index 7d38816..0dd4b37 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
@@ -3,9 +3,9 @@
   <appSettings>
     <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml" />
     <add key="DefaultPageSize" value="20" />
-    <add key="WebsiteHttpPort" value="8800"/>
+    <add key="WebsiteHttpPort" value="8800" />
     <add key="SwipeTimeGap" value="3" />
-    <add key="BugSubmissionEmailAddress" value="incoming+WattsC/FlexiTimeTrackerTool+24qrefn8e1urhl4iqct7we2jl@gitlab.com"/>
+    <add key="BugSubmissionEmailAddress" value="incoming+WattsC/FlexiTimeTrackerTool+24qrefn8e1urhl4iqct7we2jl@gitlab.com" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
@@ -18,7 +18,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -36,6 +36,18 @@
         <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject.Web.Common" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject.Web.Common.OwinHost" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config
index 0363aa3..1535601 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Castle.Core" version="4.2.0" targetFramework="net452" />
   <package id="DalSoft.WebApi.HelpPage" version="0.0.7.0" targetFramework="net452" />
   <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi" version="5.0.0" targetFramework="net452" />
@@ -8,21 +9,22 @@
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.0.0" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net452" />
   <package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
-  <package id="Ninject" version="3.2.2.0" targetFramework="net452" />
-  <package id="Ninject.Extensions.ContextPreservation" version="3.2.0.0" targetFramework="net452" />
-  <package id="Ninject.Extensions.NamedScope" version="3.2.0.0" targetFramework="net452" />
-  <package id="Ninject.Extensions.Xml" version="3.2.0.0" targetFramework="net452" />
-  <package id="Ninject.Web.Common" version="3.2.3.0" targetFramework="net452" />
-  <package id="Ninject.Web.Common.OwinHost" version="3.2.3.0" targetFramework="net452" />
-  <package id="Ninject.Web.WebApi" version="3.2.4.0" targetFramework="net452" />
-  <package id="Ninject.Web.WebApi.OwinHost" version="3.2.4.0" targetFramework="net452" />
+  <package id="Ninject" version="3.3.4" targetFramework="net452" />
+  <package id="Ninject.Extensions.ContextPreservation" version="3.3.1" targetFramework="net452" />
+  <package id="Ninject.Extensions.Factory" version="3.3.2" targetFramework="net452" />
+  <package id="Ninject.Extensions.NamedScope" version="3.3.0" targetFramework="net452" />
+  <package id="Ninject.Extensions.Xml" version="3.3.0" targetFramework="net452" />
+  <package id="Ninject.Web.Common" version="3.3.1" targetFramework="net452" />
+  <package id="Ninject.Web.Common.OwinHost" version="3.3.1" targetFramework="net452" />
+  <package id="Ninject.Web.WebApi" version="3.3.0" targetFramework="net452" />
+  <package id="Ninject.Web.WebApi.OwinHost" version="3.3.0" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="RazorEngine" version="3.7.2" targetFramework="net452" />
   <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net452" />
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config b/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config
index d2ebb4c..2677a94 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config
@@ -4,7 +4,7 @@
     <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml" />
     <add key="DefaultPageSize" value="20" />
     <add key="SwipeTimeGap" value="3" />
-    <add key="BugSubmissionEmailAddress" value="incoming+WattsC/FlexiTimeTrackerTool+24qrefn8e1urhl4iqct7we2jl@gitlab.com"/>
+    <add key="BugSubmissionEmailAddress" value="incoming+WattsC/FlexiTimeTrackerTool+24qrefn8e1urhl4iqct7we2jl@gitlab.com" />
   </appSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
@@ -31,6 +31,18 @@
         <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject.Web.Common" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject.Web.Common.OwinHost" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file