diff --git a/src/Configuration/ResourceGenerator.cs b/src/Configuration/ResourceGenerator.cs index 50cf176..35dc017 100644 --- a/src/Configuration/ResourceGenerator.cs +++ b/src/Configuration/ResourceGenerator.cs @@ -40,8 +40,15 @@ public static class ResourceGenerator /// public static IEnumerable DefaultClientScripts => new List { - "NFive.Client.net.dll" - }; + "DotNetZip.dll", + "Newtonsoft.Json.dll", + "NGettext.dll", + "System.ComponentModel.DataAnnotations.dll", + + "NFive.Client.net.dll", + "NFive.SDK.Core.net.dll", + "NFive.SDK.Client.net.dll" + }; /// /// Gets the default client files. @@ -51,14 +58,6 @@ public static class ResourceGenerator /// public static IEnumerable DefaultClientFiles => new List { - "DotNetZip.dll", - "Newtonsoft.Json.dll", - "NGettext.dll", - "System.ComponentModel.DataAnnotations.dll", - - "NFive.SDK.Core.net.dll", - "NFive.SDK.Client.net.dll", - "index.html" }; @@ -85,6 +84,10 @@ public static void Serialize(DefinitionGraph graph) output.AppendLine(); output.AppendLine("client_scripts {"); + output.AppendLine("\t-- NFive"); + foreach (var file in DefaultClientScripts) output.AppendLine($"\t'{file}',"); + output.AppendLine(); + foreach (var plugin in graph.Plugins.Where(d => d.Client?.Include?.Count > 0 || d.Client?.Main?.Count > 0)) { output.AppendLine($"\t-- {plugin.Name}@{plugin.Version}"); @@ -92,8 +95,6 @@ public static void Serialize(DefinitionGraph graph) if (plugin.Client?.Main != null) foreach (var file in plugin.Client.Main) output.AppendLine($"\t'{Path.Combine(ConfigurationManager.PluginPath, plugin.Name.Vendor, plugin.Name.Project, file).Replace(Path.DirectorySeparatorChar, '/')}.net.dll',"); output.AppendLine(); } - output.AppendLine("\t-- NFive"); - foreach (var file in DefaultClientScripts) output.AppendLine($"\t'{file}',"); output.AppendLine("}"); output.AppendLine();