Merge branch 'refs/heads/dev'

# Conflicts: # src/OfX.Nats/OfX.Nats.csproj
quyvu01 · Jan 6, 2025 · 5807843 · 5807843
2 parents 68810b2 + 0f09e8d
commit 5807843
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/src/OfX.EntityFrameworkCore/OfX.EntityFrameworkCore.csproj b/src/OfX.EntityFrameworkCore/OfX.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.1.5</Version>
+        <Version>3.1.6</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX-EFCore</PackageId>
         <Description>OfX extension. Use EntityFramework as Data Querying</Description>

diff --git a/src/OfX.Grpc/Extensions/GrpcExtensions.cs b/src/OfX.Grpc/Extensions/GrpcExtensions.cs
@@ -25,6 +25,7 @@ public static void AddGrpcClients(this OfXRegister ofXRegister, Action<GrpcClien
         var newClientsRegister = new GrpcClientsRegister();
         options.Invoke(newClientsRegister);
         var hostMapAttributes = newClientsRegister.HostMapAttributes;
+        var attributeRegisters = hostMapAttributes.SelectMany(a => a.Value);
 
         ofXRegister.ServiceCollection.TryAddScoped<GetOfXResponseFunc>(_ => attributeType => async (query, context) =>
         {
@@ -40,7 +41,7 @@ public static void AddGrpcClients(this OfXRegister ofXRegister, Action<GrpcClien
             return itemsResponse;
         });
         Clients.ClientsInstaller.InstallMappableRequestHandlers(ofXRegister.ServiceCollection,
-            typeof(IOfXGrpcRequestClient<>), [..ofXRegister.OfXAttributeTypes]);
+            typeof(IOfXGrpcRequestClient<>), [..attributeRegisters]);
     }
 
     private static async Task<OfXItemsGrpcResponse> GetOfXItemsAsync(string serverHost, IContext context,

diff --git a/src/OfX.Grpc/OfX.Grpc.csproj b/src/OfX.Grpc/OfX.Grpc.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.1.5</Version>
+        <Version>3.1.6</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX-gRPC</PackageId>
         <Description>OfX extension. Use gRPC as Data transporting</Description>

diff --git a/src/OfX.Nats/ApplicationModels/NatsClientHost.cs b/src/OfX.Nats/ApplicationModels/NatsClientHost.cs
@@ -2,7 +2,7 @@ namespace OfX.Nats.ApplicationModels;
 
 public class NatsClientHost
 {
-    public string NatsHost { get; private set; }
+    public string NatsUrl { get; private set; }
 
-    public void Url(string host) => NatsHost = host;
+    public void Url(string host) => NatsUrl = host;
 }
diff --git a/src/OfX.Nats/Extensions/NatsExtensions.cs b/src/OfX.Nats/Extensions/NatsExtensions.cs
@@ -18,7 +18,7 @@ public static void AddNats(this OfXRegister ofXRegister, Action<NatsClientHost>
 
         ofXRegister.ServiceCollection.AddSingleton(_ =>
         {
-            var client = new NatsClient(newClientsRegister.NatsHost);
+            var client = new NatsClient(newClientsRegister.NatsUrl);
             return client;
         });
         ClientsRegister(ofXRegister.ServiceCollection);

diff --git a/src/OfX.Nats/OfX.Nats.csproj b/src/OfX.Nats/OfX.Nats.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.1.5</Version>
+        <Version>3.1.6</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX-Nats</PackageId>
         <Description>Nats.io extension. Use Nats as Data transporting</Description>

diff --git a/src/OfX/OfX.csproj b/src/OfX/OfX.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
         <LangVersion>default</LangVersion>
-        <Version>3.1.5</Version>
+        <Version>3.1.6</Version>
         <Authors>Quy Vu</Authors>
         <PackageId>OfX</PackageId>
         <Description>The high performance and easiest way to play with microservices for .NET</Description>