From 86addc259495eaa9acc13954f995bc330683df5f Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 10 Feb 2016 17:18:31 -0400 Subject: [PATCH] Cleaned some compiler flags --- src/Discord.Net/Logging/ILogger.cs | 12 ++++++------ src/Discord.Net/Logging/LogManager.cs | 12 ++++++------ src/Discord.Net/Logging/Logger.cs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Discord.Net/Logging/ILogger.cs b/src/Discord.Net/Logging/ILogger.cs index 200f843e4..abc713cc2 100644 --- a/src/Discord.Net/Logging/ILogger.cs +++ b/src/Discord.Net/Logging/ILogger.cs @@ -7,36 +7,36 @@ namespace Discord.Logging LogSeverity Level { get; } void Log(LogSeverity severity, string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Log(LogSeverity severity, FormattableString message, Exception exception = null); #endif void Error(string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Error(FormattableString message, Exception exception = null); #endif void Error(Exception exception); void Warning(string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Warning(FormattableString message, Exception exception = null); #endif void Warning(Exception exception); void Info(string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Info(FormattableString message, Exception exception = null); #endif void Info(Exception exception); void Verbose(string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Verbose(FormattableString message, Exception exception = null); #endif void Verbose(Exception exception); void Debug(string message, Exception exception = null); -#if !NET45 +#if DOTNET5_4 void Debug(FormattableString message, Exception exception = null); #endif void Debug(Exception exception); diff --git a/src/Discord.Net/Logging/LogManager.cs b/src/Discord.Net/Logging/LogManager.cs index 576ec7679..425053abe 100644 --- a/src/Discord.Net/Logging/LogManager.cs +++ b/src/Discord.Net/Logging/LogManager.cs @@ -16,7 +16,7 @@ namespace Discord.Logging Level = client.Config.LogLevel; } -#if !NET45 +#if DOTNET5_4 public void Log(LogSeverity severity, string source, FormattableString message, Exception exception = null) { if (severity <= Level) @@ -37,7 +37,7 @@ namespace Discord.Logging public void Error(string source, string message, Exception ex = null) => Log(LogSeverity.Error, source, message, ex); -#if !NET45 +#if DOTNET5_4 public void Error(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Error, source, message, ex); #endif @@ -46,7 +46,7 @@ namespace Discord.Logging public void Warning(string source, string message, Exception ex = null) => Log(LogSeverity.Warning, source, message, ex); -#if !NET45 +#if DOTNET5_4 public void Warning(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Warning, source, message, ex); #endif @@ -55,7 +55,7 @@ namespace Discord.Logging public void Info(string source, string message, Exception ex = null) => Log(LogSeverity.Info, source, message, ex); -#if !NET45 +#if DOTNET5_4 public void Info(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Info, source, message, ex); #endif @@ -64,7 +64,7 @@ namespace Discord.Logging public void Verbose(string source, string message, Exception ex = null) => Log(LogSeverity.Verbose, source, message, ex); -#if !NET45 +#if DOTNET5_4 public void Verbose(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Verbose, source, message, ex); #endif @@ -73,7 +73,7 @@ namespace Discord.Logging public void Debug(string source, string message, Exception ex = null) => Log(LogSeverity.Debug, source, message, ex); -#if !NET45 +#if DOTNET5_4 public void Debug(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Debug, source, message, ex); #endif diff --git a/src/Discord.Net/Logging/Logger.cs b/src/Discord.Net/Logging/Logger.cs index 9b2683055..e3e917a24 100644 --- a/src/Discord.Net/Logging/Logger.cs +++ b/src/Discord.Net/Logging/Logger.cs @@ -17,14 +17,14 @@ namespace Discord.Logging public void Log(LogSeverity severity, string message, Exception exception = null) => _manager.Log(severity, Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Log(LogSeverity severity, FormattableString message, Exception exception = null) => _manager.Log(severity, Name, message, exception); #endif public void Error(string message, Exception exception = null) => _manager.Error(Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Error(FormattableString message, Exception exception = null) => _manager.Error(Name, message, exception); #endif @@ -33,7 +33,7 @@ namespace Discord.Logging public void Warning(string message, Exception exception = null) => _manager.Warning(Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Warning(FormattableString message, Exception exception = null) => _manager.Warning(Name, message, exception); #endif @@ -42,7 +42,7 @@ namespace Discord.Logging public void Info(string message, Exception exception = null) => _manager.Info(Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Info(FormattableString message, Exception exception = null) => _manager.Info(Name, message, exception); #endif @@ -51,7 +51,7 @@ namespace Discord.Logging public void Verbose(string message, Exception exception = null) => _manager.Verbose(Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Verbose(FormattableString message, Exception exception = null) => _manager.Verbose(Name, message, exception); #endif @@ -60,7 +60,7 @@ namespace Discord.Logging public void Debug(string message, Exception exception = null) => _manager.Debug(Name, message, exception); -#if !NET45 +#if DOTNET5_4 public void Debug(FormattableString message, Exception exception = null) => _manager.Debug(Name, message, exception); #endif