Merge pull request #13070 from abpframework/auto-merge/rel-5-3/1160

Merge branch dev with rel-5.3

docs/en/Startup-Templates/Application.md

@@ -34,6 +34,7 @@ This template provides multiple UI frameworks:
 
 * `mvc`: ASP.NET Core MVC UI with Razor Pages (default)
 * `blazor`: Blazor UI
+* `blazor-server`: Blazor Server UI
 * `angular`: Angular UI
 
 Use the `-u` or `--ui` option to specify the UI framework:

framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs

@@ -95,14 +95,17 @@ public class MinioBlobProvider : BlobProviderBase, ITransientDependency
     protected virtual MinioClient GetMinioClient(BlobProviderArgs args)
     {
         var configuration = args.Configuration.GetMinioConfiguration();
-        var client = new MinioClient(configuration.EndPoint, configuration.AccessKey, configuration.SecretKey);
+
+        var client = new MinioClient()
+            .WithEndpoint(configuration.EndPoint)
+            .WithCredentials(configuration.AccessKey, configuration.SecretKey);
 
         if (configuration.WithSSL)
         {
             client.WithSSL();
         }
 
-        return client;
+        return client.Build();
     }
 
     protected virtual async Task CreateBucketIfNotExists(MinioClient client, string containerName)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

@@ -83,8 +83,15 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
             }
 
             // MVC or BLAZOR SERVER
-            if (projectPath.EndsWith("csproj"))
+            if (projectPath.EndsWith(".csproj"))
             {
+                var packageJsonFilePath = Path.Combine(Path.GetDirectoryName(projectPath), "package.json");
+                
+                if (!File.Exists(packageJsonFilePath))
+                {
+                    continue;
+                }
+                
                 if (IsYarnAvailable())
                 {
                     RunYarn(projectDirectory);

framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs

@@ -41,11 +41,11 @@ public class AbpEventBusRebusModule : AbpModule
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
     {
-        context.ServiceProvider.UseRebus();
-
         context
             .ServiceProvider
             .GetRequiredService<RebusDistributedEventBus>()
             .Initialize();
+            
+        context.ServiceProvider.UseRebus();
     }
 }