Skip to content

Commit f3e25ac

Browse files
Only adding _ViewStart to non blazor projects (identity) (#1866) (#1867)
1 parent 5053ee8 commit f3e25ac

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorFilesConfig.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ internal static List<IdentityGeneratorFile> GetViewImports(IEnumerable<IdentityG
223223
private static readonly string _ViewImportFileName = "_ViewImports";
224224

225225
// Note: "peer" is somewhat of a misnomer, not all of the "peer" files are in the same directory as the layout file.
226-
internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPath, IdentityGeneratorTemplateModel templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles)
226+
internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPath, IdentityGeneratorTemplateModel templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles, bool isBlazorProject)
227227
{
228228
string viewImportsFileNameWithExtension = string.Concat(_ViewImportFileName, ".cshtml");
229229

@@ -273,8 +273,14 @@ internal static bool TryGetLayoutPeerFiles(IFileSystem fileSystem, string rootPa
273273
ShowInListFiles = false,
274274
ShouldOverWrite = OverWriteCondition.Never
275275
};
276-
peerFiles.Add(layoutPeerViewStart);
277276

277+
//don't need Layout for the start page of a Blazor Server application.
278+
//Still adding Layout file for other added pages.
279+
if (!isBlazorProject)
280+
{
281+
peerFiles.Add(layoutPeerViewStart);
282+
}
283+
278284
layoutPeerFiles = peerFiles;
279285
return true;
280286
}

src/Scaffolding/VS.Web.CG.Mvc/Identity/IdentityGeneratorTemplateModelBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private IdentityGeneratorFile[] DetermineFilesToGenerate(IdentityGeneratorTempla
273273
filesToGenerate.AddRange(IdentityGeneratorFilesConfig.GetViewImports(filesToGenerate, _fileSystem, _applicationInfo.ApplicationBasePath));
274274
}
275275

276-
if (IdentityGeneratorFilesConfig.TryGetLayoutPeerFiles(_fileSystem, _applicationInfo.ApplicationBasePath, templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles))
276+
if (IdentityGeneratorFilesConfig.TryGetLayoutPeerFiles(_fileSystem, _applicationInfo.ApplicationBasePath, templateModel, out IReadOnlyList<IdentityGeneratorFile> layoutPeerFiles, templateModel.IsBlazorProject))
277277
{
278278
filesToGenerate.AddRange(layoutPeerFiles);
279279
}

0 commit comments

Comments
 (0)