From f3e25ac742b8ec81aab3b3f1e6202326bec2f242 Mon Sep 17 00:00:00 2001
From: Deep Choudhery <54324771+deepchoudhery@users.noreply.github.com>
Date: Thu, 31 Mar 2022 22:57:42 -0700
Subject: [PATCH] Only adding _ViewStart to non blazor projects (identity)
 (#1866) (#1867)

---
 .../Identity/IdentityGeneratorFilesConfig.cs           | 10 ++++++++--
 .../Identity/IdentityGeneratorTemplateModelBuilder.cs  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorFilesConfig.cs b/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorFilesConfig.cs
index 73652070c..7f3708677 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorFilesConfig.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorFilesConfig.cs
@@ -223,7 +223,7 @@ internal static List<IdentityGeneratorFile> GetViewImports(IEnumerable<IdentityG
         private static readonly string _ViewImportFileName = "_ViewImports";
 
         // Note: "peer" is somewhat of a misnomer, not all of the "peer" files are in the same directory as the layout file.
-        internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPath, IdentityGeneratorTemplateModel templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles)
+        internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPath, IdentityGeneratorTemplateModel templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles, bool isBlazorProject)
         {
             string viewImportsFileNameWithExtension = string.Concat(_ViewImportFileName, ".cshtml");
 
@@ -273,8 +273,14 @@ internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPa
                 ShowInListFiles = false,
                 ShouldOverWrite = OverWriteCondition.Never
             };
-            peerFiles.Add(layoutPeerViewStart);
 
+            //don't need Layout for the start page of a Blazor Server application.
+            //Still adding Layout file for other added pages.
+            if (!isBlazorProject)
+            {
+                peerFiles.Add(layoutPeerViewStart);
+            }
+            
             layoutPeerFiles = peerFiles;
             return true;
         }
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorTemplateModelBuilder.cs b/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorTemplateModelBuilder.cs
index 256276a6f..86c96edff 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorTemplateModelBuilder.cs
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorTemplateModelBuilder.cs
@@ -273,7 +273,7 @@ private IdentityGeneratorFile[] DetermineFilesToGenerate(IdentityGeneratorTempla
                 filesToGenerate.AddRange(IdentityGeneratorFilesConfig.GetViewImports(filesToGenerate, _fileSystem, _applicationInfo.ApplicationBasePath));
             }
 
-            if (IdentityGeneratorFilesConfig.TryGetLayoutPeerFiles(_fileSystem, _applicationInfo.ApplicationBasePath, templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles))
+            if (IdentityGeneratorFilesConfig.TryGetLayoutPeerFiles(_fileSystem, _applicationInfo.ApplicationBasePath, templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles, templateModel.IsBlazorProject))
             {
                 filesToGenerate.AddRange(layoutPeerFiles);
             }