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

Merge branch 'CardReaderNLogLogger-#34' into 'master'

Browse Source 
0.1.1 - CardReaderService Logging fixes

See merge request !3
This commit is contained in:
Chris Watts 2017-02-22 13:22:54 +00:00
commit 0713f41ebb
7 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DataCenter_Windows/WindowsDataCenter/CardReaderService/App.config
View File

@ -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>

4
DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.csproj
View File

@ -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>

2
DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
View File

@ -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;
}

1
DataCenter_Windows/WindowsDataCenter/CardReaderService/packages.config
View File

@ -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>

4
DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/App.config
View File

@ -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>

9
DataCenter_Windows/WindowsDataCenter/CardReaderServiceHost/CardReaderServiceHost.csproj
View File

@ -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">

6
DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceComponents.wxs
View File

@ -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"