From 3c877d3960f2dee1360831b82b60fa50ec3df6d7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 15 Dec 2022 14:19:28 +0300 Subject: [PATCH 1/5] Cli: show the current cli version --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 9444381a0d..a7919e6567 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -50,14 +50,15 @@ public class CliService : ITransientDependency public async Task RunAsync(string[] args) { - Logger.LogInformation("ABP CLI (https://abp.io)"); + var currentCliVersion = await GetCurrentCliVersionInternalAsync(typeof(CliService).Assembly); + Logger.LogInformation($"ABP CLI {currentCliVersion} (https://abp.io)"); var commandLineArgs = CommandLineArgumentParser.Parse(args); #if !DEBUG if (!commandLineArgs.Options.ContainsKey("skip-cli-version-check")) { - await CheckCliVersionAsync(); + await CheckCliVersionAsync(currentCliVersion); } #endif try @@ -168,7 +169,7 @@ public class CliService : ITransientDependency } } - private async Task CheckCliVersionAsync() + private async Task CheckCliVersionAsync(SemanticVersion currentCliVersion) { if (!await IsLatestVersionCheckExpiredAsync()) { @@ -177,11 +178,8 @@ public class CliService : ITransientDependency var assembly = typeof(CliService).Assembly; var toolPath = GetToolPath(assembly); - var currentCliVersion = await GetCurrentCliVersionInternalAsync(assembly); var updateChannel = GetUpdateChannel(currentCliVersion); - Logger.LogInformation($"Version {currentCliVersion} ({updateChannel})"); - try { var latestVersion = await GetLatestVersion(updateChannel); From b6b299e683356756f85859ff746ac98bee38915c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:27:33 +0300 Subject: [PATCH 2/5] Update CliService.cs --- framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index a7919e6567..0b302520aa 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -51,7 +51,7 @@ public class CliService : ITransientDependency public async Task RunAsync(string[] args) { var currentCliVersion = await GetCurrentCliVersionInternalAsync(typeof(CliService).Assembly); - Logger.LogInformation($"ABP CLI {currentCliVersion} (https://abp.io)"); + Logger.LogInformation($"ABP CLI {currentCliVersion}"); var commandLineArgs = CommandLineArgumentParser.Parse(args); From af93359c3c3f363ad5b0057ec36a546dd36e8e45 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Mon, 19 Dec 2022 13:56:04 +0300 Subject: [PATCH 3/5] Update ng-bootstrap@14 (angular 15 version) --- npm/ng-packs/package.json | 2 +- npm/ng-packs/packages/theme-shared/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 553c2b13d4..8729b83c4d 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -73,7 +73,7 @@ "@abp/ng.theme.basic": "~7.0.0-rc.4", "@abp/ng.theme.shared": "~7.0.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "^14.0.0-rc.1", + "@ng-bootstrap/ng-bootstrap": "^14.0.0", "@ngneat/spectator": "^10.0.0", "@ngx-validate/core": "^0.2.0", "@nrwl/angular": "15.2.1", diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 74381079c0..0221ee73cd 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -9,7 +9,7 @@ "dependencies": { "@abp/ng.core": "~7.0.0-rc.4", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "^14.0.0-rc.1", + "@ng-bootstrap/ng-bootstrap": "^14.0.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.2", "@swimlane/ngx-datatable": "^20.0.0", From b338ca9bf89fcbe026d587d34fadf85d4b0d7cd8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 20 Dec 2022 09:26:26 +0300 Subject: [PATCH 4/5] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index be14865156..889b6d8ca9 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 7.0.0-rc.4 + 7.0.0-rc.5 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From 5f85163a22931633b31cd2a7a6c1f9af55a40ae5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 20 Dec 2022 10:39:21 +0300 Subject: [PATCH 5/5] Cli: Update default connections string for SqlServer --- .../Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs | 2 ++ .../Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 2c6cdc466d..f660e5ee53 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -84,6 +84,7 @@ public abstract class ProjectCreationCommandBase { Logger.LogInformation("Preview: yes"); +#if !DEBUG var cliVersion = await CliService.GetCurrentCliVersionAsync(typeof(CliService).Assembly); if (!cliVersion.IsPrerelease) @@ -92,6 +93,7 @@ public abstract class ProjectCreationCommandBase "You can only create a new preview solution with preview CLI version." + " Update your ABP CLI to the preview version."); } +#endif } var pwa = commandLineArgs.Options.ContainsKey(Options.ProgressiveWebApp.Short); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs index 1a4d5bfc98..f667ad0754 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs @@ -13,7 +13,7 @@ public class ConnectionStringProvider : ITransientDependency { case DatabaseManagementSystem.NotSpecified: case DatabaseManagementSystem.SQLServer: - return "Server=localhost;Database=MyProjectName;Trusted_Connection=True"; + return "Server=localhost;Database=MyProjectName;Trusted_Connection=True;TrustServerCertificate=True"; case DatabaseManagementSystem.MySQL: return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;"; case DatabaseManagementSystem.PostgreSQL: