Merge branch 'Varorbc-issue-30'

tonysneed · tonysneed · commit aad441339a28 · 2021-09-14T11:58:50.000-07:00
diff --git a/sample/ScaffoldingSample.Api/ScaffoldingSample.Api.csproj b/sample/ScaffoldingSample.Api/ScaffoldingSample.Api.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/ScaffoldingSample.Embedded/ScaffoldingSample.Embedded.csproj b/sample/ScaffoldingSample.Embedded/ScaffoldingSample.Embedded.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/ScaffoldingSample.TypeScript/ScaffoldingSample.TypeScript.csproj b/sample/ScaffoldingSample.TypeScript/ScaffoldingSample.TypeScript.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/ScaffoldingSample/ScaffoldingDesignTimeServices.cs b/sample/ScaffoldingSample/ScaffoldingDesignTimeServices.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using EntityFrameworkCore.Scaffolding.Handlebars;
 using HandlebarsDotNet;
 using Microsoft.EntityFrameworkCore.Design;
@@ -50,10 +48,10 @@ public void ConfigureDesignTimeServices(IServiceCollection services)
             });
 
             // Register Handlebars helper
-            var myHelper = (helperName: "my-helper", helperFunction: (Action<TextWriter, Dictionary<string, object>, object[]>)MyHbsHelper);
+            var myHelper = (helperName: "my-helper", helperFunction: (Action<EncodedTextWriter, Context, Arguments>)MyHbsHelper);
 
             // Register Handlebars block helper
-            var ifCondHelper = (helperName: "ifCond", helperFunction: (Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>)MyHbsBlockHelper);
+            var ifCondHelper = (helperName: "ifCond", helperFunction: (Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>)MyHbsBlockHelper);
 
             // Add optional Handlebars helpers
             services.AddHandlebarsHelpers(myHelper);
@@ -76,17 +74,17 @@ public void ConfigureDesignTimeServices(IServiceCollection services)
         }
 
         // Sample Handlebars helper
-        void MyHbsHelper(TextWriter writer, Dictionary<string, object> context, object[] parameters)
+        void MyHbsHelper(EncodedTextWriter writer, Context context, Arguments parameters)
         {
             writer.Write("// My Handlebars Helper");
         }
 
         // Sample Handlebars block helper
-        void MyHbsBlockHelper(TextWriter writer, HelperOptions options, Dictionary<string, object> context, object[] args)
+        void MyHbsBlockHelper(EncodedTextWriter writer, BlockHelperOptions options, Context context, Arguments args)
         {
-            var val0str = args?[0]?.ToString();
-            var val1str = args?[1]?.ToString();
-            var val2str = args?[2]?.ToString();
+            var val0str = args[0]?.ToString();
+            var val1str = args[1]?.ToString();
+            var val2str = args[2]?.ToString();
             var val1 = float.Parse(val0str ?? "0");
             var val2 = float.Parse(val2str ?? "0");
 
diff --git a/sample/ScaffoldingSample/ScaffoldingSample.csproj b/sample/ScaffoldingSample/ScaffoldingSample.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/EmbeddedResourceTemplateFileService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/EmbeddedResourceTemplateFileService.cs
@@ -30,10 +30,8 @@ public override string RetrieveTemplateFileContents(string relativeDirectory, st
             string resourceLocation = $"{_namespace}.{relativeDirectory.Replace('/', '.')}.{fileName}";
             using (var stream = _assembly.GetManifestResourceStream(resourceLocation))
             {
-                using (var reader = new StreamReader(stream))
-                {
-                    content = reader.ReadToEnd();
-                }
+                using var reader = new StreamReader(stream);
+                content = reader.ReadToEnd();
             }
 
             return content;
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/EntityFrameworkCore.Scaffolding.Handlebars.csproj b/src/EntityFrameworkCore.Scaffolding.Handlebars/EntityFrameworkCore.Scaffolding.Handlebars.csproj
@@ -56,10 +56,10 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Handlebars.Net" Version="1.11.5" />
-    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3" />
+    <PackageReference Include="Handlebars.Net" Version="2.0.9" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/GlobalSuppressions.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/GlobalSuppressions.cs
@@ -11,7 +11,6 @@
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "type", Target = "~T:EntityFrameworkCore.Scaffolding.Handlebars.HbsCSharpEntityTypeGenerator")]
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "type", Target = "~T:EntityFrameworkCore.Scaffolding.Handlebars.HbsReverseEngineerScaffolder")]
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "type", Target = "~T:EntityFrameworkCore.Scaffolding.Handlebars.HbsTypeScriptEntityTypeGenerator")]
-[assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "member", Target = "~M:EntityFrameworkCore.Scaffolding.Handlebars.HbsTypeScriptEntityTypeGenerator_Old.GenerateProperties(Microsoft.EntityFrameworkCore.Metadata.IEntityType)")]
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "type", Target = "~T:EntityFrameworkCore.Scaffolding.Handlebars.NullCSharpDbContextGenerator")]
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "member", Target = "~M:Microsoft.EntityFrameworkCore.Design.ServiceCollectionExtensions.AddHandlebarsScaffolding(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{EntityFrameworkCore.Scaffolding.Handlebars.HandlebarsScaffoldingOptions})~Microsoft.Extensions.DependencyInjection.IServiceCollection")]
 [assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "type", Target = "~T:EntityFrameworkCore.Scaffolding.Handlebars.NullCSharpEntityTypeGenerator")]
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsBlockHelperService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsBlockHelperService.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IO;
 using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
