diff --git a/docs/en/Startup-Templates/Application.md b/docs/en/Startup-Templates/Application.md index 028801c634..ec89f479ab 100644 --- a/docs/en/Startup-Templates/Application.md +++ b/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: diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs index d488da98a9..8c72e7f023 100644 --- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs +++ b/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) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs index 94bd0383f6..68817cef07 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs +++ b/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); diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs index e5c045f316..351f575f46 100644 --- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs +++ b/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() .Initialize(); + + context.ServiceProvider.UseRebus(); } }