Merge branch 'main' of https://github.com/kodlamaio-projects/DotNetCore.CorePackages

ahmet-cetinkaya · ahmet-cetinkaya · commit 4bba449672da · 2025-02-03T12:49:22.000+03:00
diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml
@@ -19,5 +19,5 @@ jobs:
           dotnet restore
           dotnet build --configuration Release
           dotnet pack --configuration Release --no-build
-          dotnet nuget push **/*.nupkg --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json
-          dotnet clean
+          dotnet nuget push **/*.nupkg --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json --skip-duplicate
+    
diff --git a/src/Core.Application/Core.Application.csproj b/src/Core.Application/Core.Application.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide CQRS, MediatR, Pipelines, DTOs, and more for the Application Layer.</Description>
     <Product>NArchitecture</Product>
@@ -33,19 +33,17 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
-    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="FluentValidation" Version="11.9.2" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
+    <PackageReference Include="MediatR" Version="12.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Exception\Core.CrossCuttingConcerns.Exception.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Exception\Core.CrossCuttingConcerns.Exception.csproj" />
     <ProjectReference Include="..\Core.Security\Core.Security.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Core.Application/Pipelines/Authorization/AuthorizationBehavior.cs b/src/Core.Application/Pipelines/Authorization/AuthorizationBehavior.cs
@@ -1,4 +1,4 @@
-﻿using System.Security.Authentication;
+using System.Security.Authentication;
 using MediatR;
 using NArchitecture.Core.CrossCuttingConcerns.Exception.Types;
 using NArchitecture.Core.Security.Constants;
diff --git a/src/Core.CrossCuttingConcerns.Exception.WebAPI/Core.CrossCuttingConcerns.Exception.WebApi.csproj b/src/Core.CrossCuttingConcerns.Exception.WebAPI/Core.CrossCuttingConcerns.Exception.WebApi.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide exception handling components specifically tailored for ASP.NET Web API
       projects.</Description>
@@ -37,15 +37,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Exception\Core.CrossCuttingConcerns.Exception.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Exception\Core.CrossCuttingConcerns.Exception.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core.CrossCuttingConcerns.Logging.SeriLog/Core.CrossCuttingConcerns.Logging.Serilog.csproj b/src/Core.CrossCuttingConcerns.Logging.SeriLog/Core.CrossCuttingConcerns.Logging.Serilog.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide logging integration with Serilog.</Description>
     <Product>NArchitecture</Product>
@@ -36,14 +36,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging.Abstraction\Core.CrossCuttingConcerns.Logging.Abstraction.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core.CrossCuttingConcerns.Logging.Serilog.File/Core.CrossCuttingConcerns.Logging.Serilog.File.csproj b/src/Core.CrossCuttingConcerns.Logging.Serilog.File/Core.CrossCuttingConcerns.Logging.Serilog.File.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.3</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide integration with Serilog for file logging.</Description>
     <Product>NArchitecture</Product>
@@ -36,14 +36,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging.SeriLog\Core.CrossCuttingConcerns.Logging.Serilog.csproj" />
-    <ProjectReference
-      Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging.SeriLog\Core.CrossCuttingConcerns.Logging.Serilog.csproj" />
+    <ProjectReference Include="..\Core.CrossCuttingConcerns.Logging\Core.CrossCuttingConcerns.Logging.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core.Localization.Resource.Yaml/Core.Localization.Resource.Yaml.csproj b/src/Core.Localization.Resource.Yaml/Core.Localization.Resource.Yaml.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide YAML-based resource management for localization.</Description>
     <Product>NArchitecture</Product>
@@ -34,10 +34,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="15.1.2" />
+    <PackageReference Include="YamlDotNet" Version="16.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference
-      Include="..\Core.Localization.Abstraction\Core.Localization.Abstraction.csproj" />
+    <ProjectReference Include="..\Core.Localization.Abstraction\Core.Localization.Abstraction.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Core.Mailing.MailKit/Core.Mailing.MailKit.csproj b/src/Core.Mailing.MailKit/Core.Mailing.MailKit.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide email sending capabilities using MailKit.</Description>
     <Product>NArchitecture</Product>
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.4.0" />
+    <PackageReference Include="MailKit" Version="4.7.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core.Mailing/Core.Mailing.csproj b/src/Core.Mailing/Core.Mailing.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provide models for email sending capabilities.</Description>
     <Product>NArchitecture</Product>
@@ -34,6 +34,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MimeKit" Version="4.4.0" />
+    <PackageReference Include="MimeKit" Version="4.7.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Core.Persistence.WebApi/Core.Persistence.WebApi.csproj b/src/Core.Persistence.WebApi/Core.Persistence.WebApi.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides utilities for integrating persistence services with ASP.NET Web API
       projects.</Description>
@@ -37,6 +37,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Persistence\Core.Persistence.csproj" />
diff --git a/src/Core.Persistence/Core.Persistence.csproj b/src/Core.Persistence/Core.Persistence.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.1.2</Version>
+    <Version>1.1.4</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides persistence utilities for data access using Entity Framework Core.</Description>
     <Product>NArchitecture</Product>
