From 655ac4732d37ea5dccc5d12e70f50dd719d49254 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Sat, 18 Feb 2017 21:38:03 +0000 Subject: [PATCH] general updates to solutions etc. --- DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln | 6 ++++++ .../WindowsDataCenter/WindowsDataCenter/Configuration.cs | 2 ++ .../WindowsDataCenter/DefaultComponents/DefaultLogger.cs | 1 + 3 files changed, 9 insertions(+) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln index 661f106..6bfe705 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter.sln @@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CardReaderServiceHost", "Ca EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "CardReaderServiceInstaller", "CardReaderServiceInstaller\CardReaderServiceInstaller.wixproj", "{119216DE-FC7F-408A-9C2C-105874449E42}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{10A7E78C-0D11-40DD-AEC3-27C2C507A926}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -106,4 +108,8 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C5A4CDC3-849C-4166-BDC3-56BDB307126D} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} + {119216DE-FC7F-408A-9C2C-105874449E42} = {10A7E78C-0D11-40DD-AEC3-27C2C507A926} + EndGlobalSection EndGlobal diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Configuration.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Configuration.cs index 84f8184..5d53dac 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Configuration.cs +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Configuration.cs @@ -18,6 +18,7 @@ namespace WindowsDataCenter var ninjectConfigPath = new Uri(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().CodeBase), "NinjectConfig.xml")) .LocalPath; + if (File.Exists(ninjectConfigPath)) { kernel.Load(ninjectConfigPath); @@ -29,6 +30,7 @@ namespace WindowsDataCenter kernel.Bind().To(); logger = kernel.Get(); } + logger.Fatal("test message - ninject stuff loaded."); var repo = kernel.TryGet(); diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DefaultComponents/DefaultLogger.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DefaultComponents/DefaultLogger.cs index 60520ee..01fdc71 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DefaultComponents/DefaultLogger.cs +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DefaultComponents/DefaultLogger.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks;