diff --git a/src/KissLog.CloudListeners/Constants.cs b/src/KissLog.CloudListeners/Constants.cs index f2cbb08..c0324b5 100644 --- a/src/KissLog.CloudListeners/Constants.cs +++ b/src/KissLog.CloudListeners/Constants.cs @@ -2,6 +2,6 @@ { internal class Constants { - public const string KissLogApiUrl = "https://api.kisslog.net"; + public const string LogBeeApiUrl = "https://api.logbee.net"; } } diff --git a/src/KissLog.CloudListeners/RequestLogsListener/RequestLogsApiListener.cs b/src/KissLog.CloudListeners/RequestLogsListener/RequestLogsApiListener.cs index dd85f0a..70ae706 100644 --- a/src/KissLog.CloudListeners/RequestLogsListener/RequestLogsApiListener.cs +++ b/src/KissLog.CloudListeners/RequestLogsListener/RequestLogsApiListener.cs @@ -17,7 +17,7 @@ public class RequestLogsApiListener : ILogListener public ILogListenerInterceptor Interceptor { get; set; } public bool UseAsync { get; set; } = true; - public string ApiUrl { get; set; } = Constants.KissLogApiUrl; + public string ApiUrl { get; set; } = Constants.LogBeeApiUrl; public bool IgnoreSslCertificate { get; set; } = false; public Action OnException { get; set; } public IObfuscationService ObfuscationService { get; set; } = new ObfuscationService(); diff --git a/src/KissLog/KissLog.csproj b/src/KissLog/KissLog.csproj index a28828d..5808bc0 100644 --- a/src/KissLog/KissLog.csproj +++ b/src/KissLog/KissLog.csproj @@ -75,7 +75,7 @@ Install this package on all the projects. - + diff --git a/src/KissLog/LoggerData/FilesContainer.cs b/src/KissLog/LoggerData/FilesContainer.cs index e38278d..5850cb2 100644 --- a/src/KissLog/LoggerData/FilesContainer.cs +++ b/src/KissLog/LoggerData/FilesContainer.cs @@ -31,7 +31,7 @@ public LoggedFile LogAsFile(string contents, string fileName = null) if(fileSize > Constants.MaximumAllowedFileSizeInBytes) { - _logger.Error(new FileSizeTooLargeException(fileSize, Constants.MaximumAllowedFileSizeInBytes)); + _logger.Debug(new FileSizeTooLargeException(fileSize, Constants.MaximumAllowedFileSizeInBytes).ToString()); return null; } @@ -69,7 +69,7 @@ public LoggedFile LogAsFile(byte[] contents, string fileName = null) if (fileSize > Constants.MaximumAllowedFileSizeInBytes) { - _logger.Error(new FileSizeTooLargeException(fileSize, Constants.MaximumAllowedFileSizeInBytes)); + _logger.Debug(new FileSizeTooLargeException(fileSize, Constants.MaximumAllowedFileSizeInBytes).ToString()); return null; } @@ -91,7 +91,7 @@ public LoggedFile LogAsFile(byte[] contents, string fileName = null) if (temporaryFile != null) temporaryFile.Dispose(); - _logger.Error(new LogByteArrayAsFileException(contents, ex)); + _logger.Debug(new LogByteArrayAsFileException(contents, ex).ToString()); return null; } @@ -108,13 +108,13 @@ public LoggedFile LogFile(string sourceFilePath, string fileName = null) if(!fi.Exists) { - _logger.Error(new LogFileException(sourceFilePath, new FileNotFoundException(null, sourceFilePath))); + _logger.Debug(new LogFileException(sourceFilePath, new FileNotFoundException(null, sourceFilePath)).ToString()); return null; } if (fi.Length > Constants.MaximumAllowedFileSizeInBytes) { - _logger.Error(new FileSizeTooLargeException(fi.Length, Constants.MaximumAllowedFileSizeInBytes)); + _logger.Debug(new FileSizeTooLargeException(fi.Length, Constants.MaximumAllowedFileSizeInBytes).ToString()); return null; } @@ -138,7 +138,7 @@ public LoggedFile LogFile(string sourceFilePath, string fileName = null) if (temporaryFile != null) temporaryFile.Dispose(); - _logger.Error(new LogFileException(sourceFilePath, ex)); + _logger.Debug(new LogFileException(sourceFilePath, ex).ToString()); return null; } diff --git a/testApps/AspNet.Mvc/AspNet.Mvc.csproj b/testApps/AspNet.Mvc/AspNet.Mvc.csproj index 87deb63..f8254b5 100644 --- a/testApps/AspNet.Mvc/AspNet.Mvc.csproj +++ b/testApps/AspNet.Mvc/AspNet.Mvc.csproj @@ -1,5 +1,4 @@  - Debug @@ -13,7 +12,7 @@ Properties AspNet.Mvc AspNet.Mvc - v4.7.2 + v4.8.1 true @@ -44,29 +43,35 @@ 4 - - packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -80,40 +85,32 @@ - - - - - - - - - - packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.dll - - - packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Deployment.dll + + + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.Helpers.dll - - packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Webpages.Razor.dll + + packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll - - packages\Microsoft.AspNet.Webpages.3.2.7\lib\net45\System.Web.Helpers.dll + + packages\Microsoft.AspNet.Razor.3.3.0\lib\net45\System.Web.Razor.dll - - packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.dll - - packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Deployment.dll - - packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Razor.dll + + + + + @@ -185,11 +182,12 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - - - - - - - + + + + + + + + - + - - + + + + + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/testApps/AspNet.Mvc/packages.config b/testApps/AspNet.Mvc/packages.config index 8744ff2..b2dd67d 100644 --- a/testApps/AspNet.Mvc/packages.config +++ b/testApps/AspNet.Mvc/packages.config @@ -1,17 +1,17 @@  - - - - - - + + + + + + - + - - - + + + - + \ No newline at end of file diff --git a/testApps/AspNet.WebApi/AspNet.WebApi.csproj b/testApps/AspNet.WebApi/AspNet.WebApi.csproj index ebb6ddc..207d20d 100644 --- a/testApps/AspNet.WebApi/AspNet.WebApi.csproj +++ b/testApps/AspNet.WebApi/AspNet.WebApi.csproj @@ -43,21 +43,37 @@ 4 - - packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll + + + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + - - packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll + + packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + + + + packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + @@ -67,11 +83,11 @@ - - packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll + + packages\Microsoft.AspNet.WebApi.Core.5.3.0\lib\net45\System.Web.Http.dll - - packages\Microsoft.AspNet.WebApi.WebHost.5.2.9\lib\net45\System.Web.Http.WebHost.dll + + packages\Microsoft.AspNet.WebApi.WebHost.5.3.0\lib\net45\System.Web.Http.WebHost.dll @@ -100,7 +116,6 @@ Web.config - {8b09066a-48cc-41df-959e-6a6beb26ddce} @@ -144,12 +159,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - - - + + + @@ -41,12 +41,6 @@ - - - - - - @@ -55,4 +49,10 @@ + + + + + + \ No newline at end of file diff --git a/testApps/AspNet.WebApi/packages.config b/testApps/AspNet.WebApi/packages.config index a65ed47..4f6b25f 100644 --- a/testApps/AspNet.WebApi/packages.config +++ b/testApps/AspNet.WebApi/packages.config @@ -1,10 +1,15 @@  - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/testApps/NLog_AspNet.Mvc/Global.asax.cs b/testApps/NLog_AspNet.Mvc/Global.asax.cs index 5ffd9f9..091edc8 100644 --- a/testApps/NLog_AspNet.Mvc/Global.asax.cs +++ b/testApps/NLog_AspNet.Mvc/Global.asax.cs @@ -60,9 +60,9 @@ private void ConfigureKissLog() // register listeners KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new KissLog.CloudListeners.Auth.Application(ConfigurationManager.AppSettings["KissLog.OrganizationId"], ConfigurationManager.AppSettings["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new KissLog.CloudListeners.Auth.Application(ConfigurationManager.AppSettings["LogBee.OrganizationId"], ConfigurationManager.AppSettings["LogBee.ApplicationId"])) { - ApiUrl = ConfigurationManager.AppSettings["KissLog.ApiUrl"], + ApiUrl = ConfigurationManager.AppSettings["LogBee.ApiUrl"], Interceptor = new StatusCodeInterceptor { MinimumLogMessageLevel = LogLevel.Trace, diff --git a/testApps/NLog_AspNet.Mvc/NLog_AspNet.Mvc.csproj b/testApps/NLog_AspNet.Mvc/NLog_AspNet.Mvc.csproj index a8159af..38a91ff 100644 --- a/testApps/NLog_AspNet.Mvc/NLog_AspNet.Mvc.csproj +++ b/testApps/NLog_AspNet.Mvc/NLog_AspNet.Mvc.csproj @@ -12,7 +12,7 @@ Properties NLog_AspNet.Mvc NLog_AspNet.Mvc - v4.7.2 + v4.8.1 true @@ -43,18 +43,18 @@ 4 - - packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - packages\NLog.4.7.12\lib\net45\NLog.dll + + packages\NLog.5.3.2\lib\net46\NLog.dll packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -73,11 +73,11 @@ - - packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll + + packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll + + packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -92,26 +92,26 @@ - + - packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.Helpers.dll - - packages\Microsoft.AspNet.Mvc.5.2.9\lib\net45\System.Web.Mvc.dll + + packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll - packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll + packages\Microsoft.AspNet.Razor.3.3.0\lib\net45\System.Web.Razor.dll - packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.dll - packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Deployment.dll + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Deployment.dll - packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll + packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Razor.dll @@ -195,12 +195,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - - - - - - - + + + + + + + + - - + + - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/testApps/NLog_AspNet.Mvc/packages.config b/testApps/NLog_AspNet.Mvc/packages.config index 757f06e..b3fb5a9 100644 --- a/testApps/NLog_AspNet.Mvc/packages.config +++ b/testApps/NLog_AspNet.Mvc/packages.config @@ -1,18 +1,18 @@  - - - - - + + + + + - + - - + + \ No newline at end of file diff --git a/testApps/NLog_ConsoleApp_NetFramework/App.config b/testApps/NLog_ConsoleApp_NetFramework/App.config index d78a215..8aafa76 100644 --- a/testApps/NLog_ConsoleApp_NetFramework/App.config +++ b/testApps/NLog_ConsoleApp_NetFramework/App.config @@ -1,19 +1,27 @@  - + - - - + + + - + + + + + + + + + - \ No newline at end of file + diff --git a/testApps/NLog_ConsoleApp_NetFramework/NLog_ConsoleApp_NetFramework.csproj b/testApps/NLog_ConsoleApp_NetFramework/NLog_ConsoleApp_NetFramework.csproj index 62b3324..bedfe17 100644 --- a/testApps/NLog_ConsoleApp_NetFramework/NLog_ConsoleApp_NetFramework.csproj +++ b/testApps/NLog_ConsoleApp_NetFramework/NLog_ConsoleApp_NetFramework.csproj @@ -8,10 +8,11 @@ Exe NLog_ConsoleApp_NetFramework NLog_ConsoleApp_NetFramework - v4.6.1 + v4.8.1 512 true true + AnyCPU @@ -33,11 +34,11 @@ 4 - - packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll - - packages\NLog.4.7.12\lib\net45\NLog.dll + + packages\NLog.5.3.2\lib\net46\NLog.dll @@ -46,23 +47,23 @@ - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + packages\System.Text.Encodings.Web.8.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/testApps/NLog_ConsoleApp_NetFramework/Program.cs b/testApps/NLog_ConsoleApp_NetFramework/Program.cs index f567a5c..21ec7aa 100644 --- a/testApps/NLog_ConsoleApp_NetFramework/Program.cs +++ b/testApps/NLog_ConsoleApp_NetFramework/Program.cs @@ -36,9 +36,9 @@ private static void ConfigureKissLog() }; KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new Application(ConfigurationManager.AppSettings["KissLog.OrganizationId"], ConfigurationManager.AppSettings["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(ConfigurationManager.AppSettings["LogBee.OrganizationId"], ConfigurationManager.AppSettings["LogBee.ApplicationId"])) { - ApiUrl = ConfigurationManager.AppSettings["KissLog.ApiUrl"], + ApiUrl = ConfigurationManager.AppSettings["LogBee.ApiUrl"], UseAsync = false }); } diff --git a/testApps/NLog_ConsoleApp_NetFramework/packages.config b/testApps/NLog_ConsoleApp_NetFramework/packages.config index 075faa3..31ebf98 100644 --- a/testApps/NLog_ConsoleApp_NetFramework/packages.config +++ b/testApps/NLog_ConsoleApp_NetFramework/packages.config @@ -1,13 +1,13 @@  - - + + - + - - - + + + - + \ No newline at end of file diff --git a/testApps/dotnet6_ConsoleApp/Program.cs b/testApps/dotnet6_ConsoleApp/Program.cs index 0be7ebf..1718a15 100644 --- a/testApps/dotnet6_ConsoleApp/Program.cs +++ b/testApps/dotnet6_ConsoleApp/Program.cs @@ -68,9 +68,10 @@ IServiceProvider ConfigureServices(IConfiguration configuration) void ConfigureKissLog(IConfiguration configuration) { KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new Application(configuration["KissLog.OrganizationId"], configuration["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(configuration["LogBee.OrganizationId"], configuration["LogBee.ApplicationId"])) { - ApiUrl = configuration["KissLog.ApiUrl"] + ApiUrl = configuration["LogBee.ApiUrl"], + UseAsync = false }); KissLogConfiguration.Listeners diff --git a/testApps/dotnet6_ConsoleApp/appsettings.json b/testApps/dotnet6_ConsoleApp/appsettings.json index 9d66ac4..e1685aa 100644 --- a/testApps/dotnet6_ConsoleApp/appsettings.json +++ b/testApps/dotnet6_ConsoleApp/appsettings.json @@ -4,8 +4,7 @@ "Default": "Trace" } }, - - "KissLog.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", - "KissLog.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", - "KissLog.ApiUrl": "https://api.kisslog.net" + "LogBee.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", + "LogBee.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", + "LogBee.ApiUrl": "https://api.logbee.net/" } diff --git a/testApps/dotnet6_ConsoleApp/dotnet6_ConsoleApp.csproj b/testApps/dotnet6_ConsoleApp/dotnet6_ConsoleApp.csproj index 9929116..1b1146c 100644 --- a/testApps/dotnet6_ConsoleApp/dotnet6_ConsoleApp.csproj +++ b/testApps/dotnet6_ConsoleApp/dotnet6_ConsoleApp.csproj @@ -8,12 +8,12 @@ - - - - - - + + + + + + diff --git a/testApps/dotnet6_WebApp/Program.cs b/testApps/dotnet6_WebApp/Program.cs index b9434ff..27f5bdc 100644 --- a/testApps/dotnet6_WebApp/Program.cs +++ b/testApps/dotnet6_WebApp/Program.cs @@ -39,9 +39,9 @@ app.UseKissLogMiddleware(options => { options.Listeners - .Add(new RequestLogsApiListener(new Application(builder.Configuration["KissLog.OrganizationId"], builder.Configuration["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(builder.Configuration["LogBee.OrganizationId"], builder.Configuration["LogBee.ApplicationId"])) { - ApiUrl = builder.Configuration["KissLog.ApiUrl"] + ApiUrl = builder.Configuration["LogBee.ApiUrl"] }); options.Listeners diff --git a/testApps/dotnet6_WebApp/appsettings.json b/testApps/dotnet6_WebApp/appsettings.json index 851bfba..385ba4c 100644 --- a/testApps/dotnet6_WebApp/appsettings.json +++ b/testApps/dotnet6_WebApp/appsettings.json @@ -6,7 +6,7 @@ } }, "AllowedHosts": "*", - "KissLog.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", - "KissLog.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", - "KissLog.ApiUrl": "https://api.kisslog.net" + "LogBee.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", + "LogBee.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", + "LogBee.ApiUrl": "https://api.logbee.net/" } diff --git a/testApps/dotnetcore_3.1_ConsoleApp/Program.cs b/testApps/dotnetcore_3.1_ConsoleApp/Program.cs index 7b4a0a8..91a6b70 100644 --- a/testApps/dotnetcore_3.1_ConsoleApp/Program.cs +++ b/testApps/dotnetcore_3.1_ConsoleApp/Program.cs @@ -78,9 +78,10 @@ static IHostBuilder CreateHostBuilder() static void ConfigureKissLog(IConfiguration configuration) { KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new Application(configuration["KissLog.OrganizationId"], configuration["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(configuration["LogBee.OrganizationId"], configuration["LogBee.ApplicationId"])) { - ApiUrl = configuration["KissLog.ApiUrl"] + ApiUrl = configuration["LogBee.ApiUrl"], + UseAsync = false }); KissLogConfiguration.Listeners diff --git a/testApps/dotnetcore_3.1_ConsoleApp/Program_simple.cs b/testApps/dotnetcore_3.1_ConsoleApp/Program_simple.cs index 63ca9f7..13dc56c 100644 --- a/testApps/dotnetcore_3.1_ConsoleApp/Program_simple.cs +++ b/testApps/dotnetcore_3.1_ConsoleApp/Program_simple.cs @@ -77,9 +77,10 @@ static IServiceProvider ConfigureServices(IConfiguration configuration) static void ConfigureKissLog(IConfiguration configuration) { KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new Application(configuration["KissLog.OrganizationId"], configuration["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(configuration["LogBee.OrganizationId"], configuration["LogBee.ApplicationId"])) { - ApiUrl = configuration["KissLog.ApiUrl"] + ApiUrl = configuration["LogBee.ApiUrl"], + UseAsync = false }); KissLogConfiguration.Listeners diff --git a/testApps/dotnetcore_3.1_ConsoleApp/appsettings.json b/testApps/dotnetcore_3.1_ConsoleApp/appsettings.json index d0c6832..a71332b 100644 --- a/testApps/dotnetcore_3.1_ConsoleApp/appsettings.json +++ b/testApps/dotnetcore_3.1_ConsoleApp/appsettings.json @@ -5,7 +5,7 @@ } }, - "KissLog.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", - "KissLog.ApplicationId": "70632bac-7c20-446e-9109-49b4f91203f2", - "KissLog.ApiUrl": "https://api.kisslog.net" + "LogBee.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", + "LogBee.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", + "LogBee.ApiUrl": "https://api.logbee.net/" } diff --git a/testApps/dotnetcore_3.1_WebApp/Startup.cs b/testApps/dotnetcore_3.1_WebApp/Startup.cs index 9be43a9..1797227 100644 --- a/testApps/dotnetcore_3.1_WebApp/Startup.cs +++ b/testApps/dotnetcore_3.1_WebApp/Startup.cs @@ -79,9 +79,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) private void ConfigureKissLog(IOptionsBuilder options) { options.Listeners - .Add(new RequestLogsApiListener(new Application(Configuration["KissLog.OrganizationId"], Configuration["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(Configuration["LogBee.OrganizationId"], Configuration["LogBee.ApplicationId"])) { - ApiUrl = Configuration["KissLog.ApiUrl"] + ApiUrl = Configuration["LogBee.ApiUrl"] }); options.Listeners diff --git a/testApps/dotnetcore_3.1_WebApp/appsettings.json b/testApps/dotnetcore_3.1_WebApp/appsettings.json index 3f850fb..b150b16 100644 --- a/testApps/dotnetcore_3.1_WebApp/appsettings.json +++ b/testApps/dotnetcore_3.1_WebApp/appsettings.json @@ -8,7 +8,7 @@ }, "AllowedHosts": "*", - "KissLog.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", - "KissLog.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", - "KissLog.ApiUrl": "https://api.kisslog.net" + "LogBee.OrganizationId": "0337cd29-a56e-42c1-a48a-e900f3116aa8", + "LogBee.ApplicationId": "4f729841-b103-460e-a87c-be6bd72f0cc9", + "LogBee.ApiUrl": "https://api.logbee.net/" } diff --git a/testApps/examples/EntityFrameworkValidationExample/EntityFrameworkValidationExample.csproj b/testApps/examples/EntityFrameworkValidationExample/EntityFrameworkValidationExample.csproj index 5eb314a..a758b27 100644 --- a/testApps/examples/EntityFrameworkValidationExample/EntityFrameworkValidationExample.csproj +++ b/testApps/examples/EntityFrameworkValidationExample/EntityFrameworkValidationExample.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net8.0 - - - + + + diff --git a/testApps/examples/MongoDbListenerExample/MongoDbListenerExample.csproj b/testApps/examples/MongoDbListenerExample/MongoDbListenerExample.csproj index ccb8f1b..8e48bd0 100644 --- a/testApps/examples/MongoDbListenerExample/MongoDbListenerExample.csproj +++ b/testApps/examples/MongoDbListenerExample/MongoDbListenerExample.csproj @@ -1,11 +1,11 @@ - net5.0 + net6.0 - + diff --git a/testApps/netframework_ConsoleApp/App.config b/testApps/netframework_ConsoleApp/App.config index 48f9f15..87609cd 100644 --- a/testApps/netframework_ConsoleApp/App.config +++ b/testApps/netframework_ConsoleApp/App.config @@ -4,8 +4,8 @@ - - - + + + \ No newline at end of file diff --git a/testApps/netframework_ConsoleApp/Program.cs b/testApps/netframework_ConsoleApp/Program.cs index a4b3e68..0ac2dec 100644 --- a/testApps/netframework_ConsoleApp/Program.cs +++ b/testApps/netframework_ConsoleApp/Program.cs @@ -37,9 +37,9 @@ static void Main(string[] args) static void ConfigureKissLog() { KissLogConfiguration.Listeners - .Add(new RequestLogsApiListener(new Application(ConfigurationManager.AppSettings["KissLog.OrganizationId"], ConfigurationManager.AppSettings["KissLog.ApplicationId"])) + .Add(new RequestLogsApiListener(new Application(ConfigurationManager.AppSettings["LogBee.OrganizationId"], ConfigurationManager.AppSettings["LogBee.ApplicationId"])) { - ApiUrl = ConfigurationManager.AppSettings["KissLog.ApiUrl"], + ApiUrl = ConfigurationManager.AppSettings["LogBee.ApiUrl"], UseAsync = false }); diff --git a/testApps/netframework_ConsoleApp/netframework_ConsoleApp.csproj b/testApps/netframework_ConsoleApp/netframework_ConsoleApp.csproj index 5ec8e2a..62839fd 100644 --- a/testApps/netframework_ConsoleApp/netframework_ConsoleApp.csproj +++ b/testApps/netframework_ConsoleApp/netframework_ConsoleApp.csproj @@ -35,19 +35,20 @@ - - packages\System.Configuration.ConfigurationManager.5.0.0\lib\net461\System.Configuration.ConfigurationManager.dll + + packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + - - packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll + + packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - packages\System.Security.Permissions.5.0.0\lib\net461\System.Security.Permissions.dll + + packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll diff --git a/testApps/netframework_ConsoleApp/packages.config b/testApps/netframework_ConsoleApp/packages.config index 2420592..f241244 100644 --- a/testApps/netframework_ConsoleApp/packages.config +++ b/testApps/netframework_ConsoleApp/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/tests/KissLog.AspNet.Mvc.Tests/KissLog.AspNet.Mvc.Tests.csproj b/tests/KissLog.AspNet.Mvc.Tests/KissLog.AspNet.Mvc.Tests.csproj index 87f0091..15c4d10 100644 --- a/tests/KissLog.AspNet.Mvc.Tests/KissLog.AspNet.Mvc.Tests.csproj +++ b/tests/KissLog.AspNet.Mvc.Tests/KissLog.AspNet.Mvc.Tests.csproj @@ -6,11 +6,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/KissLog.AspNet.Web.Tests/KissLog.AspNet.Web.Tests.csproj b/tests/KissLog.AspNet.Web.Tests/KissLog.AspNet.Web.Tests.csproj index e73da82..9eb9849 100644 --- a/tests/KissLog.AspNet.Web.Tests/KissLog.AspNet.Web.Tests.csproj +++ b/tests/KissLog.AspNet.Web.Tests/KissLog.AspNet.Web.Tests.csproj @@ -6,11 +6,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/KissLog.AspNet.WebApi.Tests/KissLog.AspNet.WebApi.Tests.csproj b/tests/KissLog.AspNet.WebApi.Tests/KissLog.AspNet.WebApi.Tests.csproj index 9815b24..c4febb0 100644 --- a/tests/KissLog.AspNet.WebApi.Tests/KissLog.AspNet.WebApi.Tests.csproj +++ b/tests/KissLog.AspNet.WebApi.Tests/KissLog.AspNet.WebApi.Tests.csproj @@ -6,11 +6,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/KissLog.AspNetCore.Tests/KissLog.AspNetCore.Tests.csproj b/tests/KissLog.AspNetCore.Tests/KissLog.AspNetCore.Tests.csproj index 0dadb89..27d6608 100644 --- a/tests/KissLog.AspNetCore.Tests/KissLog.AspNetCore.Tests.csproj +++ b/tests/KissLog.AspNetCore.Tests/KissLog.AspNetCore.Tests.csproj @@ -6,11 +6,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/KissLog.CloudListeners.Tests/KissLog.CloudListeners.Tests.csproj b/tests/KissLog.CloudListeners.Tests/KissLog.CloudListeners.Tests.csproj index 1ef99fe..7c21a71 100644 --- a/tests/KissLog.CloudListeners.Tests/KissLog.CloudListeners.Tests.csproj +++ b/tests/KissLog.CloudListeners.Tests/KissLog.CloudListeners.Tests.csproj @@ -7,11 +7,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/KissLog.CloudListeners.Tests/RequestLogsListener/RequestLogsApiListenerTests.cs b/tests/KissLog.CloudListeners.Tests/RequestLogsListener/RequestLogsApiListenerTests.cs index bdbc44f..c016c46 100644 --- a/tests/KissLog.CloudListeners.Tests/RequestLogsListener/RequestLogsApiListenerTests.cs +++ b/tests/KissLog.CloudListeners.Tests/RequestLogsListener/RequestLogsApiListenerTests.cs @@ -29,7 +29,7 @@ public void ApiUrlHasADefaultValue() var application = new Application("organizationId", "applicationId"); var listener = new RequestLogsApiListener(application); - Assert.AreEqual(Constants.KissLogApiUrl, listener.ApiUrl); + Assert.AreEqual(Constants.LogBeeApiUrl, listener.ApiUrl); } [TestMethod] diff --git a/tests/KissLog.RestClient.Tests/KissLog.RestClient.Tests.csproj b/tests/KissLog.RestClient.Tests/KissLog.RestClient.Tests.csproj index da14cd7..69c6fde 100644 --- a/tests/KissLog.RestClient.Tests/KissLog.RestClient.Tests.csproj +++ b/tests/KissLog.RestClient.Tests/KissLog.RestClient.Tests.csproj @@ -6,10 +6,13 @@ - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/tests/KissLog.Tests/KissLog.Tests.csproj b/tests/KissLog.Tests/KissLog.Tests.csproj index 461c647..5623809 100644 --- a/tests/KissLog.Tests/KissLog.Tests.csproj +++ b/tests/KissLog.Tests/KissLog.Tests.csproj @@ -14,7 +14,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/KissLog.Tests/LoggerData/FilesContainerTests.cs b/tests/KissLog.Tests/LoggerData/FilesContainerTests.cs index 7b81818..6069749 100644 --- a/tests/KissLog.Tests/LoggerData/FilesContainerTests.cs +++ b/tests/KissLog.Tests/LoggerData/FilesContainerTests.cs @@ -238,7 +238,7 @@ public void LogStringAsFileLogsErrorMessageWhenFileSizeIsTooLarge() LogMessage message = logger.DataContainer.LogMessages.FirstOrDefault(); Assert.IsNotNull(message); - Assert.AreEqual(LogLevel.Error, message.LogLevel); + Assert.AreEqual(LogLevel.Debug, message.LogLevel); Assert.IsTrue(message.Message.Contains(ex.Message)); } @@ -259,7 +259,7 @@ public void LogByteArrayAsFileLogsErrorMessageWhenFileSizeIsTooLarge() LogMessage message = logger.DataContainer.LogMessages.FirstOrDefault(); Assert.IsNotNull(message); - Assert.AreEqual(LogLevel.Error, message.LogLevel); + Assert.AreEqual(LogLevel.Debug, message.LogLevel); Assert.IsTrue(message.Message.Contains(ex.Message)); } @@ -285,7 +285,7 @@ public void LogFileLogsErrorMessageWhenFileSizeIsTooLarge() LogMessage message = logger.DataContainer.LogMessages.FirstOrDefault(); Assert.IsNotNull(message); - Assert.AreEqual(LogLevel.Error, message.LogLevel); + Assert.AreEqual(LogLevel.Debug, message.LogLevel); Assert.IsTrue(message.Message.Contains(ex.Message)); } @@ -309,7 +309,7 @@ public void LogFileLogsErrorMessageWhenFileWasNotFound() LogMessage message = logger.DataContainer.LogMessages.FirstOrDefault(); Assert.IsNotNull(message); - Assert.AreEqual(LogLevel.Error, message.LogLevel); + Assert.AreEqual(LogLevel.Debug, message.LogLevel); Assert.IsTrue(message.Message.Contains(ex.Message)); } } diff --git a/tests/adapters/KissLog.Adapters.NLog.Tests/KissLog.Adapters.NLog.Tests.csproj b/tests/adapters/KissLog.Adapters.NLog.Tests/KissLog.Adapters.NLog.Tests.csproj index 05869c0..cc035cb 100644 --- a/tests/adapters/KissLog.Adapters.NLog.Tests/KissLog.Adapters.NLog.Tests.csproj +++ b/tests/adapters/KissLog.Adapters.NLog.Tests/KissLog.Adapters.NLog.Tests.csproj @@ -6,11 +6,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/tests/adapters/KissLog.Adapters.log4net.Tests/KissLog.Adapters.log4net.Tests.csproj b/tests/adapters/KissLog.Adapters.log4net.Tests/KissLog.Adapters.log4net.Tests.csproj index 4e7a982..6798986 100644 --- a/tests/adapters/KissLog.Adapters.log4net.Tests/KissLog.Adapters.log4net.Tests.csproj +++ b/tests/adapters/KissLog.Adapters.log4net.Tests/KissLog.Adapters.log4net.Tests.csproj @@ -5,11 +5,14 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + +