diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0742fcf5..a3748e4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,14 @@ jobs: shell: pwsh run: Compress-Archive -LiteralPath .\build\KSociety.Log.Install\bin\Release\net7.0\KSociety.Log.Install-${{ steps.nbgv.outputs.SimpleVersion }}-net7.0.exe -DestinationPath .\build\KSociety.Log.Install\bin\Release\net7.0\K-Society.Log-${{ steps.nbgv.outputs.SimpleVersion }}-net7.0.zip -Force + - name: Build KSociety.Log net8.0 + shell: cmd + run: ./build.cmd net8.0 + + - name: Zip Installer net8.0 + shell: pwsh + run: Compress-Archive -LiteralPath .\build\KSociety.Log.Install\bin\Release\net8.0\KSociety.Log.Install-${{ steps.nbgv.outputs.SimpleVersion }}-net8.0.exe -DestinationPath .\build\KSociety.Log.Install\bin\Release\net8.0\K-Society.Log-${{ steps.nbgv.outputs.SimpleVersion }}-net8.0.zip -Force + - name: Push to GitHub Packages if: github.event_name == 'push' && github.repository_owner == 'K-Society' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') run: dotnet nuget push "build/**/bin/Release/*.nupkg" --source https://nuget.pkg.github.com/K-Society/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate @@ -72,4 +80,5 @@ jobs: files: | ./build/KSociety.Log.Install/bin/Release/net6.0/K-Society.Log-${{ steps.nbgv.outputs.SimpleVersion }}-net6.0.zip ./build/KSociety.Log.Install/bin/Release/net7.0/K-Society.Log-${{ steps.nbgv.outputs.SimpleVersion }}-net7.0.zip + ./build/KSociety.Log.Install/bin/Release/net8.0/K-Society.Log-${{ steps.nbgv.outputs.SimpleVersion }}-net8.0.zip \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2b4d87f1..cb47c565 100644 --- a/.gitignore +++ b/.gitignore @@ -343,4 +343,6 @@ ASALocalRun/ .localhistory/ # BeatPulse healthcheck temp database -healthchecksdb \ No newline at end of file +healthchecksdb + +Visual Studio 2022/ \ No newline at end of file diff --git a/README.MD b/README.MD index 41332b9d..87b6fab5 100644 --- a/README.MD +++ b/README.MD @@ -118,44 +118,44 @@ The presentation layer. ### 1.1 Presentation - Web | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Pre.Web.App](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/01/Web/KSociety.Log.Pre.Web.App) | | | +| [KSociety.Log.Pre.Web.App](https://github.com/K-Society/KSociety.Log/tree/master/src/01/01/Web/KSociety.Log.Pre.Web.App) | | | ### 2. Service The service layer. | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Srv.Agent](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/02/KSociety.Log.Srv.Agent) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Agent)](https://www.nuget.org/packages/KSociety.Log.Srv.Agent) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Agent) | -| [KSociety.Log.Srv.Behavior](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/02/KSociety.Log.Srv.Behavior) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Behavior)](https://www.nuget.org/packages/KSociety.Log.Srv.Behavior) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Behavior) | -| [KSociety.Log.Srv.Contract](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/02/KSociety.Log.Srv.Contract) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Contract)](https://www.nuget.org/packages/KSociety.Log.Srv.Contract) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Contract) | -| [KSociety.Log.Srv.Dto](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/02/KSociety.Log.Srv.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Dto)](https://www.nuget.org/packages/KSociety.Log.Srv.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Dto) | +| [KSociety.Log.Srv.Agent](https://github.com/K-Society/KSociety.Log/tree/master/src/01/02/KSociety.Log.Srv.Agent) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Agent)](https://www.nuget.org/packages/KSociety.Log.Srv.Agent) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Agent) | +| [KSociety.Log.Srv.Behavior](https://github.com/K-Society/KSociety.Log/tree/master/src/01/02/KSociety.Log.Srv.Behavior) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Behavior)](https://www.nuget.org/packages/KSociety.Log.Srv.Behavior) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Behavior) | +| [KSociety.Log.Srv.Contract](https://github.com/K-Society/KSociety.Log/tree/master/src/01/02/KSociety.Log.Srv.Contract) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Contract)](https://www.nuget.org/packages/KSociety.Log.Srv.Contract) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Contract) | +| [KSociety.Log.Srv.Dto](https://github.com/K-Society/KSociety.Log/tree/master/src/01/02/KSociety.Log.Srv.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Srv.Dto)](https://www.nuget.org/packages/KSociety.Log.Srv.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Srv.Dto) | ### 2.1 Service - Host | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Srv.Host](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/02/Host/KSociety.Log.Srv.Host) | | | +| [KSociety.Log.Srv.Host](https://github.com/K-Society/KSociety.Log/tree/master/src/01/02/Host/KSociety.Log.Srv.Host) | | | ### 3. Application The application layer. | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.App.Dto](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/03/KSociety.Log.App.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.Dto)](https://www.nuget.org/packages/KSociety.Log.App.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.Dto) | -| [KSociety.Log.App.ReqHdlr](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/03/KSociety.Log.App.ReqHdlr) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.ReqHdlr)](https://www.nuget.org/packages/KSociety.Log.App.ReqHdlr) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.ReqHdlr) | +| [KSociety.Log.App.Dto](https://github.com/K-Society/KSociety.Log/tree/master/src/01/03/KSociety.Log.App.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.Dto)](https://www.nuget.org/packages/KSociety.Log.App.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.Dto) | +| [KSociety.Log.App.ReqHdlr](https://github.com/K-Society/KSociety.Log/tree/master/src/01/03/KSociety.Log.App.ReqHdlr) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.ReqHdlr)](https://www.nuget.org/packages/KSociety.Log.App.ReqHdlr) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.ReqHdlr) | ### 4. Business | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Biz](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/04/KSociety.Log.Biz) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz)](https://www.nuget.org/packages/KSociety.Log.Biz) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz) | -| [KSociety.Log.Biz.Event](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/04/KSociety.Log.Biz.Event) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz.Event)](https://www.nuget.org/packages/KSociety.Log.Biz.Event) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz.Event) | +| [KSociety.Log.Biz](https://github.com/K-Society/KSociety.Log/tree/master/src/01/04/KSociety.Log.Biz) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz)](https://www.nuget.org/packages/KSociety.Log.Biz) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz) | +| [KSociety.Log.Biz.Event](https://github.com/K-Society/KSociety.Log/tree/master/src/01/04/KSociety.Log.Biz.Event) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz.Event)](https://www.nuget.org/packages/KSociety.Log.Biz.Event) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz.Event) | ### Sink | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Serilog.Sinks.Grpc](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.Grpc)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.Grpc) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.Grpc) | -| [KSociety.Log.Serilog.Sinks.RabbitMq](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.RabbitMq)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.RabbitMq) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.RabbitMq) | -| [KSociety.Log.Serilog.Sinks.SignalR](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.SignalR)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.SignalR) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.SignalR) | +| [KSociety.Log.Serilog.Sinks.Grpc](https://github.com/K-Society/KSociety.Log/tree/master/src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.Grpc)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.Grpc) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.Grpc) | +| [KSociety.Log.Serilog.Sinks.RabbitMq](https://github.com/K-Society/KSociety.Log/tree/master/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.RabbitMq)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.RabbitMq) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.RabbitMq) | +| [KSociety.Log.Serilog.Sinks.SignalR](https://github.com/K-Society/KSociety.Log/tree/master/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.SignalR)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.SignalR) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.SignalR) | ## License The project is under Microsoft Reciprocal License [(MS-RL)](http://www.opensource.org/licenses/MS-RL) @@ -169,7 +169,7 @@ List of technologies, frameworks and libraries used for implementation: - [protobuf-net](https://github.com/protobuf-net/protobuf-net) (protobuf-net is a contract based serializer for .NET code) - [RabbitMQ.Client](https://www.rabbitmq.com/dotnet.html) (The RabbitMQ .NET client is an implementation of an AMQP 0-9-1 client library for C#) - [Serilog](https://serilog.net/) (structured logging) -- [KSociety.Base.App.Shared](https://github.com/K-Society/KSociety.Base/tree/develop/Src/01/03/KSociety.Base.App.Shared) () -- [KSociety.Base.EventBusRabbitMQ](https://github.com/K-Society/KSociety.Base/tree/master/Src/01/KSocietyBaseEventBus/KSociety.Base.EventBusRabbitMQ) () -- [KSociety.Base.Srv.Agent](https://github.com/K-Society/KSociety.Base/tree/develop/Src/01/02/KSociety.Base.Srv.Agent) () -- [KSociety.Base.Srv.Host.Shared](https://github.com/K-Society/KSociety.Base/tree/develop/Src/01/02/KSociety.Base.Srv.Shared) () +- [KSociety.Base.App.Shared](https://github.com/K-Society/KSociety.Base/tree/master/src/01/03/KSociety.Base.App.Shared) () +- [KSociety.Base.EventBusRabbitMQ](https://github.com/K-Society/KSociety.Base/tree/master/src/01/KSocietyBaseEventBus/KSociety.Base.EventBusRabbitMQ) () +- [KSociety.Base.Srv.Agent](https://github.com/K-Society/KSociety.Base/tree/master/src/01/02/KSociety.Base.Srv.Agent) () +- [KSociety.Base.Srv.Host.Shared](https://github.com/K-Society/KSociety.Base/tree/master/src/01/02/KSociety.Base.Srv.Shared) () diff --git a/Visual Studio 2022/Visualizers/attribcache140.bin b/Visual Studio 2022/Visualizers/attribcache140.bin deleted file mode 100644 index ebdbcf57..00000000 Binary files a/Visual Studio 2022/Visualizers/attribcache140.bin and /dev/null differ diff --git a/docs/KSociety.Log.App.Dto/README.md b/docs/KSociety.Log.App.Dto/README.md index 79d36d5e..cc204c71 100644 --- a/docs/KSociety.Log.App.Dto/README.md +++ b/docs/KSociety.Log.App.Dto/README.md @@ -15,7 +15,7 @@ The generic shared library. | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.App.Dto](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/03/KSociety.Log.App.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.Dto)](https://www.nuget.org/packages/KSociety.Log.App.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.Dto) | +| [KSociety.Log.App.Dto](https://github.com/K-Society/KSociety.Log/tree/master/src/01/03/KSociety.Log.App.Dto) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.App.Dto)](https://www.nuget.org/packages/KSociety.Log.App.Dto) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.App.Dto) | ## License The project is under Microsoft Reciprocal License [(MS-RL)](http://www.opensource.org/licenses/MS-RL) diff --git a/docs/KSociety.Log.Biz.Event/README.md b/docs/KSociety.Log.Biz.Event/README.md index fd874f5e..34b4bf2e 100644 --- a/docs/KSociety.Log.Biz.Event/README.md +++ b/docs/KSociety.Log.Biz.Event/README.md @@ -15,7 +15,7 @@ The generic shared library. | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Biz.Event](https://github.com/K-Society/KSociety.Log/tree/develop/Src/01/04/KSociety.Log.Biz.Event) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz.Event)](https://www.nuget.org/packages/KSociety.Log.Biz.Event) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz.Event) | +| [KSociety.Log.Biz.Event](https://github.com/K-Society/KSociety.Log/tree/master/src/01/04/KSociety.Log.Biz.Event) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Biz.Event)](https://www.nuget.org/packages/KSociety.Log.Biz.Event) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Biz.Event) | ## License The project is under Microsoft Reciprocal License [(MS-RL)](http://www.opensource.org/licenses/MS-RL) diff --git a/docs/KSociety.Log.Serilog.Sinks.RabbitMq/README.md b/docs/KSociety.Log.Serilog.Sinks.RabbitMq/README.md index eacc974d..ee4a3477 100644 --- a/docs/KSociety.Log.Serilog.Sinks.RabbitMq/README.md +++ b/docs/KSociety.Log.Serilog.Sinks.RabbitMq/README.md @@ -21,7 +21,7 @@ Serilog sink to transmit log messages to RabbitMQ. | GitHub Repository | NuGet | Download | | ------------- | ------------- | ------------- | -| [KSociety.Log.Serilog.Sinks.RabbitMq](https://github.com/K-Society/KSociety.Log/tree/master/Src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.RabbitMq)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.RabbitMq) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.RabbitMq) | +| [KSociety.Log.Serilog.Sinks.RabbitMq](https://github.com/K-Society/KSociety.Log/tree/master/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq) | [![NuGet](https://img.shields.io/nuget/v/KSociety.Log.Serilog.Sinks.RabbitMq)](https://www.nuget.org/packages/KSociety.Log.Serilog.Sinks.RabbitMq) | ![NuGet](https://img.shields.io/nuget/dt/KSociety.Log.Serilog.Sinks.RabbitMq) | ## License The project is under Microsoft Reciprocal License [(MS-RL)](http://www.opensource.org/licenses/MS-RL) diff --git a/src/00/Log/KSociety.Log.Install/KSociety.Log.Install.wixproj b/src/00/Log/KSociety.Log.Install/KSociety.Log.Install.wixproj index 9432dd31..456bde26 100644 --- a/src/00/Log/KSociety.Log.Install/KSociety.Log.Install.wixproj +++ b/src/00/Log/KSociety.Log.Install/KSociety.Log.Install.wixproj @@ -1,4 +1,4 @@ - + en-US KSociety.Log.Install @@ -6,7 +6,7 @@ Bundle - + diff --git a/src/00/Log/KSociety.LogServer.MsiSetup/KSociety.LogServer.MsiSetup.wixproj b/src/00/Log/KSociety.LogServer.MsiSetup/KSociety.LogServer.MsiSetup.wixproj index 3e193b78..77883b2d 100644 --- a/src/00/Log/KSociety.LogServer.MsiSetup/KSociety.LogServer.MsiSetup.wixproj +++ b/src/00/Log/KSociety.LogServer.MsiSetup/KSociety.LogServer.MsiSetup.wixproj @@ -1,4 +1,4 @@ - + en-US KSociety.LogServer @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/00/Log/KSociety.LogWebApp.MsiSetup/KSociety.LogWebApp.MsiSetup.wixproj b/src/00/Log/KSociety.LogWebApp.MsiSetup/KSociety.LogWebApp.MsiSetup.wixproj index 96d02352..4725b62a 100644 --- a/src/00/Log/KSociety.LogWebApp.MsiSetup/KSociety.LogWebApp.MsiSetup.wixproj +++ b/src/00/Log/KSociety.LogWebApp.MsiSetup/KSociety.LogWebApp.MsiSetup.wixproj @@ -1,4 +1,4 @@ - + en-US KSociety.LogWebApp @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/01/01/Web/KSociety.Log.Pre.Web.App/KSociety.Log.Pre.Web.App.csproj b/src/01/01/Web/KSociety.Log.Pre.Web.App/KSociety.Log.Pre.Web.App.csproj index d2e70fc6..f4ddb261 100644 --- a/src/01/01/Web/KSociety.Log.Pre.Web.App/KSociety.Log.Pre.Web.App.csproj +++ b/src/01/01/Web/KSociety.Log.Pre.Web.App/KSociety.Log.Pre.Web.App.csproj @@ -4,15 +4,15 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 true enable - - - + + + @@ -23,7 +23,12 @@ - + + + + + + diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj b/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj index 992e0dc7..27bf1a88 100644 --- a/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj +++ b/src/01/02/Host/KSociety.Log.Srv.Host/KSociety.Log.Srv.Host.csproj @@ -1,10 +1,10 @@ - + - net6.0;net7.0 + net6.0;net7.0;net8.0 dotnet-KSociety.Log.Srv.Host-9F369CD8-A40D-408E-AFC4-E87EEA70C3B6 Exe @@ -12,17 +12,17 @@ - - - + + + - - + + - - + + diff --git a/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj b/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj index 13b3b498..d2464cf9 100644 --- a/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj +++ b/src/01/02/KSociety.Log.Srv.Agent/KSociety.Log.Srv.Agent.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj b/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj index 147ce139..6bbde35a 100644 --- a/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj +++ b/src/01/02/KSociety.Log.Srv.Behavior/KSociety.Log.Srv.Behavior.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj b/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj index 938c4306..7e4da63f 100644 --- a/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj +++ b/src/01/03/KSociety.Log.App.Dto/KSociety.Log.App.Dto.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj b/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj index 29e2f69c..8d2e6cc4 100644 --- a/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj +++ b/src/01/04/KSociety.Log.Biz.Event/KSociety.Log.Biz.Event.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj b/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj index ee6a1bcb..d5a743ab 100644 --- a/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj +++ b/src/01/04/KSociety.Log.Biz/KSociety.Log.Biz.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc/KSociety.Log.Serilog.Sinks.Grpc.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc/KSociety.Log.Serilog.Sinks.Grpc.csproj index 9caa6ba8..208a0b88 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc/KSociety.Log.Serilog.Sinks.Grpc.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.Grpc/KSociety.Log.Serilog.Sinks.Grpc.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj index 2f4d1dab..37d94a9c 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.RabbitMq/KSociety.Log.Serilog.Sinks.RabbitMq.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared.csproj index 0030abd0..a6eeed43 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared/KSociety.Log.Serilog.Sinks.RichTextBox.Wpf.Shared.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj index 6ded31cf..1fe60bda 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.SignalR/KSociety.Log.Serilog.Sinks.SignalR.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/KSociety.Log.Serilog.Sinks.XUnit.csproj b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/KSociety.Log.Serilog.Sinks.XUnit.csproj index 26af6f29..2e97f621 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/KSociety.Log.Serilog.Sinks.XUnit.csproj +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/KSociety.Log.Serilog.Sinks.XUnit.csproj @@ -8,10 +8,10 @@ - + - - + + diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/MessageSinkExtensions.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/MessageSinkExtensions.cs index 07b165ee..c7fa9832 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/MessageSinkExtensions.cs +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/MessageSinkExtensions.cs @@ -1,4 +1,4 @@ -namespace KSociety.Log.Serilog.Sinks.XUnit +namespace KSociety.Log.Serilog.Sinks.XUnit { using System; using global::Serilog; @@ -26,11 +26,11 @@ public static class MessageSinkExtensions /// The Serilog logger that logs to . /// Thrown when is null. public static Logger CreateTestLogger( - this IMessageSink messageSink, + this IMessageSink? messageSink, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, string outputTemplate = TestOutputLoggerConfigurationExtensions.DefaultConsoleOutputTemplate, - IFormatProvider formatProvider = null, - LoggingLevelSwitch levelSwitch = null) + IFormatProvider? formatProvider = null, + LoggingLevelSwitch? levelSwitch = null) { return new LoggerConfiguration() .WriteTo.TestOutput( @@ -56,10 +56,10 @@ public static class MessageSinkExtensions /// Thrown when /// or is null. public static Logger CreateTestLogger( - this IMessageSink messageSink, + this IMessageSink? messageSink, ITextFormatter formatter, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, - LoggingLevelSwitch levelSwitch = null) + LoggingLevelSwitch? levelSwitch = null) { return new LoggerConfiguration() .WriteTo.TestOutput( diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/Sinks/XUnit/TestOutputSink.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/Sinks/XUnit/TestOutputSink.cs index d7d8a6ce..b6abc071 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/Sinks/XUnit/TestOutputSink.cs +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/Sinks/XUnit/TestOutputSink.cs @@ -13,8 +13,8 @@ namespace KSociety.Log.Serilog.Sinks.XUnit.Sinks.XUnit /// public class TestOutputSink : ILogEventSink { - private readonly IMessageSink _messageSink; - private readonly ITestOutputHelper _testOutputHelper; + private readonly IMessageSink? _messageSink; + private readonly ITestOutputHelper? _testOutputHelper; private readonly ITextFormatter _textFormatter; /// @@ -22,7 +22,7 @@ public class TestOutputSink : ILogEventSink /// /// An implementation that can be used to provide test output /// The used when rendering the message - public TestOutputSink(IMessageSink messageSink, ITextFormatter textFormatter) + public TestOutputSink(IMessageSink? messageSink, ITextFormatter textFormatter) { this._messageSink = messageSink ?? throw new ArgumentNullException(nameof(messageSink)); this._textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter)); @@ -33,7 +33,7 @@ public TestOutputSink(IMessageSink messageSink, ITextFormatter textFormatter) /// /// An implementation that can be used to provide test output /// The used when rendering the message - public TestOutputSink(ITestOutputHelper testOutputHelper, ITextFormatter textFormatter) + public TestOutputSink(ITestOutputHelper? testOutputHelper, ITextFormatter textFormatter) { this._testOutputHelper = testOutputHelper ?? throw new ArgumentNullException(nameof(testOutputHelper)); this._textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter)); diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/TestOutputHelperExtensions.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/TestOutputHelperExtensions.cs index d814f691..ed4d0eef 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/TestOutputHelperExtensions.cs +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/TestOutputHelperExtensions.cs @@ -26,7 +26,7 @@ public static class TestOutputHelperExtensions /// The Serilog logger that logs to . /// Thrown when is null. public static Logger CreateTestLogger( - this ITestOutputHelper testOutputHelper, + this ITestOutputHelper? testOutputHelper, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, string outputTemplate = TestOutputLoggerConfigurationExtensions.DefaultConsoleOutputTemplate, IFormatProvider formatProvider = null, @@ -56,7 +56,7 @@ public static class TestOutputHelperExtensions /// Thrown when /// or is null. public static Logger CreateTestLogger( - this ITestOutputHelper testOutputHelper, + this ITestOutputHelper? testOutputHelper, ITextFormatter formatter, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, LoggingLevelSwitch levelSwitch = null) diff --git a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs index 0b42e3f5..15bfcc74 100644 --- a/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs +++ b/src/01/Sink/KSociety.Log.Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs @@ -31,11 +31,11 @@ public static class TestOutputLoggerConfigurationExtensions /// Configuration object allowing method chaining. public static LoggerConfiguration TestOutput( this LoggerSinkConfiguration sinkConfiguration, - IMessageSink messageSink, + IMessageSink? messageSink, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, string outputTemplate = DefaultConsoleOutputTemplate, - IFormatProvider formatProvider = null, - LoggingLevelSwitch levelSwitch = null) + IFormatProvider? formatProvider = null, + LoggingLevelSwitch? levelSwitch = null) { if (sinkConfiguration == null) {throw new ArgumentNullException(nameof(sinkConfiguration));} if (messageSink == null) {throw new ArgumentNullException(nameof(messageSink));} @@ -59,10 +59,10 @@ public static class TestOutputLoggerConfigurationExtensions /// Configuration object allowing method chaining. public static LoggerConfiguration TestOutput( this LoggerSinkConfiguration sinkConfiguration, - IMessageSink messageSink, + IMessageSink? messageSink, ITextFormatter formatter, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, - LoggingLevelSwitch levelSwitch = null) + LoggingLevelSwitch? levelSwitch = null) { if (sinkConfiguration == null){ throw new ArgumentNullException(nameof(sinkConfiguration));} if (formatter == null) {throw new ArgumentNullException(nameof(formatter));} @@ -84,11 +84,11 @@ public static class TestOutputLoggerConfigurationExtensions /// Configuration object allowing method chaining. public static LoggerConfiguration TestOutput( this LoggerSinkConfiguration sinkConfiguration, - ITestOutputHelper testOutputHelper, + ITestOutputHelper? testOutputHelper, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, string outputTemplate = DefaultConsoleOutputTemplate, - IFormatProvider formatProvider = null, - LoggingLevelSwitch levelSwitch = null) + IFormatProvider? formatProvider = null, + LoggingLevelSwitch? levelSwitch = null) { if (sinkConfiguration == null) {throw new ArgumentNullException(nameof(sinkConfiguration));} if (testOutputHelper == null) {throw new ArgumentNullException(nameof(testOutputHelper));} @@ -112,10 +112,10 @@ public static class TestOutputLoggerConfigurationExtensions /// Configuration object allowing method chaining. public static LoggerConfiguration TestOutput( this LoggerSinkConfiguration sinkConfiguration, - ITestOutputHelper testOutputHelper, + ITestOutputHelper? testOutputHelper, ITextFormatter formatter, LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum, - LoggingLevelSwitch levelSwitch = null) + LoggingLevelSwitch? levelSwitch = null) { if (sinkConfiguration == null) {throw new ArgumentNullException(nameof(sinkConfiguration));} if (formatter == null) {throw new ArgumentNullException(nameof(formatter));} diff --git a/src/01/Sink/Test/KSociety.Log.Serilog.Sinks.Test/KSociety.Log.Serilog.Sinks.Test.csproj b/src/01/Sink/Test/KSociety.Log.Serilog.Sinks.Test/KSociety.Log.Serilog.Sinks.Test.csproj index fa061739..5bea71e9 100644 --- a/src/01/Sink/Test/KSociety.Log.Serilog.Sinks.Test/KSociety.Log.Serilog.Sinks.Test.csproj +++ b/src/01/Sink/Test/KSociety.Log.Serilog.Sinks.Test/KSociety.Log.Serilog.Sinks.Test.csproj @@ -9,9 +9,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2d7135bd..a8c1a32a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -42,7 +42,7 @@ all 3.6.133 - + all runtime; build; native; contentfiles; analyzers; buildtransitive