generator-codedesignplus 0.3.2-alpha.1 → 0.4.0-beta.2

package/generators/microservice/templates/microservice/CodeDesignPlus.Net.Microservice.sln

@@ -52,6 +52,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microservice.Rest.Test", "tests\unit\CodeDesignPlus.Net.Microservice.Rest.Test\CodeDesignPlus.Net.Microservice.Rest.Test.csproj", "{86BB4D11-6C2F-44CA-B7DF-527FDFE79959}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9C6578E7-E4FE-79BB-1635-F363CC1E80DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E7A3C856-6834-D657-F2F0-05592DF2DDE9}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+		.github\workflows\chart.yaml = .github\workflows\chart.yaml
+		.github\workflows\build.yml = .github\workflows\build.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -148,6 +157,7 @@ Global
 		{223DF4AA-8E95-4624-B439-EA232409E903} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{B190F800-89F0-43CD-B9BD-3EDD0C2E4B37} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{86BB4D11-6C2F-44CA-B7DF-527FDFE79959} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
+		{E7A3C856-6834-D657-F2F0-05592DF2DDE9} = {9C6578E7-E4FE-79BB-1635-F363CC1E80DD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {91BAB16E-7151-425E-919F-2725C0813642}

package/generators/microservice/templates/microservice/LICENSE.md

@@ -18,4 +18,4 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 As an additional permission under GNU LGPL version 3 section 7, you may distribute
 non-source (e.g., minimized or compacted) forms of that code without the copy of the GNU LGPL,
-but you must make the corresponding source code available under the GNU LGPL as provided above.
+but you must make the corresponding source code available under the GNU LGPL as provided above. 

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+name: ms-archetype-grpc
+description: This is a Helm chart for the ms-archetype-gRPC service
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
+dependencies:
+  - name: ms-base
+    version: 0.0.1
+    repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/values.yaml

@@ -0,0 +1,94 @@
+ms-base:
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-grpc
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-grpc"
+  nameOverride: "ms-archetype-grpc"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    port: 5000
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: false

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+name: ms-tenants-rest
+description: This is a Helm chart for the ms-tenants REST service
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
+dependencies:
+  - name: ms-base
+    version: 0.0.1
+    repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/values.yaml

@@ -0,0 +1,110 @@
+ms-base:
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-rest
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-rest"
+  nameOverride: "ms-archetype-rest"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    port: 5000
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: true
+    hosts:
+      - services.codedesignplus.com
+    gateways:
+      - services-gateway
+    http:
+    - name: ms-archetype
+      match:
+      - uri:
+          prefix: /ms-archetype/
+      rewrite:
+        uri: /
+      route:
+      - destination:
+          host: ms-archetype-rest.default.svc.cluster.local
+          port:
+            number: 5000

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+name: ms-archetype-worker
+description: This is a Helm chart for the ms-archetype Worker service
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
+dependencies:
+  - name: ms-base
+    version: 0.0.1
+    repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/values.yaml

@@ -0,0 +1,94 @@
+ms-base:
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-worker
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-worker"
+  nameOverride: "ms-archetype-worker"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    port: 5000
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: false

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/CodeDesignPlus.Net.Microservice.Application.csproj

@@ -5,10 +5,10 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.6.0-beta.10" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.6.0-beta.10" />
-		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.6.0-beta.10" />
-		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.6.0-beta.10" />
+		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.6.0-beta.28" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.6.0-beta.28" />
+		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.6.0-beta.28" />
+		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.6.0-beta.28" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
 		<PackageReference Include="MediatR" Version="12.4.1" />

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Queries/GetAllOrders/GetAllOrdersQuery.cs

@@ -1,3 +1,5 @@
-namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
+using CodeDesignPlus.Net.Core.Abstractions.Models.Pager;
 
-public record GetAllOrdersQuery(C.Criteria Criteria) : IRequest<List<OrderDto>>;
+namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
+
+public record GetAllOrdersQuery(C.Criteria Criteria) : IRequest<Pagination<OrderDto>>;

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Order/Queries/GetAllOrders/GetAllOrdersQueryHandler.cs

@@ -1,14 +1,16 @@
-namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
+using CodeDesignPlus.Net.Core.Abstractions.Models.Pager;
+
+namespace CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
 
 public class GetAllOrdersQueryHandler(IOrderRepository orderRepository, IMapper mapper, IUserContext user)
-    : IRequestHandler<GetAllOrdersQuery, List<OrderDto>>
+    : IRequestHandler<GetAllOrdersQuery, Pagination<OrderDto>>
 {
 
-    public async Task<List<OrderDto>> Handle(GetAllOrdersQuery request, CancellationToken cancellationToken)
+    public async Task<Pagination<OrderDto>> Handle(GetAllOrdersQuery request, CancellationToken cancellationToken)
     {
         var result = await orderRepository.MatchingAsync<OrderAggregate>(request.Criteria, user.Tenant, cancellationToken);
 
-        var data = mapper.Map<List<OrderDto>>(result);
+        var data = mapper.Map<Pagination<OrderDto>>(result);
 
         return data;
     }

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Domain/CodeDesignPlus.Net.Microservice.Domain.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.6.0-beta.10" /> 
+    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Mongo" Version="0.6.0-beta.28" /> 
   </ItemGroup>
 </Project>

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/CodeDesignPlus.Net.Microservice.AsyncWorker.csproj

@@ -7,14 +7,14 @@
     <PublishAot>false</PublishAot>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.28" />
   </ItemGroup>
   <ItemGroup>
     <SonarQubeSetting Include="sonar.coverage.exclusions">

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.AsyncWorker/appsettings.qa.json

@@ -0,0 +1,16 @@
+{
+  "Vault": {
+    "Enable": true,
+    "Address": "http://vault-internal.vault-operator.svc.cluster.local:8200",
+    "AppName": "ms-archetype",
+    "Solution": "vault",
+    "Token": "root",
+    "Mongo": {
+      "Enable": false,
+      "TemplateConnectionString": "mongodb://{0}:{1}@localhost:27017"
+    },
+    "RabbitMQ": {
+      "Enable": false
+    }
+  }
+}

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/CodeDesignPlus.Net.Microservice.Rest.csproj

@@ -11,17 +11,21 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="7.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.28" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="8.1.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.28" />
+
+    <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="CodeDesignPlus.Net.Microservice.Rest.Test" />

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/Program.cs

@@ -1,13 +1,15 @@
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Middlewares;
+using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Resources;
 using CodeDesignPlus.Net.Microservice.Commons.EntryPoints.Rest.Swagger;
 using CodeDesignPlus.Net.Microservice.Commons.FluentValidation;
+using CodeDesignPlus.Net.Microservice.Commons.HealthChecks;
 using CodeDesignPlus.Net.Microservice.Commons.MediatR;
 using CodeDesignPlus.Net.Redis.Cache.Extensions;
 using CodeDesignPlus.Net.Vault.Extensions;
-using NodaTime;
 using NodaTime.Serialization.SystemTextJson;
 
-var builder = WebApplication.CreateSlimBuilder(args);
+
+    var builder = WebApplication.CreateSlimBuilder(args);
 
 Serilog.Debugging.SelfLog.Enable(Console.Error);
 
@@ -19,9 +21,8 @@ builder.Services
     .AddControllers()
     .AddJsonOptions(opt => opt.JsonSerializerOptions.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
 
-
 builder.Services.AddEndpointsApiExplorer();
-
+builder.Services.AddCors();
 builder.Services.AddVault(builder.Configuration);
 builder.Services.AddRedis(builder.Configuration);
 builder.Services.AddMongo<CodeDesignPlus.Net.Microservice.Infrastructure.Startup>(builder.Configuration);
@@ -34,14 +35,21 @@ builder.Services.AddMediatR<CodeDesignPlus.Net.Microservice.Application.Startup>
 builder.Services.AddSecurity(builder.Configuration);
 builder.Services.AddCoreSwagger<Program>(builder.Configuration);
 builder.Services.AddCache(builder.Configuration);
-
+builder.Services.AddResources<Program>(builder.Configuration);
+builder.Services.AddHealthChecksServices();
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
-app.UseCoreSwagger();
+app.UseCors(builder => builder
+    .AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader()
+);
+app.UseExceptionMiddleware();
+app.UseHealthChecks();
+app.UseCodeErrors();
 
-app.UseMiddleware<ExceptionMiddleware>();
+app.UseCoreSwagger();
 
 app.UseHttpsRedirection();
 

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/appsettings.json

@@ -9,6 +9,7 @@
     }
   },
   "Core": {
+    "Id": "797742f0-2999-4dac-a0d2-6e8ecdff0fda",
     "AppName": "ms-archetype",
     "Version": "v1",
     "Description": "Microservice Archetype Template",
@@ -18,6 +19,10 @@
       "Email": "codedesignplus@outlook.com"
     }
   },
