Fix bug in FileSystemTemplateFileService.RetrieveAllFileNames

Author: Anthony Sneed

sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/Partials/DbOnConfiguring.hbs

@@ -1,10 +1 @@
-{{spaces 8}}protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-{{spaces 8}}{
-{{spaces 12}}if (!optionsBuilder.IsConfigured)
-{{spaces 12}}{
-{{#if suppress-connectionstring-warning}}
-{{spaces 16}}{{sensitive-information-warning}}
-{{/if}}
-{{spaces 16}}optionsBuilder{{options-builder-provider}};
-{{spaces 11}} }
-{{spaces 7}} }
+{{{on-configuring}}}

sample/ScaffoldingSample/Contexts/NorthwindSlimContext.cs

@@ -26,6 +26,16 @@ public NorthwindSlimContext(DbContextOptions<NorthwindSlimContext> options) : ba
         {
         }
 
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings.
+                optionsBuilder.UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB; Initial Catalog=NorthwindSlim; Integrated Security=True");
+            }
+        }
+
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<Category>(entity =>
@@ -37,6 +47,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<Customer>(entity =>
             {
+                entity.HasComment("hello table Customer");
+
                 entity.Property(e => e.CustomerId)
                     .HasMaxLength(5)
                     .IsFixedLength();
@@ -45,7 +57,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
                 entity.Property(e => e.CompanyName)
                     .IsRequired()
-                    .HasMaxLength(40);
+                    .HasMaxLength(40)
+                    .HasComment("hello CompanyName");
 
                 entity.Property(e => e.ContactName).HasMaxLength(30);
 

sample/ScaffoldingSample/ScaffoldingDesignTimeServices.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using EntityFrameworkCore.Scaffolding.Handlebars;
 using HandlebarsDotNet;
@@ -19,6 +20,9 @@ public class ScaffoldingDesignTimeServices : IDesignTimeServices
     {
         public void ConfigureDesignTimeServices(IServiceCollection services)
         {
+            // Uncomment to launch JIT debugger and hit breakpoints
+            //Debugger.Launch();
+
             // Add Handlebars scaffolding templates
             services.AddHandlebarsScaffolding(options =>
             {

src/EntityFrameworkCore.Scaffolding.Handlebars/FileSystemTemplateFileService.cs

@@ -37,7 +37,7 @@ public virtual string[] InputFiles(params InputFile[] files)
         /// <returns></returns>
         public virtual string[] RetrieveAllFileNames(string relativeDirectory)
         {            
-            return Directory.GetFiles(relativeDirectory, $"*.{Constants.TemplateExtension}").Select(x => Path.GetFileNameWithoutExtension(x)).ToArray();
+            return Directory.GetFiles(relativeDirectory, $"*{Constants.TemplateExtension}").Select(x => Path.GetFileNameWithoutExtension(x)).ToArray();
         }
 
         /// <summary>

src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpDbContextGenerator.cs

@@ -162,20 +162,55 @@ protected override void GenerateOnConfiguring(string connectionString, bool supp
         {
             Check.NotNull(connectionString, nameof(connectionString));
 
-            TemplateData.Add("connection-string", connectionString);
-            TemplateData.Add("suppress-connectionstring-warning", suppressConnectionStringWarning);
-            TemplateData.Add("sensitive-information-warning", $"#warning {DesignStrings.SensitiveInformationWarning}");
-
-            var useProviderCall = ProviderConfigurationCodeGenerator.GenerateUseProvider(
-                 connectionString,
-                 ProviderConfigurationCodeGenerator.GenerateProviderOptions());
-            var contextOptions = ProviderConfigurationCodeGenerator.GenerateContextOptions();
-            if (contextOptions != null)
+            var sb = new IndentedStringBuilder();
+            using (sb.Indent())
+            using (sb.Indent())
             {
-                useProviderCall = useProviderCall.Chain(contextOptions);
+                sb.AppendLine("protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)");
+                sb.AppendLine("{");
+
+                using (sb.Indent())
+                {
+                    sb.AppendLine("if (!optionsBuilder.IsConfigured)");
+                    sb.AppendLine("{");
+
+                    using (sb.Indent())
+                    {
+                        if (!suppressConnectionStringWarning)
+                        {
+                            sb.DecrementIndent()
+                                .DecrementIndent()
+                                .DecrementIndent()
+                                .DecrementIndent()
+                                .AppendLine("#warning " + DesignStrings.SensitiveInformationWarning)
+                                .IncrementIndent()
+                                .IncrementIndent()
+                                .IncrementIndent()
+                                .IncrementIndent();
+                        }
+
+                        sb.Append("optionsBuilder");
+
+                        var useProviderCall = ProviderConfigurationCodeGenerator.GenerateUseProvider(
+                            connectionString,
+                            ProviderConfigurationCodeGenerator.GenerateProviderOptions());
+                        var contextOptions = ProviderConfigurationCodeGenerator.GenerateContextOptions();
+                        if (contextOptions != null)
+                        {
+                            useProviderCall = useProviderCall.Chain(contextOptions);
+                        }
+
+                        sb.Append(CSharpHelper.Fragment(useProviderCall))
+                          .AppendLine(";");
+                    }
+                    sb.AppendLine("}");
+                }
+
+                sb.AppendLine("}");
             }
 
-            TemplateData.Add("options-builder-provider", CSharpHelper.Fragment(useProviderCall));
+            var onConfiguring = sb.ToString();
+            TemplateData.Add("on-configuring", onConfiguring);
         }
 
         /// <summary>