Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'LinuxCardReaderService' of https://gitlab.com/WattsC/FlexiTimeTrackerTool into LinuxCardReaderService

Browse Source 
# Conflicts:
#	CardReaderService/CardReaderService/CardReaderService.csproj
#	CardReaderService/CardReaderService/Service1.cs
#	CardReaderService/CardReaderService/packages.config
#	CardReaderService/Logger/MessageLogger.cs

Add missing property from commit.
update nuget packages
This commit is contained in:
chris.watts90@outlook.com 2019-09-03 15:43:49 +01:00
commit e49111ebfc
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CardReaderService/CardReaderService/CardReaderService.csproj
View File

@ -39,7 +39,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="PCSC, Version=4.2.0.0, Culture=neutral, PublicKeyToken=13b76e54a2ee80a7, processorArchitecture=MSIL"> <Reference Include="PCSC, Version=4.2.0.0, Culture=neutral, PublicKeyToken=13b76e54a2ee80a7, processorArchitecture=MSIL">
<HintPath>..\packages\PCSC.4.2.0\lib\net40\PCSC.dll</HintPath> <HintPath>..\packages\PCSC.3.6.0\lib\net40\pcsc-sharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

1
CardReaderService/CardReaderService/DataCenterHelper.cs
View File

@ -43,6 +43,7 @@ namespace CardReaderService
public class CardDataPost public class CardDataPost
{ {
public DateTime UtcTimeStamp { get; set; }
public string CardUId { get; set; } public string CardUId { get; set; }
} }
} }

2
CardReaderService/CardReaderService/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
<package id="PCSC" version="4.2.0" targetFramework="net45" /> <package id="PCSC" version="4.2.0" targetFramework="net45" />
</packages> </packages>

2
CardReaderService/CardReaderServiceHost/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
</packages> </packages>