+  "Resources": {
+    "Enable": false,
+    "Server": "http://localhost:5001"
+  },
   "Security": {
     "Authority": "https://codedesignplus.b2clogin.com/codedesignplus.onmicrosoft.com/B2C_1_CodeDeseignPlus/oauth2/v2.0/",
     "IncludeErrorDetails": true,
@@ -27,7 +32,11 @@
     "RequireHttpsMetadata": true,
     "ValidIssuer": "https://codedesignplus.b2clogin.com/3461e311-a66e-46ab-afdf-2bbfb72a5cb0/v2.0/",
     "ValidAudiences": [],
-    "Applications": []
+    "Applications": [],
+    "ValidateLicense": false,
+    "ValidateRbac": false,
+    "ServerRbac": "http://localhost:5001",
+    "RefreshRbacInterval": 10
   },
   "Redis": {
     "Instances": {
@@ -55,7 +64,7 @@
       "Enable": true,
       "EnableCommandText": true
     }
-  },  
+  },
   "Logger": {
     "Enable": true,
     "OTelEndpoint": "http://localhost:4317"
@@ -91,4 +100,4 @@
       "Enable": true
     }
   }
-}
+}

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.Rest/appsettings.qa.json

@@ -0,0 +1,16 @@
+{
+  "Vault": {
+    "Enable": true,
+    "Address": "http://vault-internal.vault-operator.svc.cluster.local:8200",
+    "AppName": "ms-archetype",
+    "Solution": "vault",
+    "Token": "root",
+    "Mongo": {
+      "Enable": false,
+      "TemplateConnectionString": "mongodb://{0}:{1}@localhost:27017"
+    },
+    "RabbitMQ": {
+      "Enable": false
+    }
+  }
+}

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/CodeDesignPlus.Net.Microservice.gRpc.csproj

