Fixed naming

Author: andrey-serdyuk

Directory.Build.props

@@ -4,7 +4,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>true</IsPackable>
-		<Version>2.3.6</Version>
+		<Version>2.3.13</Version>
 		<Authors>Andrey Serdyuk</Authors>
 		<Company>TaskHub</Company>
 		<Title>TaskHub.Shared - Reusable Primitives for .NET Microservices</Title>

Shared.slnx

@@ -22,7 +22,7 @@
   </Folder>
   <Folder Name="/Commands/">
     <Project Path="TaskHub.Shared.Commands.Abstractions/TaskHub.Shared.Commands.Abstractions.csproj" />
-    <Project Path="TaskHub.Shared.Commands.Bus/TaskHub.Shared.Commands.Implementation.csproj" />
+    <Project Path="TaskHub.Shared.Commands.Implementation/TaskHub.Shared.Commands.Implementation.csproj" />
   </Folder>
   <Folder Name="/Domain/">
     <Project Path="TaskHub.Shared.Domain/TaskHub.Shared.Domain.csproj" />
@@ -36,7 +36,7 @@
   </Folder>
   <Folder Name="/Networking/">
     <Project Path="TaskHub.Shared.Networking.Abstractions/TaskHub.Shared.Networking.Abstractions.csproj" Id="9058871d-aadf-4e9b-b1ce-545eda04f71e" />
-    <Project Path="TaskHub.Shared.Networking/TaskHub.Shared.Networking.Implementation.csproj" Id="98f34111-49e6-4178-9919-91ff62eb402e" />
+    <Project Path="TaskHub.Shared.Networking.Implementation/TaskHub.Shared.Networking.Implementation.csproj" Id="98f34111-49e6-4178-9919-91ff62eb402e" />
   </Folder>
   <Folder Name="/Observability/" />
   <Folder Name="/Observability/Logger/">

TaskHub.Shared.Bootstraper.Full/FullHostBuilder.cs

@@ -9,7 +9,6 @@
 using TaskHub.Shared.Authorization.Identity.Bootstrap;
 using TaskHub.Shared.Bootstraper.Basic;
 using TaskHub.Shared.Commands.Implementation.Bootstrap;
-using TaskHub.Shared.Networking.Abstractions;
 using TaskHub.Shared.Networking.Implementation.Bootstrap;
 using TaskHub.Shared.Persistence.EntityFramework.Bootstrap;
 using TaskHub.Shared.Persistence.Redis;
@@ -62,7 +61,6 @@ protected override void AppStart()
         Builder.Services.AddAppDependencies<IService>();
         Builder.Services.AddAppDependencies<IUnitOfWork>();
         Builder.Services.AddAppDependencies<IRepository>();
-        Builder.Services.AddAppDependencies<IClient>();
         Builder.Services.AddAppCommandsBus(AssemblyResolver.AppTypes);
     }
 

TaskHub.Shared.Bootstraper.Full/TaskHub.Shared.Bootstraper.Full.csproj

@@ -13,8 +13,8 @@
 		<ProjectReference Include="..\TaskHub.Observability.Metrics.Implementation\TaskHub.Observability.Metrics.Implementation.csproj" />
 		<ProjectReference Include="..\TaskHub.Shared.Authorization.Identity\TaskHub.Shared.Authorization.Identity.csproj" />
 		<ProjectReference Include="..\TaskHub.Shared.Bootstraper.Basic\TaskHub.Shared.Bootstraper.Basic.csproj" />
-		<ProjectReference Include="..\TaskHub.Shared.Commands.Bus\TaskHub.Shared.Commands.Implementation.csproj" />
-		<ProjectReference Include="..\TaskHub.Shared.Networking\TaskHub.Shared.Networking.Implementation.csproj" />
+		<ProjectReference Include="..\TaskHub.Shared.Commands.Implementation\TaskHub.Shared.Commands.Implementation.csproj" />
+		<ProjectReference Include="..\TaskHub.Shared.Networking.Implementation\TaskHub.Shared.Networking.Implementation.csproj" />
 		<ProjectReference Include="..\TaskHub.Shared.Persistence.EntityFramework\TaskHub.Shared.Persistence.EntityFramework.csproj" />
 		<ProjectReference Include="..\TaskHub.Shared.Persistence.Redis\TaskHub.Shared.Persistence.Redis.csproj" />
 		<ProjectReference Include="..\TaskHub.Observability.OpenTelemetry\TaskHub.Observability.OpenTelemetry.csproj" />

…d.Commands.Bus/Bootstrap/BusBootstrap.cs …Implementation/Bootstrap/BusBootstrap.csTaskHub.Shared.Commands.Bus/Bootstrap/BusBootstrap.cs renamed to TaskHub.Shared.Commands.Implementation/Bootstrap/BusBootstrap.cs TaskHub.Shared.Commands.Bus/Bootstrap/BusBootstrap.cs renamed to TaskHub.Shared.Commands.Implementation/Bootstrap/BusBootstrap.cs

@@ -0,0 +1,8 @@
+using System.Diagnostics;
+
+namespace TaskHub.Shared.Networking.Abstractions;
+
+public abstract class ClientBase
+{
+    protected static readonly ActivitySource ActivitySource = new("JobClient");
+}

…mands.Bus/Bootstrap/PipelineBootstrap.cs …mentation/Bootstrap/PipelineBootstrap.csTaskHub.Shared.Commands.Bus/Bootstrap/PipelineBootstrap.cs renamed to TaskHub.Shared.Commands.Implementation/Bootstrap/PipelineBootstrap.cs TaskHub.Shared.Commands.Bus/Bootstrap/PipelineBootstrap.cs renamed to TaskHub.Shared.Commands.Implementation/Bootstrap/PipelineBootstrap.cs

@@ -2,9 +2,11 @@
 using Polly;
 using Polly.Extensions.Http;
 using Polly.Retry;
+using TaskHub.Shared.Networking.Abstractions;
 using TaskHub.Shared.Networking.Implementation.Exceptions;
 using TaskHub.Shared.Networking.Implementation.Handlers;
 using TaskHub.Shared.Networking.Implementation.Options;
+using TaskHub.Shared.Refactoring.Bootstrap;
 
 namespace TaskHub.Shared.Networking.Implementation.Bootstrap;
 
@@ -14,16 +16,17 @@ public static void AddAppNetworkingSettings(this IServiceCollection services, Ac
     {
         var settings = new NetworkOptions();
         action(settings);
+        services.AddHttpClient();
         services.AddSingleton(settings.Defaults);
         foreach (var (name, node) in settings.Services)
         {
-            services.AddAppHttpClient(name, settings.Defaults, node);
+            services.AddAppHttpClient(name, settings.Defaults, new OptionsResolver(settings.Defaults, node).Resolve());
         }
+        services.AddAppDependencies<IClient>();
     }
 
-    private static void AddAppHttpClient(this IServiceCollection services, string nodeName, NetworkDefaults defaults, NetworkNode node)
+    private static void AddAppHttpClient(this IServiceCollection services, string nodeName, NetworkDefaults defaults, EffectiveNetworkOptions effective)
     {
-        var effective = new OptionsResolver(defaults, node).Resolve();
         services.AddHttpClient(nodeName, (sp, c) =>
         {
             c.BaseAddress = new Uri(effective.BaseUrl);