Merge pull request #14 from skoruba/release/1.1.0

Release/1.1.0
skoruba · Jan 18, 2023 · 5d313fb · 5d313fb
2 parents 1982a75 + babc50a
commit 5d313fb
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -3,12 +3,12 @@
 # 🕊️ Skoruba.AuditLogging
 > Simple audit logging for .NET Core with EntityFramework Core support
 
-**This project is ported to .NET Core 3.1.** 🚀
+**This project is ported to .NET 6.** 🚀
 
 # How to install
 
 ```ps
-dotnet add package Skoruba.AuditLogging.EntityFramework --version 1.0.0
+dotnet add package Skoruba.AuditLogging.EntityFramework --version 1.1.0
 ```
 
 # How to use it
@@ -18,6 +18,7 @@ dotnet add package Skoruba.AuditLogging.EntityFramework --version 1.0.0
 ```csharp
 services.AddAuditLogging(options =>
                 {
+                    options.Enabled = true;
                     options.UseDefaultSubject = true;
                     options.UseDefaultAction = true;
                 })

diff --git a/src/Skoruba.AuditLogging.EntityFramework/Skoruba.AuditLogging.EntityFramework.csproj b/src/Skoruba.AuditLogging.EntityFramework/Skoruba.AuditLogging.EntityFramework.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <Version>1.0.0</Version>
+        <TargetFramework>net6.0</TargetFramework>
+        <Version>1.1.0</Version>
         <Description>Simple audit logging for .NET Core with EntityFramework Core support</Description>
         <PackageProjectUrl></PackageProjectUrl>
         <RepositoryUrl>https://github.com/skoruba/AuditLogging</RepositoryUrl>
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Skoruba.AuditLogging.Host/Skoruba.AuditLogging.Host.csproj b/src/Skoruba.AuditLogging.Host/Skoruba.AuditLogging.Host.csproj
@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
         <UserSecretsId>5cc61b65-f1d1-4aa9-be20-fbf67d81e116</UserSecretsId>
     </PropertyGroup>
 
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1">
+	<ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Skoruba.AuditLogging.Host/Startup.cs b/src/Skoruba.AuditLogging.Host/Startup.cs
@@ -45,6 +45,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddAuditLogging(options =>
                 {
+                    options.Enabled = true;
                     options.UseDefaultAction = true;
                     options.UseDefaultSubject = true;
                     options.Source = typeof(Program).Assembly.GetName().Name;

diff --git a/src/Skoruba.AuditLogging/Configuration/AuditLoggerOptions.cs b/src/Skoruba.AuditLogging/Configuration/AuditLoggerOptions.cs
@@ -2,6 +2,12 @@
 {
     public class AuditLoggerOptions
     {
+
+        public bool Enabled { get; set; } = true;
+
+        /// <summary>
+        /// Name of source
+        /// </summary>
         public string Source { get; set; }
 
         /// <summary>

diff --git a/src/Skoruba.AuditLogging/Services/AuditEventLogger.cs b/src/Skoruba.AuditLogging/Services/AuditEventLogger.cs
@@ -108,6 +108,11 @@ private void PrepareDefaultSubject(AuditEvent auditEvent)
         /// <returns></returns>
         public virtual async Task LogEventAsync(AuditEvent auditEvent, Action<AuditLoggerOptions> loggerOptions = default)
         {
+            if (!_auditLoggerOptions.Enabled)
+            {
+                return;
+            }
+
             await PrepareEventAsync(auditEvent, loggerOptions);
 
             foreach (var sink in Sinks)

diff --git a/src/Skoruba.AuditLogging/Skoruba.AuditLogging.csproj b/src/Skoruba.AuditLogging/Skoruba.AuditLogging.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <Version>1.0.0</Version>
+        <TargetFramework>net6.0</TargetFramework>
+        <Version>1.1.0</Version>
         <Description>Simple audit logging for .NET Core with EntityFramework Core support</Description>
         <PackageProjectUrl></PackageProjectUrl>
         <RepositoryUrl>https://github.com/skoruba/AuditLogging</RepositoryUrl>
@@ -25,9 +25,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />
-      <PackageReference Include="Microsoft.Extensions.Primitives" Version="3.1.1" />
-      <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
 </Project>