From 66c70302dde06f31b9ec081e54f7b08063ec1766 Mon Sep 17 00:00:00 2001 From: Deep Choudhery Date: Sun, 6 Oct 2024 22:02:11 -0700 Subject: [PATCH 1/2] updated ProjectModifierHelper.ModifyDocumentText --- scripts/install-aspnet-codegenerator.cmd | 2 +- .../VS.Web.CG.Mvc/BlazorIdentity/blazorIdentityChanges.json | 6 ++++-- .../Project/ProjectModifierHelper.cs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/install-aspnet-codegenerator.cmd b/scripts/install-aspnet-codegenerator.cmd index ade5dc4ec..888b0d49a 100644 --- a/scripts/install-aspnet-codegenerator.cmd +++ b/scripts/install-aspnet-codegenerator.cmd @@ -1,4 +1,4 @@ -set VERSION=8.0.2 +set VERSION=8.0.6 set DEFAULT_NUPKG_PATH=C:\Nuget set SRC_DIR=%cd% set NUPKG=artifacts/packages/Debug/Shipping/ diff --git a/src/Scaffolding/VS.Web.CG.Mvc/BlazorIdentity/blazorIdentityChanges.json b/src/Scaffolding/VS.Web.CG.Mvc/BlazorIdentity/blazorIdentityChanges.json index efaff5232..15b80c933 100644 --- a/src/Scaffolding/VS.Web.CG.Mvc/BlazorIdentity/blazorIdentityChanges.json +++ b/src/Scaffolding/VS.Web.CG.Mvc/BlazorIdentity/blazorIdentityChanges.json @@ -111,7 +111,8 @@ " ", " ", " " - ] + ], + "CheckBlock": "" } ] }, @@ -124,6 +125,7 @@ " background-image: url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E\");", "}" ], + "CheckBlock": "bi-lock-nav-menu", "MultiLineBlock": [ ".bi-list-nested-nav-menu {", " background-image: url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E\");", @@ -242,7 +244,7 @@ "@using Microsoft.AspNetCore.Components.Forms", "@using Microsoft.AspNetCore.Components.Authorization" ], - "CheckBlock": "@using Microsoft.AspNetCore.Components.Authorization" + "CheckBlock": "Microsoft.AspNetCore.Components.Authorization" } ] } diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs index 715bd4e7a..7b791f2be 100644 --- a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs +++ b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs @@ -553,7 +553,8 @@ internal static async Task ModifyDocumentText(Document fileDoc, IEnume if (change.ReplaceSnippet != null) { var replaceSnippet = string.Join(Environment.NewLine, change.ReplaceSnippet); - if (sourceFileString.Contains(replaceSnippet)) + if (!sourceFileString.Contains(change.CheckBlock, StringComparison.OrdinalIgnoreCase) && + sourceFileString.Contains(replaceSnippet, StringComparison.OrdinalIgnoreCase)) { sourceFileString = sourceFileString.Replace(replaceSnippet, change.Block); } From 7caafc03b5a9c87ba9d17596146b8b0ecaf2de07 Mon Sep 17 00:00:00 2001 From: Deep Choudhery Date: Sun, 6 Oct 2024 22:18:08 -0700 Subject: [PATCH 2/2] use ignore case extension for the 'Contains' check. --- .../Project/ProjectModifierHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs index 7b791f2be..ca0b97395 100644 --- a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs +++ b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ProjectModifierHelper.cs @@ -553,8 +553,8 @@ internal static async Task ModifyDocumentText(Document fileDoc, IEnume if (change.ReplaceSnippet != null) { var replaceSnippet = string.Join(Environment.NewLine, change.ReplaceSnippet); - if (!sourceFileString.Contains(change.CheckBlock, StringComparison.OrdinalIgnoreCase) && - sourceFileString.Contains(replaceSnippet, StringComparison.OrdinalIgnoreCase)) + if (!sourceFileString.ContainsIgnoreCase(change.CheckBlock) && + sourceFileString.ContainsIgnoreCase(replaceSnippet)) { sourceFileString = sourceFileString.Replace(replaceSnippet, change.Block); }