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

Merge branch 'MissingInstallFiles-_78' into Release0.2

Browse Source
This commit is contained in:
chris.watts90@outlook.com 2017-04-21 08:17:11 +01:00
commit 76ac93493d
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs
View File

@ -52,15 +52,13 @@ namespace CardReaderService
} }
var readerNameConfig = ConfigurationHandler.ConfigurationHandler.GetConfiguration("ReaderName"); var readerNameConfig = ConfigurationHandler.ConfigurationHandler.GetConfiguration("ReaderName");
if (string.IsNullOrEmpty(readerNameConfig)) if (string.IsNullOrEmpty(readerNameConfig) || (!readerNames.Contains(readerNameConfig)))
{
if (!readerNames.Contains(readerNameConfig))
{ {
_logger.Warn("No reader found with the name: {0}, defaulting to first available reader {1}", _logger.Warn("No reader found with the name: {0}, defaulting to first available reader {1}",
readerNameConfig, readerNames.First()); readerNameConfig, readerNames.First());
readerNameConfig = readerNames.First(); readerNameConfig = readerNames.First();
}
} }
_logger.Trace("Choosing reader: {0}", readerNameConfig); _logger.Trace("Choosing reader: {0}", readerNameConfig);
_readerName = readerNameConfig; _readerName = readerNameConfig;

8
DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
View File

@ -37,6 +37,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups> <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir> <RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\ConfigurationHandler\ConfigurationHandler.csproj">
<Name>ConfigurationHandler</Name>
<Project>{115250f6-f8c4-4f9b-a15f-251ea258d963}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.csproj"> <ProjectReference Include="..\Interfaces\Interfaces.csproj">
<Name>Interfaces</Name> <Name>Interfaces</Name>
<Project>{b7347b72-e208-423a-9d99-723b558ea3d7}</Project> <Project>{b7347b72-e208-423a-9d99-723b558ea3d7}</Project>

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

@ -8,6 +8,12 @@
KeyPath="yes" KeyPath="yes"
Source="$(var.Interfaces.TargetDir)Interfaces.dll" /> Source="$(var.Interfaces.TargetDir)Interfaces.dll" />
</Component> </Component>
<Component Id="ConfigurationHandler" Guid="{54C7ACE7-02DE-4EDC-BDDC-7DC6F34F6AF8}">
<File Id="ConfigurationHandlerDll"
Checksum="yes"
KeyPath="yes"
Source="$(var.ConfigurationHandler.TargetDir)ConfigurationHandler.dll"/>
</Component>
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>
</Wix> </Wix>

12
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
View File

@ -93,6 +93,12 @@
KeyPath="yes" KeyPath="yes"
Checksum="yes"/> Checksum="yes"/>
</Component> </Component>
<Component Id="KnockoutContextMenuJs" Guid="{C48C75F7-E4C3-45D7-8041-0BF7A8EEC077}">
<File Id="knockout.contextmenu.js"
Source="$(var.WindowsDataCenter.TargetDir)www\js\knockout.contextmenu.js"
KeyPath="yes"
Checksum="yes"/>
</Component>
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="WWWStaticFonts" Directory="STATICWWWFONTS" > <ComponentGroup Id="WWWStaticFonts" Directory="STATICWWWFONTS" >
@ -177,6 +183,12 @@
KeyPath="yes" KeyPath="yes"
Checksum="yes"/> Checksum="yes"/>
</Component> </Component>
<Component Id="KnockoutContextMenuCss" Guid="{D5C5C0F3-500C-419C-A327-5342AFF08204}">
<File Id="knockout.contextmenu.css"
Source="$(var.WindowsDataCenter.TargetDir)www\css\knockout.contextmenu.css"
KeyPath="yes"
Checksum="yes" />
</Component>
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>