fix bug with FileScopedNamespace

Author: pwelter34

src/EntityFrameworkCore.Generator.Core/Options/ClassOptionsBase.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel;
 
 namespace EntityFrameworkCore.Generator.Options;
@@ -57,6 +58,6 @@ public string Directory
     /// <value>
     ///   <c>true</c> to use file-coped namespace; otherwise, <c>false</c>.
     /// </value>
-    [DefaultValue(false)]
-    public bool FileScopedNamespace { get; set; }
-}
+    [Obsolete("Use ProjectOptions.FileScopedNamespace instead")]
+    public bool? FileScopedNamespace { get; set; }
+}

src/EntityFrameworkCore.Generator.Core/Options/ProjectOptions.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel;
+
 namespace EntityFrameworkCore.Generator.Options;
 
 /// <summary>
@@ -48,6 +50,15 @@ public string Directory
     /// <value>
     /// If the output should support nullable reference types.
     /// </value>
+    [DefaultValue(false)]
     public bool Nullable { get; set; }
 
-}
+    /// <summary>
+    /// Gets or sets a value indicating whether to use file-scoped namespace.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> to use file-coped namespace; otherwise, <c>false</c>.
+    /// </value>
+    [DefaultValue(false)]
+    public bool FileScopedNamespace { get; set; }
+}

src/EntityFrameworkCore.Generator.Core/Templates/CodeTemplateBase.cs

@@ -78,4 +78,4 @@ protected virtual void MergeOutput(string fullPath, string outputContent)
 
         File.WriteAllText(fullPath, finalContent);
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/DataContextTemplate.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+
 using EntityFrameworkCore.Generator.Extensions;
 using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
@@ -25,7 +26,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_entityContext.ContextNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -154,4 +155,4 @@ private void GenerateOnConfiguring()
 
         CodeBuilder.AppendLine("}");
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/EntityClassTemplate.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+
 using EntityFrameworkCore.Generator.Extensions;
 using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
@@ -24,7 +25,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_entity.EntityNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -207,4 +208,4 @@ private void GenerateRelationshipProperties()
         CodeBuilder.AppendLine("#endregion");
         CodeBuilder.AppendLine();
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/MapperClassTemplate.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+
 using EntityFrameworkCore.Generator.Extensions;
 using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
@@ -35,7 +36,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_entity.MapperNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -141,4 +142,4 @@ private void GenerateConstructor()
         CodeBuilder.AppendLine();
     }
 
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/MappingClassTemplate.cs

@@ -1,16 +1,18 @@
 using System.Globalization;
 using System.Linq;
+
 using EntityFrameworkCore.Generator.Extensions;
 using EntityFrameworkCore.Generator.Metadata.Generation;
 using EntityFrameworkCore.Generator.Options;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace EntityFrameworkCore.Generator.Templates;
 
 public class MappingClassTemplate : CodeTemplateBase
 {
-    private Entity _entity;
+    private readonly Entity _entity;
 
     public MappingClassTemplate(Entity entity, GeneratorOptions options) : base(options)
     {
@@ -29,7 +31,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_entity.MappingNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -104,7 +106,7 @@ private void GenerateConstants()
 
             CodeBuilder.AppendLine($"public const string Name = \"{_entity.TableName}\";");
         }
-            
+
         CodeBuilder.AppendLine("}");
 
         CodeBuilder.AppendLine();
@@ -362,4 +364,4 @@ private void GenerateTableMapping()
 
         CodeBuilder.AppendLine();
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/ModelClassTemplate.cs

@@ -23,7 +23,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_model.ModelNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -119,4 +119,4 @@ private bool ShouldDocument()
 
         return Options.Model.Read.Document;
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/QueryExtensionTemplate.cs

@@ -30,7 +30,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {extensionNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -325,4 +325,4 @@ private void AppendLamba(Method method)
         if (indented)
             CodeBuilder.DecrementIndent();
     }
-}
+}

src/EntityFrameworkCore.Generator.Core/Templates/ValidatorClassTemplate.cs

@@ -27,7 +27,7 @@ public override string WriteCode()
 
         CodeBuilder.Append($"namespace {_model.ValidatorNamespace}");
 
-        if (Options.Data.Context.FileScopedNamespace)
+        if (Options.Project.FileScopedNamespace)
         {
             CodeBuilder.AppendLine(";");
             GenerateClass();
@@ -116,4 +116,4 @@ private void GenerateConstructor()
         CodeBuilder.AppendLine();
     }
 
-}
+}