Fix Logger

Nonobis · Apr 13, 2017 · 3f5b3dc · 3f5b3dc
1 parent f683e47
commit 3f5b3dc
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/Topshelf.Squirrel.Updater.Sample/Program.cs b/Topshelf.Squirrel.Updater.Sample/Program.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Topshelf;
+using Topshelf.Logging;
 using Topshelf.Squirrel.Updater;
 using Topshelf.Squirrel.Updater.Interfaces;
 
@@ -17,11 +18,8 @@ class Program
     {
 
         #region Definition du logger
-
-        /// <summary>
-        /// Logger Log4Net
-        /// </summary>
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        private static readonly LogWriter Log = HostLogger.Get(typeof(Program));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater.Sample/Properties/AssemblyInfo.cs b/Topshelf.Squirrel.Updater.Sample/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.3")]
-[assembly: AssemblyInformationalVersion("0.0.3")]
+[assembly: AssemblyVersion("0.0.4")]
+[assembly: AssemblyInformationalVersion("0.0.4")]
 
 // This line is needed for automatic updates
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
diff --git a/Topshelf.Squirrel.Updater.Sample/ServiceHosted.cs b/Topshelf.Squirrel.Updater.Sample/ServiceHosted.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Topshelf.Logging;
 using Topshelf.Squirrel.Updater.Interfaces;
 
 namespace Topshelf.Squirrel.Updater.Sample
@@ -8,9 +9,9 @@ public class ServiceHosted : ISelfUpdatableService
         #region Definition du logger
 
         /// <summary>
-        /// Logger Log4Net
+        /// Logger
         /// </summary>
-        //private static readonly ILog Log = LogManager.GetLogger(typeof(ServiceHosted));
+        private static readonly LogWriter Log = HostLogger.Get(typeof(ServiceHosted));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater.Sample/Topshelf.Squirrel.Updater.Sample.csproj b/Topshelf.Squirrel.Updater.Sample/Topshelf.Squirrel.Updater.Sample.csproj
@@ -121,7 +121,9 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
-    <None Include="Topshelf.Squirrel.Updater.Sample.nuspec" />
+    <None Include="Topshelf.Squirrel.Updater.Sample.nuspec">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="lib\net45\" />

diff --git a/Topshelf.Squirrel.Updater/Builders/Host.InstallAndStart.cs b/Topshelf.Squirrel.Updater/Builders/Host.InstallAndStart.cs
@@ -11,8 +11,8 @@ public sealed class InstallAndStartHostBuilder : HostBuilder
 	{
 
         #region Logger
-
-        private static readonly LogWriter Log;
+        
+        private static readonly LogWriter Log = HostLogger.Get(typeof(InstallAndStartHostBuilder));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater/Builders/Host.StopAndUninstall.cs b/Topshelf.Squirrel.Updater/Builders/Host.StopAndUninstall.cs
@@ -13,7 +13,7 @@ public sealed class StopAndUninstallHostBuilder : HostBuilder
     {
         #region Logger
 
-        private static readonly LogWriter Log;
+        private static readonly LogWriter Log = HostLogger.Get(typeof(StopAndUninstallHostBuilder));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater/Builders/Host.Update.cs b/Topshelf.Squirrel.Updater/Builders/Host.Update.cs
@@ -16,8 +16,8 @@ public sealed class UpdateHostBuilder : HostBuilder
 	{
 
         #region Logger
-        
-        private static readonly LogWriter Log;
+
+        private static readonly LogWriter Log = HostLogger.Get(typeof(UpdateHostBuilder));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater/Properties/AssemblyInfo.cs b/Topshelf.Squirrel.Updater/Properties/AssemblyInfo.cs
@@ -23,8 +23,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.4")]
-[assembly: AssemblyFileVersion("0.0.4")]
+[assembly: AssemblyVersion("0.0.5")]
+[assembly: AssemblyFileVersion("0.0.5")]
 [assembly: ComVisible(false)]
 [assembly: Guid("aef86ad8-cece-426d-9dc7-6313b6046cda")]
 
diff --git a/Topshelf.Squirrel.Updater/RepeatedTimeUpdater.cs b/Topshelf.Squirrel.Updater/RepeatedTimeUpdater.cs
@@ -13,7 +13,7 @@ public class RepeatedTimeUpdater : IUpdater
 
         #region Logger
 
-        private static readonly LogWriter Log;
+        private static readonly LogWriter Log = HostLogger.Get(typeof(RepeatedTimeUpdater));
 
         #endregion
 

diff --git a/Topshelf.Squirrel.Updater/SquirreledHost.cs b/Topshelf.Squirrel.Updater/SquirreledHost.cs
@@ -16,10 +16,10 @@ public class SquirreledHost
 
         #region Logger
 
-        private static readonly LogWriter Log;
+        private static readonly LogWriter Log = HostLogger.Get(typeof(SquirreledHost));
 
         #endregion
-        
+
         /// <summary>
         /// Service RunAs 'Login'
         /// </summary>

diff --git a/Topshelf.Squirrel.Updater/Topshelf.Squirrel.Updater.nuspec b/Topshelf.Squirrel.Updater/Topshelf.Squirrel.Updater.nuspec
@@ -11,7 +11,7 @@
     <owners>A. Dartois</owners>
     <projectUrl>https://github.com/Nonobis/Topshelf.Squirrel.Updater</projectUrl>
     <licenseUrl>https://github.com/Nonobis/Topshelf.Squirrel.Updater/blob/master/Topshelf.Squirrel.Updater/License.txt</licenseUrl>
-    <releaseNotes>Add license file and SimpleExtension.Topshelf</releaseNotes>
+    <releaseNotes>Fix Logger</releaseNotes>
     <copyright>Copyright © A. Dartois 2017</copyright>
     <tags>Topshelf Squirrel Updater Service Auto Update Squirrel</tags>
     <!--