enable module creator to add embeddedresources to csproj for internal modules

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor

@@ -61,8 +61,8 @@ else
 - Repository\I[Module]Repository.cs - interface for defining repository methods<br />
 - Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
 - Repository\[Module]Context.cs - provides a DB Context for data access<br />
-- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module]s.1.0.0.sql - database schema definition script<br />
-- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
+- Scripts\[Owner].[Module]s.Uninstall.sql - database uninstall script<br /><br />
 [RootPath]Shared\<br />
 - [Owner].[Module]s.csproj - shared project<br />
 - Models\[Module].cs - model definition<br /><br />

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor

@@ -53,8 +53,8 @@ else
 - Repository\I[Module]Repository.cs - interface for defining repository methods<br />
 - Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
 - Repository\[Module]Context.cs - provides a DB Context for data access<br />
-- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module]s.1.0.0.sql - database schema definition script<br />
-- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
+- Scripts\[Owner].[Module]s.Uninstall.sql - database uninstall script<br /><br />
 [RootPath]Oqtane.Shared\Modules\[Module]\<br />
 - Models\[Module].cs - model definition<br /><br />
 

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -14,6 +14,8 @@ using Oqtane.Security;
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
+using System.Xml.Linq;
+using Microsoft.AspNetCore.Mvc.Formatters;
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Controllers
@@ -208,13 +210,13 @@ namespace Oqtane.Controllers
                 if (moduleDefinition.Template == "internal")
                 {
                     rootPath = Utilities.PathCombine(rootFolder.FullName,"\\");
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client";
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s, Oqtane.Client";
                     moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
                 }
                 else
                 {
                     rootPath = Utilities.PathCombine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s","\\");
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Client.Oqtane";                    
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Client.Oqtane";                    
                     moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Server.Oqtane";
                 }
 
@@ -227,7 +229,11 @@ namespace Oqtane.Controllers
 
                 if (moduleDefinition.Template == "internal")
                 {
-                     // need logic to add embedded scripts to Oqtane.Server.csproj - also you need to remove them on uninstall
+                    // add embedded resources to project
+                    List<string> resources = new List<string>();
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.1.0.0.sql"));
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Uninstall.sql"));
+                    EmbedResourceFiles(Utilities.PathCombine(rootPath, "Oqtane.Server", "Oqtane.Server.csproj"), resources);
                 }
 
                 _installationManager.RestartApplication();
@@ -276,5 +282,19 @@ namespace Oqtane.Controllers
                 }
             }
         }
+
+        private void EmbedResourceFiles(string projectfile, List<string> resources)
+        {
+            XDocument project = XDocument.Load(projectfile);
+            var itemGroup = project.Descendants("ItemGroup").Descendants("EmbeddedResource").FirstOrDefault().Parent;
+            if (itemGroup != null)
+            {
+                foreach (var resource in resources)
+                {
+                    itemGroup.Add(new XElement("EmbeddedResource", new XAttribute("Include", resource)));
+                }
+            }
+            project.Save(projectfile);
+        }
     }
 }

Oqtane.Server/Oqtane.Server.csproj

@@ -1,5 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<?xml version="1.0" encoding="utf-8"?>
-
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
@@ -16,21 +16,14 @@
     <PackageReleaseNotes>Not for production use.</PackageReleaseNotes>
     <RootNamespace>Oqtane</RootNamespace>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Scripts\Tenant.0.9.1.sql" />
-    <None Remove="Scripts\Tenant.0.9.2.sql" />
-  </ItemGroup>
-
   <ItemGroup>
+    <EmbeddedResource Include="Scripts\Master.0.9.0.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.0.9.0.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.0.9.1.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.0.9.2.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
-    <EmbeddedResource Include="Scripts\Master.0.9.0.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.0.9.2.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.0.9.1.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.0.9.0.sql" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="dbup" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
@@ -41,10 +34,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.1.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Client\Oqtane.Client.csproj" />
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
-
+</Project>
-</Project>