@@ -9,11 +9,11 @@
     <Protobuf Include="Protos\orders.proto" GrpcServices="Server" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.10" />
-    <PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
-    <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.67.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.69.0">
+    <PackageReference Include="CodeDesignPlus.Net.Microservice.Commons" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Vault" Version="0.6.0-beta.28" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.70.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.70.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.71.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -26,12 +26,12 @@
   <ItemGroup>
     <ProjectReference Include="..\..\domain\CodeDesignPlus.Net.Microservice.Infrastructure\CodeDesignPlus.Net.Microservice.Infrastructure.csproj" />
     <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0-beta.10" />
-    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.RabbitMQ" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Logger" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Observability" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Security" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Exceptions" Version="0.6.0-beta.28" />
+    <PackageReference Include="CodeDesignPlus.Net.Redis.Cache" Version="0.6.0-beta.28" />
   </ItemGroup>
 </Project>

package/generators/microservice/templates/microservice/src/entrypoints/CodeDesignPlus.Net.Microservice.gRpc/appsettings.qa.json

@@ -0,0 +1,16 @@
+{
+  "Vault": {
+    "Enable": true,
+    "Address": "http://vault-internal.vault-operator.svc.cluster.local:8200",
+    "AppName": "ms-archetype",
+    "Solution": "vault",
+    "Token": "root",
+    "Mongo": {
+      "Enable": false,
+      "TemplateConnectionString": "mongodb://{0}:{1}@localhost:27017"
+    },
+    "RabbitMQ": {
+      "Enable": false
+    }
+  }
+}

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.AsyncWorker.Test/CodeDesignPlus.Net.Microservice.AsyncWorker.Test.csproj

