diff --git a/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj b/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj index 0ed9f43e6..eb9222b95 100644 --- a/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj +++ b/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj @@ -10,7 +10,7 @@ Discord.Audio Discord.Net.Audio 512 - v4.6 + v4.5 False diff --git a/src/Discord.Net.Audio/project.json b/src/Discord.Net.Audio/project.json index 52d0082c3..be5a82244 100644 --- a/src/Discord.Net.Audio/project.json +++ b/src/Discord.Net.Audio/project.json @@ -21,7 +21,7 @@ "Discord.Net": "0.9.0-alpha2" }, "frameworks": { - "net46": { }, + "net45": { }, "dotnet5.4": { } } } diff --git a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj index d8c6226f0..86089a243 100644 --- a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj +++ b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj @@ -10,7 +10,7 @@ Discord.Commands Discord.Net.Commands 512 - v4.6 + v4.5 False diff --git a/src/Discord.Net.Commands/project.json b/src/Discord.Net.Commands/project.json index 7073ae87d..18a38e200 100644 --- a/src/Discord.Net.Commands/project.json +++ b/src/Discord.Net.Commands/project.json @@ -19,7 +19,7 @@ "Discord.Net": "0.9.0-alpha2" }, "frameworks": { - "net46": { }, + "net45": { }, "dotnet5.4": { } } } diff --git a/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj b/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj index 37eb97f17..1291c2922 100644 --- a/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj +++ b/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj @@ -10,7 +10,7 @@ Discord.Modules Discord.Net.Modules 512 - v4.6 + v4.5 False diff --git a/src/Discord.Net.Modules/project.json b/src/Discord.Net.Modules/project.json index df6602a9c..636f79da5 100644 --- a/src/Discord.Net.Modules/project.json +++ b/src/Discord.Net.Modules/project.json @@ -20,7 +20,7 @@ "Discord.Net.Commands": "0.9.0-alpha2" }, "frameworks": { - "net46": { }, + "net45": { }, "dotnet5.4": { } } } diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index b9c5b4749..3ec6c67e1 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -10,7 +10,7 @@ Discord Discord.Net 512 - v4.6 + v4.5 False diff --git a/src/Discord.Net.Net45/packages.config b/src/Discord.Net.Net45/packages.config index a80cad623..b267bb536 100644 --- a/src/Discord.Net.Net45/packages.config +++ b/src/Discord.Net.Net45/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/Discord.Net/Logging/LogManager.cs b/src/Discord.Net/Logging/LogManager.cs index e4c2546e0..576ec7679 100644 --- a/src/Discord.Net/Logging/LogManager.cs +++ b/src/Discord.Net/Logging/LogManager.cs @@ -16,6 +16,7 @@ namespace Discord.Logging Level = client.Config.LogLevel; } +#if !NET45 public void Log(LogSeverity severity, string source, FormattableString message, Exception exception = null) { if (severity <= Level) @@ -24,6 +25,7 @@ namespace Discord.Logging catch { } //We dont want to log on log errors } } +#endif public void Log(LogSeverity severity, string source, string message, Exception exception = null) { if (severity <= Level) @@ -35,36 +37,46 @@ namespace Discord.Logging public void Error(string source, string message, Exception ex = null) => Log(LogSeverity.Error, source, message, ex); +#if !NET45 public void Error(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Error, source, message, ex); +#endif public void Error(string source, Exception ex) => Log(LogSeverity.Error, source, (string)null, ex); public void Warning(string source, string message, Exception ex = null) => Log(LogSeverity.Warning, source, message, ex); +#if !NET45 public void Warning(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Warning, source, message, ex); +#endif public void Warning(string source, Exception ex) => Log(LogSeverity.Warning, source, (string)null, ex); public void Info(string source, string message, Exception ex = null) => Log(LogSeverity.Info, source, message, ex); +#if !NET45 public void Info(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Info, source, message, ex); +#endif public void Info(string source, Exception ex) => Log(LogSeverity.Info, source, (string)null, ex); public void Verbose(string source, string message, Exception ex = null) => Log(LogSeverity.Verbose, source, message, ex); +#if !NET45 public void Verbose(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Verbose, source, message, ex); +#endif public void Verbose(string source, Exception ex) => Log(LogSeverity.Verbose, source, (string)null, ex); public void Debug(string source, string message, Exception ex = null) => Log(LogSeverity.Debug, source, message, ex); +#if !NET45 public void Debug(string source, FormattableString message, Exception ex = null) => Log(LogSeverity.Debug, source, message, ex); +#endif public void Debug(string source, Exception ex) => Log(LogSeverity.Debug, source, (string)null, ex); diff --git a/src/Discord.Net/Logging/Logger.cs b/src/Discord.Net/Logging/Logger.cs index f64520591..9d7a6111b 100644 --- a/src/Discord.Net/Logging/Logger.cs +++ b/src/Discord.Net/Logging/Logger.cs @@ -17,41 +17,53 @@ namespace Discord.Logging public void Log(LogSeverity severity, string message, Exception exception = null) => _manager.Log(severity, Name, message, exception); +#if !NET45 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 public void Error(FormattableString message, Exception exception = null) => _manager.Error(Name, message, exception); +#endif public void Error(Exception exception) => _manager.Error(Name, exception); public void Warning(string message, Exception exception = null) => _manager.Warning(Name, message, exception); +#if !NET45 public void Warning(FormattableString message, Exception exception = null) => _manager.Warning(Name, message, exception); +#endif public void Warning(Exception exception) => _manager.Warning(Name, exception); public void Info(string message, Exception exception = null) => _manager.Info(Name, message, exception); +#if !NET45 public void Info(FormattableString message, Exception exception = null) => _manager.Info(Name, message, exception); +#endif public void Info(Exception exception) => _manager.Info(Name, exception); public void Verbose(string message, Exception exception = null) => _manager.Verbose(Name, message, exception); +#if !NET45 public void Verbose(FormattableString message, Exception exception = null) => _manager.Verbose(Name, message, exception); +#endif public void Verbose(Exception exception) => _manager.Verbose(Name, exception); public void Debug(string message, Exception exception = null) => _manager.Debug(Name, message, exception); +#if !NET45 public void Debug(FormattableString message, Exception exception = null) => _manager.Debug(Name, message, exception); +#endif public void Debug(Exception exception) => _manager.Debug(Name, exception); } diff --git a/src/Discord.Net/project.json b/src/Discord.Net/project.json index 286e658f7..06979fd4d 100644 --- a/src/Discord.Net/project.json +++ b/src/Discord.Net/project.json @@ -33,7 +33,7 @@ }, "frameworks": { - "net46": { + "net45": { "dependencies": { "WebSocket4Net": "0.14.1", "RestSharp": "105.2.3"