From d55ee663b8ca577e0c6e0ebe78dba135cf006052 Mon Sep 17 00:00:00 2001
From: "Chris.Watts90@outlook.com" <Chris.Watts90@outlook.com>
Date: Thu, 30 Mar 2017 16:54:54 +0100
Subject: [PATCH] retarget for .net 4.5 (from 4.5.2) for mono support.

reference logger.
add calls to logger to help trace the service on start/stop.
---
 .../CardReaderService/App.config              |  6 ++---
 .../CardReaderService.csproj                  |  9 +++++++-
 .../CardReaderService/Service1.cs             | 22 +++++++++++++++++++
 .../CardReaderServiceHost/App.config          |  6 ++---
 .../CardReaderServiceHost.csproj              |  3 ++-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/CardReaderService/CardReaderService/App.config b/CardReaderService/CardReaderService/App.config
index da9bca9..89c3fd7 100644
--- a/CardReaderService/CardReaderService/App.config
+++ b/CardReaderService/CardReaderService/App.config
@@ -1,9 +1,9 @@
-<?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="DataCenterServiceEndpoint" value="http://localhost:1234"/>
   </appSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/CardReaderService/CardReaderService/CardReaderService.csproj b/CardReaderService/CardReaderService/CardReaderService.csproj
index 2b37206..ba02ba8 100644
--- a/CardReaderService/CardReaderService/CardReaderService.csproj
+++ b/CardReaderService/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>
@@ -68,6 +69,12 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Logger\Logger.csproj">
+      <Project>{42EFE386-DC2E-455A-BA81-5FC9CEE45D02}</Project>
+      <Name>Logger</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/CardReaderService/CardReaderService/Service1.cs b/CardReaderService/CardReaderService/Service1.cs
index 7039de9..9302933 100644
--- a/CardReaderService/CardReaderService/Service1.cs
+++ b/CardReaderService/CardReaderService/Service1.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.ServiceProcess;
 using System.Text;
 using System.Threading;
+using Logger;
 
 namespace CardReaderService
 {
@@ -29,8 +30,29 @@ namespace CardReaderService
 
         protected override void OnStart(string[] args)
         {
+<<<<<<< HEAD
             StartWorkerThread();
         }
+=======
+            Console.WriteLine("Starting.. Getting available readers");
+            MessageLogger.Log("Starting.. Getting available readers");
+            var ctxFactory = ContextFactory.Instance;
+            using(var context = ctxFactory.Establish(SCardScope.System))
+            {
+                var readerNames = context.GetReaders();
+                if (NoReaderAvailable(readerNames))
+                {
+                    Console.WriteLine("No Card Reader is available, Exiting..");
+                    MessageLogger.Log("No Card Reader is available, Exiting..");
+                    return;
+                }
+                Console.WriteLine("Choosing first available reader: " + readerNames.First());
+                MessageLogger.Log("Choosing first available reader: " + readerNames.First());
+                _readerName = readerNames.First();
+                _cardMonitor = new SCardMonitor(ctxFactory, SCardScope.System);
+                _cardMonitor.CardInserted += _cardMonitor_CardInserted;
+                _cardMonitor.Start(_readerName);
+>>>>>>> retarget for .net 4.5 (from 4.5.2) for mono support.
 
         private bool WeHaveValidCardReader()
         {
diff --git a/CardReaderService/CardReaderServiceHost/App.config b/CardReaderService/CardReaderServiceHost/App.config
index 88fa402..d1428ad 100644
--- a/CardReaderService/CardReaderServiceHost/App.config
+++ b/CardReaderService/CardReaderServiceHost/App.config
@@ -1,6 +1,6 @@
-<?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>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/CardReaderService/CardReaderServiceHost/CardReaderServiceHost.csproj b/CardReaderService/CardReaderServiceHost/CardReaderServiceHost.csproj
index 44c5609..d1273a2 100644
--- a/CardReaderService/CardReaderServiceHost/CardReaderServiceHost.csproj
+++ b/CardReaderService/CardReaderServiceHost/CardReaderServiceHost.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CardReaderServiceHost</RootNamespace>
     <AssemblyName>CardReaderServiceHost</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>