@@ -13,14 +12,13 @@ public class HbsBlockHelperService : IHbsBlockHelperService
         /// <summary>
         /// Handlebars block helpers.
         /// </summary>
-        public Dictionary<string, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>> Helpers { get; }
+        public Dictionary<string, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>> Helpers { get; }
 
         /// <summary>
         /// Constructor for the Handlebars block helper service.
         /// </summary>
         /// <param name="helpers">Dictionary of Handlebars helpers.</param>
-        public HbsBlockHelperService(
-            Dictionary<string, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>> helpers)
+        public HbsBlockHelperService(Dictionary<string, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>> helpers)
         {
             Helpers = helpers;
         }
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpEntityTypeGenerator.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpEntityTypeGenerator.cs
@@ -633,7 +633,7 @@ private static string StripAttribute(string attributeName)
             {
                 if (attributeName == null) throw new ArgumentNullException(nameof(attributeName));
                 return attributeName.EndsWith("Attribute", StringComparison.Ordinal)
-                    ? attributeName.Substring(0, attributeName.Length - 9)
+                    ? attributeName[0..^9]
                     : attributeName;
             }
         }
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsDbContextTemplateService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsDbContextTemplateService.cs
@@ -1,7 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Globalization;
 using EntityFrameworkCore.Scaffolding.Handlebars.Helpers;
+using HandlebarsDotNet;
 using Microsoft.EntityFrameworkCore.Design;
 using HandlebarsLib = HandlebarsDotNet.Handlebars;
 
@@ -17,7 +17,7 @@ public class HbsDbContextTemplateService : HbsTemplateService, IDbContextTemplat
         /// <summary>
         /// DbContext template.
         /// </summary>
-        public Func<object, string> DbContextTemplate { get; private set; }
+        public HandlebarsTemplate<object, object> DbContextTemplate { get; private set; }
 
         /// <summary>
         /// Constructor for the DbContext template service.
@@ -50,7 +50,7 @@ public virtual string GenerateDbContext(object data)
         /// </summary>
         /// <param name="language">Language option.</param>
         /// <returns>DbContext template.</returns>
