From 573c6235923878e9b483e934185b3928692183b0 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 30 Apr 2020 14:36:30 -0400
Subject: [PATCH] fixes to module templates

---
 .../ModuleCreator/Templates/External/Client/Index.razor  | 4 ++--
 .../Server/[Owner].[Module]s.Module.Server.csproj        | 9 ++-------
 .../Internal/Oqtane.Client/Modules/[Module]/Index.razor  | 4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor
index 68c31a34..15d660be 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor
@@ -62,8 +62,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\[Module].1.0.0.sql - database schema definition script<br /><br />
-- Scripts\[Module].Uninstall.sql - database uninstall script<br /><br />
+- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
 [RootPath]Shared\<br />
 - [Owner].[Module]s.Module.Shared.csproj - shared project<br />
 - Models\[Module].cs - model definition<br /><br />
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj
index d9ec6aee..02a34494 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj
@@ -13,13 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Scripts\[Module].1.0.0.sql" />
-    <None Remove="Scripts\[Module].Uninstall.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Scripts\[Module].1.0.0.sql" />
-    <EmbeddedResource Include="Scripts\[Module].Uninstall.sql" />
+    <EmbeddedResource Include="Scripts\[Owner].[Module].1.0.0.sql" />
+    <EmbeddedResource Include="Scripts\[Owner].[Module].Uninstall.sql" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
index 15cf068b..2c9f1764 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
@@ -54,8 +54,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\[Module].1.0.0.sql - database schema definition script<br /><br />
-- Scripts\[Module].Uninstall.sql - database uninstall script<br /><br />
+- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
 [RootPath]Oqtane.Shared\Modules\[Module]\<br />
 - Models\[Module].cs - model definition<br /><br />