chore : Upgrade the package and remove some useless configurations (#321

) * chore : Upgrade the package and remove some useless configurations * chore : Remove some extensions
masastack · Feb 23, 2023 · 5d28fb6 · 5d28fb6
1 parent 6a1ec08
commit 5d28fb6
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 1,172 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>0.7.0-preview.25</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.0.0-preview.9</MasaFrameworkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Masa.Mc.ApiGateways.Caller.csproj b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Masa.Mc.ApiGateways.Caller.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Contrib.Service.Caller" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Service.Caller.Authentication.OpenIdConnect" Version="$(MasaFrameworkPackageVersion)" />
   </ItemGroup>
 

diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/McCaller.cs b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/McCaller.cs
@@ -41,14 +41,11 @@ public class McCaller : HttpClientCallerBase
 
     protected override string BaseAddress { get; set; }
 
-    public override string Name { get; set; }
-
     public McCaller(
         IServiceProvider serviceProvider,
         TokenProvider tokenProvider,
         McApiOptions options) : base(serviceProvider)
     {
-        Name = nameof(McCaller);
         BaseAddress = options.McServiceBaseAddress;
         _tokenProvider = tokenProvider;
     }

diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/ServiceCollectionExtensions.cs b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/ServiceCollectionExtensions.cs
@@ -13,7 +13,7 @@ public static IServiceCollection AddMcApiGateways(this IServiceCollection servic
         configure?.Invoke(options);
         services.AddSingleton(options);
         services.AddScoped<HttpClientAuthorizationDelegatingHandler>();
-        services.AddCaller(Assembly.Load("Masa.Mc.ApiGateways.Caller"));
+        services.AddAutoRegistrationCaller(Assembly.Load("Masa.Mc.ApiGateways.Caller"));
         return services;
     }
 }
diff --git a/src/Infrastructure/Masa.Mc.Infrastructure.Common/Extensions/CollectionExtensions.cs b/src/Infrastructure/Masa.Mc.Infrastructure.Common/Extensions/CollectionExtensions.cs