-        protected virtual Func<object, string> CompileDbContextTemplate(
+        protected virtual HandlebarsTemplate<object, object> CompileDbContextTemplate(
             LanguageOptions language = LanguageOptions.CSharp)
         {
             DbContextTemplateFiles.TryGetValue(Constants.DbContextTemplate, out TemplateFileInfo contextFile);
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsEntityTypeTemplateService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsEntityTypeTemplateService.cs
@@ -1,7 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Globalization;
 using EntityFrameworkCore.Scaffolding.Handlebars.Helpers;
+using HandlebarsDotNet;
 using Microsoft.EntityFrameworkCore.Design;
 using HandlebarsLib = HandlebarsDotNet.Handlebars;
 
@@ -17,7 +17,7 @@ public class HbsEntityTypeTemplateService : HbsTemplateService, IEntityTypeTempl
         /// <summary>
         /// Entity type template.
         /// </summary>
-        public Func<object, string> EntityTypeTemplate { get; private set; }
+        public HandlebarsTemplate<object, object> EntityTypeTemplate { get; private set; }
 
         /// <summary>
         /// Constructor for entity type template service.
@@ -50,7 +50,7 @@ public virtual string GenerateEntityType(object data)
         /// </summary>
         /// <param name="language">Language option.</param>
         /// <returns>Entity type template.</returns>
-        protected virtual Func<object, string> CompileEntityTypeTemplate(
+        protected virtual HandlebarsTemplate<object, object> CompileEntityTypeTemplate(
             LanguageOptions language = LanguageOptions.CSharp)
         {
             EntitiesTemplateFiles.TryGetValue(Constants.EntityTypeTemplate, out TemplateFileInfo classFile);
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsEntityTypeTransformationService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsEntityTypeTransformationService.cs
@@ -164,9 +164,11 @@ public List<Dictionary<string, object>> TransformNavigationProperties(List<Dicti
                     navProperty["nav-property-name"] as string);
                 var transformedProp = NavPropertyTransformer?.Invoke(propTypeInfo) ?? propTypeInfo;
 
-                var newNavProperty = new Dictionary<string, object>(navProperty);
-                newNavProperty["nav-property-type"] = transformedProp.PropertyType;
-                newNavProperty["nav-property-name"] = transformedProp.PropertyName;
+                var newNavProperty = new Dictionary<string, object>(navProperty)
+                {
+                    ["nav-property-type"] = transformedProp.PropertyType,
+                    ["nav-property-name"] = transformedProp.PropertyName
+                };
 
                 transformedNavProperties.Add(newNavProperty);
             }
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsHelperService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/HbsHelperService.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IO;
+using HandlebarsDotNet;
 using HandlebarsLib = HandlebarsDotNet.Handlebars;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
@@ -13,14 +13,13 @@ public class HbsHelperService : IHbsHelperService
         /// <summary>
         /// Handlebars helpers.
         /// </summary>
-        public Dictionary<string, Action<TextWriter, Dictionary<string, object>, object[]>> Helpers { get; }
+        public Dictionary<string, Action<EncodedTextWriter, Context, Arguments>> Helpers { get; }
 
         /// <summary>
         /// Constructor for the Handlebars helper service.
         /// </summary>
         /// <param name="helpers">Dictionary of Handlebars helpers.</param>
-        public HbsHelperService(
-            Dictionary<string, Action<TextWriter, Dictionary<string, object>, object[]>> helpers)
+        public HbsHelperService(Dictionary<string, Action<EncodedTextWriter, Context, Arguments>> helpers)
         {
             Helpers = helpers;
         }
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/Helpers/HandlebarsHelpers.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/Helpers/HandlebarsHelpers.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using System.IO;
+using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars.Helpers
 {
@@ -12,7 +12,7 @@ public static class HandlebarsHelpers
         /// Get the spaces Handlebars helper.
         /// </summary>
         /// <returns>Spaces Handlebars helper.</returns>
-        public static Action<TextWriter, dynamic, object[]> SpacesHelper
+        public static Action<EncodedTextWriter, Context, Arguments> SpacesHelper
             => (writer, context, parameters) =>
             {
                 var spaces = string.Empty;
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/IDbContextTemplateService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/IDbContextTemplateService.cs
@@ -1,4 +1,4 @@
-﻿using System;
+﻿using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
 {
@@ -10,7 +10,7 @@ public interface IDbContextTemplateService : IHbsTemplateService
         /// <summary>
         /// DbContext template.
         /// </summary>
-        Func<object, string> DbContextTemplate { get; }
+        HandlebarsTemplate<object, object> DbContextTemplate { get; }
 
         /// <summary>
         /// Generate DbContext class.
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/IEntityTypeTemplateService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/IEntityTypeTemplateService.cs
@@ -1,4 +1,4 @@
-﻿using System;
+﻿using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
 {
@@ -10,7 +10,7 @@ public interface IEntityTypeTemplateService : IHbsTemplateService
         /// <summary>
         /// Entity type template.
         /// </summary>
-        Func<object, string> EntityTypeTemplate { get; }
+        HandlebarsTemplate<object, object> EntityTypeTemplate { get; }
 
         /// <summary>
         /// Generate entity type class.
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/IHbsBlockHelperService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/IHbsBlockHelperService.cs
@@ -1,7 +1,6 @@
-﻿using HandlebarsDotNet;
-using System;
+﻿using System;
 using System.Collections.Generic;
-using System.IO;
+using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
 {
@@ -13,7 +12,7 @@ public interface IHbsBlockHelperService
         /// <summary>
         /// Handlebars block helpers.
         /// </summary>
-        Dictionary<string, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>> Helpers { get; }
+        Dictionary<string, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>> Helpers { get; }
 
         /// <summary>
         /// Register Handlebars block helpers.
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/IHbsHelperService.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/IHbsHelperService.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IO;
+using HandlebarsDotNet;
 
 namespace EntityFrameworkCore.Scaffolding.Handlebars
 {
@@ -12,7 +12,7 @@ public interface IHbsHelperService
         /// <summary>
         /// Handlebars helpers.
         /// </summary>
-        Dictionary<string, Action<TextWriter, Dictionary<string, object>, object[]>> Helpers { get; }
+        Dictionary<string, Action<EncodedTextWriter, Context, Arguments>> Helpers { get; }
 
         /// <summary>
         /// Register Handlebars helpers.
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/ServiceCollectionExtensions.cs b/src/EntityFrameworkCore.Scaffolding.Handlebars/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using EntityFrameworkCore.Scaffolding.Handlebars;
 using EntityFrameworkCore.Scaffolding.Handlebars.Helpers;
@@ -123,15 +122,15 @@ public static IServiceCollection AddHandlebarsScaffolding(this IServiceCollectio
             services.AddSingleton<IEntityTypeTransformationService, HbsEntityTypeTransformationService>();
             services.AddSingleton<IHbsHelperService, HbsHelperService>(provider =>
             {
-                var helpers = new Dictionary<string, Action<TextWriter, Dictionary<string, object>, object[]>>
+                var helpers = new Dictionary<string, Action<EncodedTextWriter, Context, Arguments>>
                 {
                     {Constants.SpacesHelper, HandlebarsHelpers.SpacesHelper}
                 };
                 return new HbsHelperService(helpers);
             });
             services.AddSingleton<IHbsBlockHelperService, HbsBlockHelperService>(provider =>
             {
-                var helpers = new Dictionary<string, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>>();
+                var helpers = new Dictionary<string, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>>();
                 return new HbsBlockHelperService(helpers);
             });
             return services;
@@ -147,11 +146,11 @@ public static IServiceCollection AddHandlebarsScaffolding(this IServiceCollectio
         /// <param name="handlebarsHelpers">Handlebars helpers.</param>
         /// <returns>The same service collection so that multiple calls can be chained.</returns>
         public static IServiceCollection AddHandlebarsHelpers(this IServiceCollection services,
-            params (string helperName, Action<TextWriter, Dictionary<string, object>, object[]> helperFunction)[] handlebarsHelpers)
+            params (string helperName, Action<EncodedTextWriter, Context, Arguments> helperFunction)[] handlebarsHelpers)
         {
             services.AddSingleton<IHbsHelperService>(provider =>
             {
-                var helpers = new Dictionary<string, Action<TextWriter, Dictionary<string, object>, object[]>>
+                var helpers = new Dictionary<string, Action<EncodedTextWriter, Context, Arguments>>
                 {
                     {Constants.SpacesHelper, HandlebarsHelpers.SpacesHelper}
                 };
@@ -170,11 +169,11 @@ public static IServiceCollection AddHandlebarsHelpers(this IServiceCollection se
         /// <param name="handlebarsBlockHelpers">Handlebars block helpers.</param>
         /// <returns></returns>
         public static IServiceCollection AddHandlebarsBlockHelpers(this IServiceCollection services,
-            params (string helperName, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]> helperFunction)[] handlebarsBlockHelpers)
+            params (string helperName, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments> helperFunction)[] handlebarsBlockHelpers)
         {
             services.AddSingleton<IHbsBlockHelperService>(provider =>
             {
-                var helpers = new Dictionary<string, Action<TextWriter, HelperOptions, Dictionary<string, object>, object[]>>();
+                var helpers = new Dictionary<string, Action<EncodedTextWriter, BlockHelperOptions, Context, Arguments>>();
                 handlebarsBlockHelpers.ToList().ForEach(h => helpers.Add(h.helperName, h.helperFunction));
                 return new HbsBlockHelperService(helpers);
             });
diff --git a/test/Scaffolding.Handlebars.Tests/Fakes/FakeHbsDbContextTemplateService.cs b/test/Scaffolding.Handlebars.Tests/Fakes/FakeHbsDbContextTemplateService.cs
diff --git a/test/Scaffolding.Handlebars.Tests/Fakes/FakeHbsEntityTypeTemplateService.cs b/test/Scaffolding.Handlebars.Tests/Fakes/FakeHbsEntityTypeTemplateService.cs
diff --git a/test/Scaffolding.Handlebars.Tests/HbsCSharpScaffoldingGeneratorTests.cs b/test/Scaffolding.Handlebars.Tests/HbsCSharpScaffoldingGeneratorTests.cs
diff --git a/test/Scaffolding.Handlebars.Tests/HbsTypeScriptScaffoldingGeneratorTests.cs b/test/Scaffolding.Handlebars.Tests/HbsTypeScriptScaffoldingGeneratorTests.cs
diff --git a/test/Scaffolding.Handlebars.Tests/ReverseEngineeringConfigurationTests.cs b/test/Scaffolding.Handlebars.Tests/ReverseEngineeringConfigurationTests.cs
diff --git a/test/Scaffolding.Handlebars.Tests/Scaffolding.Handlebars.Tests.csproj b/test/Scaffolding.Handlebars.Tests/Scaffolding.Handlebars.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,8 @@ public override string RetrieveTemplateFileContents(string relativeDirectory, st`
`30`	`30`	`string resourceLocation = $"{_namespace}.{relativeDirectory.Replace('/', '.')}.{fileName}";`
`31`	`31`	`using (var stream = _assembly.GetManifestResourceStream(resourceLocation))`
`32`	`32`	`{`
`33`		`- using (var reader = new StreamReader(stream))`
`34`		`- {`
`35`		`- content = reader.ReadToEnd();`
`36`		`- }`
	`33`	`+ using var reader = new StreamReader(stream);`
	`34`	`+ content = reader.ReadToEnd();`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`return content;`
Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ private static string StripAttribute(string attributeName)`
`633`	`633`	`{`
`634`	`634`	`if (attributeName == null) throw new ArgumentNullException(nameof(attributeName));`
`635`	`635`	`return attributeName.EndsWith("Attribute", StringComparison.Ordinal)`
`636`		`- ? attributeName.Substring(0, attributeName.Length - 9)`
	`636`	`+ ? attributeName[0..^9]`
`637`	`637`	`: attributeName;`
`638`	`638`	`}`
`639`	`639`	`}`