Merge com a Main

Avanade · Jun 28, 2023 · fd7b97b · fd7b97b
2 parents f1d4b85 + d4d12ed
commit fd7b97b
Show file tree

Hide file tree

Showing 81 changed files with 129 additions and 3,476 deletions.
diff --git a/.github/workflows/liquid-ci-cd-grpc.yml b/.github/workflows/liquid-ci-cd-grpc.yml
diff --git a/Liquid.Repository.sln b/Liquid.Repository.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33627.172
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Liquid.Repository", "src\Liquid.Repository\Liquid.Repository.csproj", "{35EC4C0D-9308-499C-A679-1D1FDDF6286B}"
 EndProject
@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\liquid-repository-mongodb-cd-nuget-publish.yml = .github\workflows\liquid-repository-mongodb-cd-nuget-publish.yml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Liquid.Repository.Tests", "test\Liquid.Repository.Tests\Liquid.Repository.Tests.csproj", "{6CF487B8-302C-40C3-809C-89D1DED813D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Liquid.Repository.Tests", "test\Liquid.Repository.Tests\Liquid.Repository.Tests.csproj", "{6CF487B8-302C-40C3-809C-89D1DED813D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35EC4C0D-9308-499C-A679-1D1FDDF6286B} = {35EC4C0D-9308-499C-A679-1D1FDDF6286B}
 	EndProjectSection

diff --git a/Liquid.WebApi.sln b/Liquid.WebApi.sln
@@ -11,11 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Liquid.WebApi.Grpc.Tests",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{7B0BC311-679F-4D1F-BE49-DF3E49863792}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\liquid-ci-cd-grpc-cartridge.yml = .github\workflows\liquid-ci-cd-grpc-cartridge.yml
-		.github\workflows\liquid-ci-cd-http-cartridge.yml = .github\workflows\liquid-ci-cd-http-cartridge.yml
+		.github\workflows\liquid-ci-cd-http-extensions-crud.yml = .github\workflows\liquid-ci-cd-http-extensions-crud.yml
+		.github\workflows\liquid-ci-cd-http.yml = .github\workflows\liquid-ci-cd-http.yml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grcp", "Grcp", "{15BED263-E56A-45B2-A647-7D44500383E1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grpc", "Grpc", "{15BED263-E56A-45B2-A647-7D44500383E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{13C213E0-722A-4CD5-9209-21E12FDA0CA8}"
 EndProject

diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ To use Liquid, you create a new base ASP.Net Core application and then download
 | [`Liquid.Messaging`](https://www.nuget.org/packages/Liquid.Messaging) | **_optional_** | ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Liquid.Messaging) |
 | [`Liquid.Services`](https://www.nuget.org/packages/Liquid.Services) | **_optional_** | ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Liquid.Services) |
 | [`Liquid.WebApi.Http`](https://www.nuget.org/packages/Liquid.WebApi.Http) | **_optional_** | ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Liquid.WebApi.Http) |
-| [`Liquid.WebApi.Grpc`](https://www.nuget.org/packages/Liquid.WebApi.Grpc) | **_optional_** | ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Liquid.WebApi.Grpc) |
 
 And then choose the implementation cartridges you need to your project, for example:
 

diff --git a/src/Liquid.Domain.Extensions.Crud/Liquid.Domain.Extensions.Crud.csproj b/src/Liquid.Domain.Extensions.Crud/Liquid.Domain.Extensions.Crud.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Domain" Version="2.0.1" />
+    <PackageReference Include="Liquid.Domain" Version="6.0.0-preview-20221201-01" />
     <PackageReference Include="Liquid.Repository" Version="2.0.1" />
   </ItemGroup>
 
@@ -17,7 +17,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Domain</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>6.0.0-preview-20221201-01</Version>
+    <Version>6.0.0-preview-20230201-02</Version>
     <ProjectGuid>{90E8D24B-E7A8-44E1-A1D4-E917F8130002}</ProjectGuid>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>

diff --git a/src/Liquid.Domain/Liquid.Domain.csproj b/src/Liquid.Domain/Liquid.Domain.csproj
@@ -10,7 +10,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Domain</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-	<Version>6.0.0-preview-20221201-01</Version>
+	<Version>6.0.0-preview-20230201-02</Version>
     <ProjectGuid>{CE75EB47-68D9-46F5-BF91-60D39E52CC54}</ProjectGuid>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
@@ -19,8 +19,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.2.2" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.2.2" />
+    <PackageReference Include="FluentValidation" Version="11.4.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.4.0" />
     <PackageReference Include="Liquid.Core" Version="6.0.0-preview-20221201-01" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
   </ItemGroup>

diff --git a/src/Liquid.Messaging.Kafka/Liquid.Messaging.Kafka.csproj b/src/Liquid.Messaging.Kafka/Liquid.Messaging.Kafka.csproj
@@ -10,7 +10,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid.Messaging</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>2.0.0-preview-20220811-01</Version>
+	  <Version>6.0.0-preview-20221201-01</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <Description>
 		  The Liquid.Messaging.Kafka provides producer and consumer patterns to allow the send and consumption of Messaging inside your microservice.
@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="1.9.2" />
-    <PackageReference Include="Liquid.Messaging" Version="2.0.0" />
+    <PackageReference Include="Liquid.Messaging" Version="2.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Liquid.Messaging.RabbitMq/Liquid.Messaging.RabbitMq.csproj b/src/Liquid.Messaging.RabbitMq/Liquid.Messaging.RabbitMq.csproj
@@ -9,7 +9,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Messaging</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.0.1-preview-20220906-01</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>
       The Liquid.Messaging.RabbitMq provides producer and consumer patterns to allow the send and consumption of Messaging inside your microservice.
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.2.21154.6" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Liquid.Messaging.RabbitMq/RabbitMqConsumer.cs b/src/Liquid.Messaging.RabbitMq/RabbitMqConsumer.cs
@@ -1,4 +1,5 @@
-using Liquid.Core.Utils;
+using Liquid.Core.Extensions;
+using Liquid.Core.Utils;
 using Liquid.Messaging.Exceptions;
 using Liquid.Messaging.Extensions;
 using Liquid.Messaging.Interfaces;

diff --git a/src/Liquid.Messaging.RabbitMq/RabbitMqProducer.cs b/src/Liquid.Messaging.RabbitMq/RabbitMqProducer.cs
@@ -1,4 +1,5 @@
-using Liquid.Core.Utils;
+using Liquid.Core.Extensions;
+using Liquid.Core.Utils;
 using Liquid.Messaging.Exceptions;
 using Liquid.Messaging.Extensions;
 using Liquid.Messaging.Interfaces;
@@ -31,7 +32,7 @@ public RabbitMqProducer(IRabbitMqFactory factory, RabbitMqProducerSettings setti
             }
 
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-            
+
 
             _channelModel = factory.GetSender(settings);
         }
@@ -47,7 +48,7 @@ await Task.Run(() =>
                 {
                     var messageProperties = GetProperties(customProperties);
 
-                    var messageBytes = !_settings.CompressMessage ? messageBody.ToJsonBytes() : messageBody.ToJson().GzipCompress();
+                    var messageBytes = !_settings.CompressMessage ? messageBody.ToJsonBytes() : messageBody.ToJsonString().GzipCompress();
 
                     _channelModel.BasicPublish(_settings.Exchange, string.Empty, messageProperties, messageBytes);
 

diff --git a/src/Liquid.Messaging.ServiceBus/Liquid.Messaging.ServiceBus.csproj b/src/Liquid.Messaging.ServiceBus/Liquid.Messaging.ServiceBus.csproj
@@ -10,7 +10,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Messaging</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.0.0</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>
       The Liquid.Messaging.Azure provides producer and consumer patterns to allow the send and consumption of Messaging inside your microservice.
@@ -23,7 +23,6 @@
   <ItemGroup>
     <PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.3" />
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Liquid.Messaging/Extensions/DependencyInjectionExtensions.cs b/src/Liquid.Messaging/Extensions/DependencyInjectionExtensions.cs
@@ -1,5 +1,5 @@
-using Liquid.Core.Extensions.DependencyInjection;
-using Liquid.Core.Utils;
+using Liquid.Core.Extensions;
+using Liquid.Core.Extensions.DependencyInjection;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;

diff --git a/src/Liquid.Messaging/Liquid.Messaging.csproj b/src/Liquid.Messaging/Liquid.Messaging.csproj
@@ -9,7 +9,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Messaging</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.0.2</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>
       The Liquid.Messaging provides producer and consumer patterns to allow the send and consumption of Messaging inside your microservice.
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Core" Version="2.1.0" />
-    <PackageReference Include="Liquid.Domain" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Liquid.Core" Version="6.0.0-preview-20221201-01" />
+    <PackageReference Include="Liquid.Domain" Version="6.0.0-preview-20230201-02" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Liquid.Repository.EntityFramework/Liquid.Repository.EntityFramework.csproj b/src/Liquid.Repository.EntityFramework/Liquid.Repository.EntityFramework.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>Liquid.Repository.EntityFramework</PackageId>
-    <Version>2.0.1</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <Authors>Avanade Brazil</Authors>
     <Company>Avanade Inc.</Company>
     <Product>Liquid - Modern Application Framework</Product>
@@ -18,9 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Repository" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11" />
+	  <PackageReference Include="Liquid.Repository" Version="6.0.0-preview-20221201-01" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Liquid.Repository.Mongo/Liquid.Repository.Mongo.csproj b/src/Liquid.Repository.Mongo/Liquid.Repository.Mongo.csproj
@@ -10,7 +10,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Repository</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.2.0</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
     <DebugType>Full</DebugType>
@@ -25,10 +25,11 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Repository" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.14.0" />
+	<PackageReference Include="Liquid.Repository" Version="6.0.0-preview-20221201-01" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,4 +38,5 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
+
 </Project>
diff --git a/src/Liquid.Repository/Liquid.Repository.csproj b/src/Liquid.Repository/Liquid.Repository.csproj
@@ -10,7 +10,7 @@
     <Copyright>Avanade 2019</Copyright>
     <PackageProjectUrl>https://github.com/Avanade/Liquid.Repository</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.0.1</Version>
+    <Version>6.0.0-preview-20221201-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
     <DebugType>Full</DebugType>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Core" Version="2.1.0" />
+    <PackageReference Include="Liquid.Core" Version="6.0.0-preview-20221201-01" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Liquid.Services.Grpc/Exceptions/GrpcServiceCallException.cs b/src/Liquid.Services.Grpc/Exceptions/GrpcServiceCallException.cs
diff --git a/src/Liquid.Services.Grpc/ILightGrpcService.cs b/src/Liquid.Services.Grpc/ILightGrpcService.cs