diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Create.Interfaces.cs b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Create.Interfaces.cs index cdb915cc5..e984193b0 100644 --- a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Create.Interfaces.cs +++ b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Create.Interfaces.cs @@ -1,4 +1,4 @@ -using Microsoft.DotNet.Scaffolding.Shared.T4Templating; +using Microsoft.DotNet.Scaffolding.TextTemplating; namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.net8.BlazorCrud { diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Delete.Interfaces.cs b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Delete.Interfaces.cs index ccc16b6fa..363bde11d 100644 --- a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Delete.Interfaces.cs +++ b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Delete.Interfaces.cs @@ -1,4 +1,4 @@ -using Microsoft.DotNet.Scaffolding.Shared.T4Templating; +using Microsoft.DotNet.Scaffolding.TextTemplating; namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.net8.BlazorCrud { diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Details.Interfaces.cs b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Details.Interfaces.cs index 7c10bb558..eae995f88 100644 --- a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Details.Interfaces.cs +++ b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Details.Interfaces.cs @@ -1,4 +1,4 @@ -using Microsoft.DotNet.Scaffolding.Shared.T4Templating; +using Microsoft.DotNet.Scaffolding.TextTemplating; namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.net8.BlazorCrud { diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Edit.Interfaces.cs b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Edit.Interfaces.cs index e616d93b2..d2260372f 100644 --- a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Edit.Interfaces.cs +++ b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Edit.Interfaces.cs @@ -1,4 +1,4 @@ -using Microsoft.DotNet.Scaffolding.Shared.T4Templating; +using Microsoft.DotNet.Scaffolding.TextTemplating; namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.net8.BlazorCrud { diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Index.Interfaces.cs b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Index.Interfaces.cs index 983fa8351..b8c664e6a 100644 --- a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Index.Interfaces.cs +++ b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/BlazorCrud/Index.Interfaces.cs @@ -1,4 +1,4 @@ -using Microsoft.DotNet.Scaffolding.Shared.T4Templating; +using Microsoft.DotNet.Scaffolding.TextTemplating; namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.net8.BlazorCrud { diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/CodeModificationConfigs/blazorWebCrudChanges.json b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/CodeModificationConfigs/blazorWebCrudChanges.json index 1238556d4..a6eef9966 100644 Binary files a/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/CodeModificationConfigs/blazorWebCrudChanges.json and b/src/dotnet-scaffolding/dotnet-scaffold/AspNet/Templates/net8.0/CodeModificationConfigs/blazorWebCrudChanges.json differ diff --git a/test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/Blazor/BlazorCrudNet8IntegrationTests.cs b/test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/Blazor/BlazorCrudNet8IntegrationTests.cs index 96003135a..2259e91ac 100644 --- a/test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/Blazor/BlazorCrudNet8IntegrationTests.cs +++ b/test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/Blazor/BlazorCrudNet8IntegrationTests.cs @@ -60,35 +60,33 @@ public enum EmploymentType "--page", "CRUD"); Assert.True(cliExitCode == 0, $"CLI scaffold should succeed.\nOutput: {cliOutput}\nError: {cliError}"); - // Assert — expected files were created (only if scaffolding produced output; - // the scaffolder may silently skip file generation for older TFMs if model - // resolution or template execution encounters issues) + // Assert — expected files were created var blazorPagesDir = Path.Combine(_testProjectDir, "Components", "Pages", "TestModelPages"); - bool scaffoldingProducedFiles = Directory.Exists(blazorPagesDir); - if (scaffoldingProducedFiles) + Assert.True(Directory.Exists(blazorPagesDir), $"Blazor pages directory '{blazorPagesDir}' should be created."); + foreach (var page in new[] { "Create.razor", "Delete.razor", "Details.razor", "Edit.razor", "Index.razor" }) { - foreach (var page in new[] { "Create.razor", "Delete.razor", "Details.razor", "Edit.razor", "Index.razor" }) - { - Assert.True(File.Exists(Path.Combine(blazorPagesDir, page)), $"Blazor page '{page}' should be created."); - } + Assert.True(File.Exists(Path.Combine(blazorPagesDir, page)), $"Blazor page '{page}' should be created."); + } - var editContent = File.ReadAllText(Path.Combine(blazorPagesDir, "Edit.razor")); - Assert.Contains("ApplicationState.TryTakeFromJson(nameof(TestModel), out var restoredTestModel)", editContent); - Assert.Contains("TestModel = restoredTestModel", editContent); - Assert.Contains("ApplicationState.PersistAsJson(nameof(TestModel), TestModel)", editContent); + var editContent = File.ReadAllText(Path.Combine(blazorPagesDir, "Edit.razor")); + Assert.Contains("ApplicationState.TryTakeFromJson(nameof(TestModel), out var restoredTestModel)", editContent); + Assert.Contains("TestModel = restoredTestModel", editContent); + Assert.Contains("ApplicationState.PersistAsJson(nameof(TestModel), TestModel)", editContent); - var createContent = File.ReadAllText(Path.Combine(blazorPagesDir, "Create.razor")); - Assert.Contains("", programContent); - // Assert — no NuGet errors and project builds after scaffolding - Assert.False(cliOutput.Contains("error: NU"), - $"Scaffolding should not produce NuGet errors for {TargetFramework}.\nOutput: {cliOutput}"); - var (afterExitCode, _, afterError) = await RunBuildAsync(_testProjectDir); - Assert.True(afterExitCode == 0, $"Project should still build after scaffolding. Error: {afterError}"); - } + // Assert — no NuGet errors and project builds after scaffolding + Assert.False(cliOutput.Contains("error: NU"), + $"Scaffolding should not produce NuGet errors for {TargetFramework}.\nOutput: {cliOutput}"); + var (afterExitCode, _, afterError) = await RunBuildAsync(_testProjectDir); + Assert.True(afterExitCode == 0, $"Project should still build after scaffolding. Error: {afterError}"); } }