Fix EsmAssetBasePath reading from arguments

serenity-is · Sep 16, 2024 · 8abb3d5 · 8abb3d5
1 parent 3bbe523
commit 8abb3d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Serenity.Net.CodeGenerator/Commands/MvcCommand.cs b/src/Serenity.Net.CodeGenerator/Commands/MvcCommand.cs
@@ -148,10 +148,9 @@ string getName(string s)
         if (!string.IsNullOrEmpty(esmAssetBasePath))
             esmGenerator.EsmAssetBasePath = esmAssetBasePath;
 
-        var globs = config.TSBuild?.EntryPoints as IEnumerable<string>;
-        if (globs != null)
+        if (config.TSBuild?.EntryPoints is IEnumerable<string> globs)
         {
-            if (globs.FirstOrDefault() != "+") 
+            if (globs.FirstOrDefault() != "+")
                 esmGenerator.EntryPoints.Clear();
             else
                 globs = globs.Skip(1);

diff --git a/src/Serenity.Net.CodeGenerator/Generator/ProjectFileInfo.cs b/src/Serenity.Net.CodeGenerator/Generator/ProjectFileInfo.cs
@@ -63,7 +63,7 @@ public string GetEsmAssetBasePath()
             }
         }
 
-        return string.IsNullOrEmpty(targetFramework) ? null : targetFramework;
+        return string.IsNullOrEmpty(esmAssetBasePath) ? null : esmAssetBasePath;
     }
 
     public string GetOutDir()