From b7c14ae597f929ff2f2460e48f0c01a68eb6650d Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 11 Oct 2022 15:14:27 +0300
Subject: [PATCH] Cli: Fix project creation problems in 5.3.4

resolves https://github.com/volosoft/volo/issues/12220
---
 .../Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs   | 2 +-
 .../Templates/RemoveUnnecessaryPortsStep.cs                | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
index a5085f83a9..98ddb005a9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.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;
                 }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs
index e34f41a7a5..a80ac29e4f 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs
@@ -59,7 +59,12 @@ public class RemoveUnnecessaryPortsStep : ProjectBuildPipelineStep
 
         var appSettingsJsonObject = JObject.Parse(dbMigratorAppSettings.Content);
         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)
         {