[C#] Fix using en trop si requiredNonNullable

klee-contrib · Sep 9, 2024 · 2f1fe4a · 2f1fe4a
1 parent ab6927e
commit 2f1fe4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/TopModel.Generator.Csharp/CSharpClassGenerator.cs b/TopModel.Generator.Csharp/CSharpClassGenerator.cs
@@ -462,7 +462,10 @@ protected virtual void GenerateUsings(CSharpWriter w, Class item, string tag)
                 usings.Add("System.ComponentModel");
             }
 
-            if (item.Properties.Any(p => p.Required || p.PrimaryKey || Config.GetType(p)?.TrimEnd('?') == "string" && p.Domain.Length != null))
+            if (item.Properties.Any(p =>
+                p.Required && !Config.RequiredNonNullable(tag)
+                || p.PrimaryKey
+                || Config.GetType(p)?.TrimEnd('?') == "string" && p.Domain.Length != null))
             {
                 usings.Add("System.ComponentModel.DataAnnotations");
             }

diff --git a/TopModel.Generator/Program.cs b/TopModel.Generator/Program.cs
@@ -226,7 +226,7 @@ void HandleFile(FileInfo file)
     {
         var generatorsPath = Path.Combine(new FileInfo(Assembly.GetEntryAssembly()!.Location).DirectoryName!, "../../../..");
         var modules = Directory.GetFileSystemEntries(generatorsPath).Where(e => e.Contains("TopModel.Generator.") && !e.Contains("TopModel.Generator.Core"));
-        config.CustomGenerators.AddRange(modules.Select(m => Path.GetRelativePath(config.ModelRoot, m)));
+        config.CustomGenerators.AddRange(modules.Select(m => Path.GetRelativePath(config.ModelRoot, m).Replace("\\", "/")));
     }
 
     if (updateMode == "all")