@@ -11,12 +11,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -31,5 +31,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Consumers\" />
+    <Folder Include="Helpers\" />
   </ItemGroup>
 </Project>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.AsyncWorker.Test/Helpers/ServerCollectionDefinition.cs

@@ -0,0 +1,10 @@
+namespace CodeDesignPlus.Net.Microservice.AsyncWorker.Test.Helpers;
+
+/// <summary>
+/// Define the collection of the server.
+/// </summary>
+[CollectionDefinition(ServerCollectionFixture<Program>.Collection)]
+public class ServerCollectionDefinition: ICollectionFixture<ServerCollectionFixture<Program>>
+{
+
+}

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/CodeDesignPlus.Net.Microservice.Rest.Test.csproj

@@ -12,12 +12,12 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/Controllers/OrderControllerTest.cs

@@ -1,10 +1,15 @@
-namespace CodeDesignPlus.Net.Microservice.Rest.Test.Controllers;
+using CodeDesignPlus.Net.Core.Abstractions.Models.Pager;
+using CodeDesignPlus.Net.Microservice.Rest.Test.Helpers;
+using Xunit.Abstractions;
 
-public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Program>>
+namespace CodeDesignPlus.Net.Microservice.Rest.Test.Controllers;
+
+[Collection(ServerCollectionFixture<Program> .Collection)]
+public class OrderControllerTest : ServerBase<Program>
 {
-    public OrderControllerTest(Server<Program> server) : base(server)
+    public OrderControllerTest(ServerCollectionFixture<Program> fixture, ITestOutputHelper output) : base(fixture.Container)
     {        
-        server.InMemoryCollection = (x) =>
+        fixture.Container.InMemoryCollection = (x) =>
         {
             x.Add("Vault:Enable", "false");
             x.Add("Vault:Address", "http://localhost:8200");
@@ -30,11 +35,12 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
 
         var json = await response.Content.ReadAsStringAsync();
 
-        var orders = JsonSerializer.Deserialize<IEnumerable<OrderDto>>(json);
+        var orders = JsonSerializer.Deserialize<Pagination<OrderDto>>(json);
 
+        Assert.NotNull(json);
         Assert.NotNull(orders);
-        Assert.NotEmpty(orders);
-        Assert.Contains(orders, x => x.Id == order.Id);
+        Assert.NotEmpty(orders.Data);
+        Assert.Contains(orders.Data, x => x.Id == order.Id);
     }
 
     [Fact]
@@ -92,7 +98,7 @@ public class OrderControllerTest : ServerBase<Program>, IClassFixture<Server<Pro
 
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
-
+ 
         Assert.Equal(data.Id, order.Id);
         Assert.Equal(data.Client.Name, order.Client.Name);
         Assert.Equal(data.Client.Id, order.Client.Id);

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.Rest.Test/Helpers/ServerCollectionDefinition.cs

@@ -0,0 +1,10 @@
+namespace CodeDesignPlus.Net.Microservice.Rest.Test.Helpers;
+
+/// <summary>
+/// Define the collection of the server.
+/// </summary>
+[CollectionDefinition(ServerCollectionFixture<Program>.Collection)]
+public class ServerCollectionDefinition: ICollectionFixture<ServerCollectionFixture<Program>>
+{
+
+}

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/CodeDesignPlus.Net.Microservice.gRpc.Test.csproj

@@ -12,20 +12,20 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Google.Protobuf" Version="3.29.3" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.69.0">
+    <PackageReference Include="Google.Protobuf" Version="3.30.2" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.70.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.71.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NodaTime.Serialization.Protobuf" Version="2.0.2" />
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -45,4 +45,7 @@
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Helpers\" />
+  </ItemGroup>
 </Project>

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/Helpers/ServerCollectionDefinition.cs

@@ -0,0 +1,10 @@
+namespace CodeDesignPlus.Net.Microservice.gRpc.Test.Helpers;
+
+/// <summary>
+/// Define the collection of the server.
+/// </summary>
+[CollectionDefinition(ServerCollectionFixture<Program>.Collection)]
+public class ServerCollectionDefinition: ICollectionFixture<ServerCollectionFixture<Program>>
+{
+
+}

package/generators/microservice/templates/microservice/tests/integration/CodeDesignPlus.Net.Microservice.gRpc.Test/Services/OrderServiceTest.cs

@@ -1,14 +1,16 @@
 using CodeDesignPlus.Net.Microservice.Domain.ValueObjects;
+using CodeDesignPlus.Net.Microservice.gRpc.Test.Helpers;
 using NodaTime;
 using NodaTime.Serialization.Protobuf;
 
 namespace CodeDesignPlus.Net.Microservice.gRpc.Test.Services;
 
-public class OrderServiceTest : ServerBase<Program>, IClassFixture<Server<Program>>
+[Collection(ServerCollectionFixture<Program> .Collection)]
+public class OrderServiceTest : ServerBase<Program>
 {
-    public OrderServiceTest(Server<Program> server) : base(server)
+    public OrderServiceTest(ServerCollectionFixture<Program> fixture) : base(fixture.Container)
     {
-        server.InMemoryCollection = (x) =>
+        fixture.Container.InMemoryCollection = (x) =>
         {
             x.Add("Vault:Enable", "false");
             x.Add("Vault:Address", "http://localhost:8200");
@@ -17,6 +19,7 @@ public class OrderServiceTest : ServerBase<Program>, IClassFixture<Server<Progra
             x.Add("AppName", "my-test");
             x.Add("RabbitMQ:UserName", "guest");
             x.Add("RabbitMQ:Password", "guest");
+            x.Add("Security:ValidAudiences:0", Guid.NewGuid().ToString());
         };
     }
 

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Application.Test/CodeDesignPlus.Net.Microservice.Application.Test.csproj

@@ -17,10 +17,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Application.Test/Order/Queries/GetAllOrders/GetAllOrdersQueryHandlerTest.cs

@@ -1,3 +1,4 @@
+using CodeDesignPlus.Net.Core.Abstractions.Models.Pager;
 using CodeDesignPlus.Net.Microservice.Application.Order.Queries.GetAllOrders;
 
 namespace CodeDesignPlus.Net.Microservice.Application.Test.Order.Queries.GetAllOrders;
@@ -67,18 +68,18 @@ public class GetAllOrdersQueryHandlerTest
 
         var queryHandler = new GetAllOrdersQueryHandler(orderRepositoryMock.Object, mapperMock.Object, userContextMock.Object);
 
-        mapperMock.Setup(x => x.Map<List<OrderDto>>(It.IsAny<List<OrderAggregate>>())).Returns(orders);
+        mapperMock.Setup(x => x.Map<Pagination<OrderDto>>(It.IsAny<List<OrderAggregate>>())).Returns(Pagination<OrderDto>.Create(orders, 0, 0, 0));
 
         // Act
         var result = await queryHandler.Handle(query, CancellationToken.None);
 
         // Assert
-        Assert.NotNull(result);
-        Assert.NotEmpty(result);
-        Assert.Equal(orders.Count, result.Count);
+        Assert.NotNull(result.Data);
+        Assert.NotEmpty(result.Data);
+        Assert.Equal(orders.Count, result.Data.Count());
 
         orderRepositoryMock.Verify(x => x.MatchingAsync<OrderAggregate>(criteria, tenant, It.IsAny<CancellationToken>()), Times.Once);
-        mapperMock.Verify(x => x.Map<List<OrderDto>>(It.IsAny<List<OrderAggregate>>()), Times.Once);
+        mapperMock.Verify(x => x.Map<Pagination<OrderDto>>(It.IsAny<List<OrderAggregate>>()), Times.Once);
     }
 
 }

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.AsyncWorker.Test/CodeDesignPlus.Net.Microservice.AsyncWorker.Test.csproj

@@ -17,11 +17,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Default.Test/CodeDesignPlus.Net.Microservice.Default.Test.csproj

@@ -6,15 +6,15 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.Serializers" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.Serializers" Version="0.6.0-beta.28" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -24,7 +24,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\domain\CodeDesignPlus.Net.Microservice.Infrastructure\CodeDesignPlus.Net.Microservice.Infrastructure.csproj" />

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Domain.Test/CodeDesignPlus.Net.Microservice.Domain.Test.csproj

@@ -17,9 +17,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Infrastructure.Test/CodeDesignPlus.Net.Microservice.Infrastructure.Test.csproj

@@ -17,10 +17,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Rest.Test/CodeDesignPlus.Net.Microservice.Rest.Test.csproj

@@ -22,11 +22,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.Rest.Test/Controllers/OrderControllerTest.cs

@@ -1,3 +1,4 @@
+using CodeDesignPlus.Net.Core.Abstractions.Models.Pager;
 using CodeDesignPlus.Net.Microservice.Application.Order.Commands.AddProductToOrder;
 using CodeDesignPlus.Net.Microservice.Application.Order.Commands.CancelOrder;
 using CodeDesignPlus.Net.Microservice.Application.Order.Commands.CompleteOrder;
@@ -31,7 +32,7 @@ public class OrderControllerTest
 
         this.mediator
             .Setup(x => x.Send(It.IsAny<GetAllOrdersQuery>(), cancellationToken))
-            .ReturnsAsync([]);
+            .ReturnsAsync(Pagination<OrderDto>.Create([], 0, 0, 0));
 
         // Act
         var result = await controller.GetOrders(criteria, cancellationToken);

package/generators/microservice/templates/microservice/tests/unit/CodeDesignPlus.Net.Microservice.gRpc.Test/CodeDesignPlus.Net.Microservice.gRpc.Test.csproj

@@ -17,12 +17,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.10" />
+    <PackageReference Include="CodeDesignPlus.Net.xUnit.Microservice" Version="0.6.0-beta.28" />
     <PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

package/generators/microservice/templates/microservice/tools/sonarqube/sonar.ps1

@@ -11,7 +11,7 @@ $report = "tests/**/coverage.opencover.xml"
 $server = "http://localhost:9000"
 $token = "sqa_12f3d20d51de2b4c9639db0035d1c68dc4f2fff1"
 
-cd ..
+cd ../..
 dotnet test $csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 dotnet sonarscanner begin /o:$org /k:$key /d:sonar.host.url=$server /d:sonar.coverage.exclusions="**Tests*.cs,**/tests/load/*.js" /d:sonar.cs.opencover.reportsPaths=$report /d:sonar.login=$token
 dotnet build

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-codedesignplus",
-  "version": "0.3.2-alpha.1",
+  "version": "0.4.0-beta.2",
   "description": "Yeoman generator for creating microservices based on the CodeDesignPlus.Net.Microservice archetype.",
   "private": false,
   "main": "generators/index.mjs",