From bd334c958dadaf9343beb9249d5fd5d2b50195a5 Mon Sep 17 00:00:00 2001 From: Roc Date: Wed, 25 May 2022 16:48:53 +0800 Subject: [PATCH 1/5] Update appsettings.json --- .../MyCompanyName.MyProjectName.IdentityServer/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index 00f7dcefe2..5f4ad79d11 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -3,7 +3,7 @@ "SelfUrl": "https://localhost:44301", "ClientUrl": "http://localhost:4200", "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44300", - "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307" + "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44302,https://localhost:44307" }, "ConnectionStrings": { "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True" From ba46efa9cf36b5f31b0190579880380c5e7296f1 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 26 May 2022 12:14:19 +0300 Subject: [PATCH 2/5] Cli: Check file exist in NugetPackageToLocalReferenceConverter --- .../NugetPackageToLocalReferenceConverter.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs index 3082f59807..3be2428a79 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs @@ -30,6 +30,11 @@ public class NugetPackageToLocalReferenceConverter : ITransientDependency foreach (var projectFile in projectFiles) { + if (!File.Exists(projectFile)) + { + return; + } + var content = File.ReadAllText(projectFile); using (var stream = StreamHelper.GenerateStreamFromString(content)) { From bd63b965a5914c4d97138e93311560997444aab7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 26 May 2022 13:42:17 +0300 Subject: [PATCH 3/5] Added logs --- .../NugetPackageToLocalReferenceConverter.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs index 3be2428a79..bb9360b550 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageToLocalReferenceConverter.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; @@ -12,6 +14,12 @@ namespace Volo.Abp.Cli.ProjectModification; public class NugetPackageToLocalReferenceConverter : ITransientDependency { + public ILogger Logger { get; set; } + + public NugetPackageToLocalReferenceConverter(){ + Logger = NullLogger.Instance; + } + public async Task Convert(ModuleWithMastersInfo module, string solutionFile, string modulePrefix = "Volo.") { var nugetPackageList = GetNugetPackages(module); @@ -32,6 +40,7 @@ public class NugetPackageToLocalReferenceConverter : ITransientDependency { if (!File.Exists(projectFile)) { + Logger.LogWarning($"{projectFile} could not be found, skipping..."); return; } From 98977c6586d38affd9196b4a9d6046428850db18 Mon Sep 17 00:00:00 2001 From: Roc Date: Fri, 27 May 2022 09:47:13 +0800 Subject: [PATCH 4/5] Update appsettings.json --- .../MyCompanyName.MyProjectName.IdentityServer/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index 5f4ad79d11..0f09fa9d6b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -3,7 +3,7 @@ "SelfUrl": "https://localhost:44301", "ClientUrl": "http://localhost:4200", "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44300", - "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44302,https://localhost:44307" + "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44302,https://localhost:44307,https://localhost:443097" }, "ConnectionStrings": { "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True" From 02622fbba7980a5df87c620e81f041a5011b5657 Mon Sep 17 00:00:00 2001 From: Roc Date: Fri, 27 May 2022 09:51:33 +0800 Subject: [PATCH 5/5] Update appsettings.json --- .../MyCompanyName.MyProjectName.IdentityServer/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index 0f09fa9d6b..2d7115408e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -3,7 +3,7 @@ "SelfUrl": "https://localhost:44301", "ClientUrl": "http://localhost:4200", "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44300", - "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44302,https://localhost:44307,https://localhost:443097" + "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44302,https://localhost:44307,https://localhost:44309" }, "ConnectionStrings": { "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True"