Browse Source
Merge pull request #14292 from abpframework/volo/issues/12220
Cli: Fix project creation problems in 5.3.4
pull/14348/head
Alper Ebiçoğlu
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
2 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs
|
|
@ -120,7 +120,7 @@ public static class FileEntryExtensions |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (lines[i+1].Contains("<TEMPLATE-REMOVE")) |
|
|
if (i < lines.Length - 1 && lines[i+1].Contains("<TEMPLATE-REMOVE")) |
|
|
{ |
|
|
{ |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
|
|
|
@ -59,7 +59,12 @@ public class RemoveUnnecessaryPortsStep : ProjectBuildPipelineStep |
|
|
|
|
|
|
|
|
var appSettingsJsonObject = JObject.Parse(dbMigratorAppSettings.Content); |
|
|
var appSettingsJsonObject = JObject.Parse(dbMigratorAppSettings.Content); |
|
|
var identityServerJsonObject = (JObject)appSettingsJsonObject["IdentityServer"]; |
|
|
var identityServerJsonObject = (JObject)appSettingsJsonObject["IdentityServer"]; |
|
|
var clientsJsonObject = (JObject)identityServerJsonObject["Clients"]; |
|
|
var clientsJsonObject = (JObject) identityServerJsonObject?["Clients"]; |
|
|
|
|
|
|
|
|
|
|
|
if (clientsJsonObject == null) |
|
|
|
|
|
{ |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (context.BuildArgs.UiFramework != UiFramework.Blazor) |
|
|
if (context.BuildArgs.UiFramework != UiFramework.Blazor) |
|
|
{ |
|
|
{ |
|
|
|