@@ -35,9 +35,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
   </ItemGroup>
 </Project>
diff --git a/src/Core.Persistence/Dynamic/Filter.cs b/src/Core.Persistence/Dynamic/Filter.cs
@@ -6,6 +6,7 @@ public class Filter
     public string Operator { get; set; }
     public string? Value { get; set; }
     public string? Logic { get; set; }
+    public bool CaseSensitive { get; set; } = false;
     public IEnumerable<Filter>? Filters { get; set; }
 
     public Filter()
diff --git a/src/Core.Persistence/Dynamic/IQueryableDynamicFilterExtensions.cs b/src/Core.Persistence/Dynamic/IQueryableDynamicFilterExtensions.cs
@@ -21,7 +21,9 @@ public static class IQueryableDynamicFilterExtensions
         { "startswith", "StartsWith" },
         { "endswith", "EndsWith" },
         { "contains", "Contains" },
-        { "doesnotcontain", "Contains" }
+        { "doesnotcontain", "Contains" },
+        { "in", "In" },
+        { "between", "Between" }
     };
 
     public static IQueryable<T> ToDynamic<T>(this IQueryable<T> query, DynamicQuery dynamicQuery)
@@ -93,7 +95,28 @@ public static string Transform(Filter filter, IList<Filter> filters)
             if (filter.Operator == "doesnotcontain")
                 where.Append($"(!np({filter.Field}).{comparison}(@{index.ToString()}))");
             else if (comparison is "StartsWith" or "EndsWith" or "Contains")
-                where.Append($"(np({filter.Field}).{comparison}(@{index.ToString()}))");
+            {
+                if (!filter.CaseSensitive)
+                {
+                    where.Append($"(np({filter.Field}).ToLower().{comparison}(@{index.ToString()}.ToLower()))");
+                }
+                else
+                {
+                    where.Append($"(np({filter.Field}).{comparison}(@{index.ToString()}))");
+                }
+            }
+            else if (filter.Operator == "in")
+            {
+                where.Append($"np({filter.Field}) in ({filter.Value})");
+            }
+            else if (filter.Operator == "between")
+            {
+                var values = filter.Value.Split(',');
+                if (values.Length != 2)
+                    throw new ArgumentException("Invalid Value for 'between' operator");
+
+                where.Append($"(np({filter.Field}) >= {values[0]} and np({filter.Field}) <= {values[1]})");
+            }
             else
                 where.Append($"np({filter.Field}) {comparison} @{index.ToString()}");
         else if (filter.Operator is "isnull" or "isnotnull")
diff --git a/src/Core.Security.WebApi.Swagger/Core.Security.WebApi.Swagger.csproj b/src/Core.Security.WebApi.Swagger/Core.Security.WebApi.Swagger.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides utilities for integrating security features with ASP.NET Web API projects,
       focusing on Swagger integration.</Description>
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core.Security/Core.Security.csproj b/src/Core.Security/Core.Security.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.3.2</Version>
+    <Version>1.3.3</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides security utilities for hashing, encryption, JWT, authenticator, and more.</Description>
     <Product>NArchitecture</Product>
@@ -35,11 +35,11 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.0" />
-    <PackageReference Include="Otp.NET" Version="1.3.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.2" />
+    <PackageReference Include="Otp.NET" Version="1.4.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Persistence\Core.Persistence.csproj" />
diff --git a/src/Core.Test/Core.Test.csproj b/src/Core.Test/Core.Test.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides utilities for testing.</Description>
     <Product>NArchitecture</Product>
@@ -36,12 +36,11 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Application\Core.Application.csproj" />
-    <ProjectReference
-      Include="..\Core.Localization.Resource.Yaml\Core.Localization.Resource.Yaml.csproj" />
+    <ProjectReference Include="..\Core.Localization.Resource.Yaml\Core.Localization.Resource.Yaml.csproj" />
     <ProjectReference Include="..\Core.Persistence\Core.Persistence.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Core.Translation.AmazonTranslate/Core.Translation.AmazonTranslate.csproj b/src/Core.Translation.AmazonTranslate/Core.Translation.AmazonTranslate.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>NArchitecture.$(AssemblyName)</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>NArchitecture.$(AssemblyName)</PackageId>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <Title>NArchitecture $(AssemblyName)</Title>
     <Description>Provides integration with Amazon Translate for translation services.</Description>
     <Product>NArchitecture</Product>
@@ -35,7 +35,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Translate" Version="3.7.300.66" />
+    <PackageReference Include="AWSSDK.Translate" Version="3.7.400.12" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Translation.Abstraction\Core.Translation.Abstraction.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Security.Authentication;`
	`1`	`+using System.Security.Authentication;`
`2`	`2`	`using MediatR;`
`3`	`3`	`using NArchitecture.Core.CrossCuttingConcerns.Exception.Types;`
`4`	`4`	`using NArchitecture.Core.Security.Constants;`