From d638f9492d6452501ed8a7d801b562830142c51d Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Fri, 30 Jan 2026 14:03:21 +0100
Subject: [PATCH 1/2] Move I[Module]Service to Shared

Relocate the I[Module]Service interface from the client Services file to a new Shared/Interfaces/I[Module]Service.cs so the interface becomes a shared contract. Remove the duplicate interface from the client-side [Module]Service implementation.
It was move in error, release 6.1.5 PR add a new Visual Studio Project Template #5493
---
 Oqtane.Server/Oqtane.Server.csproj             |  5 +++++
 .../Client/Services/[Module]Service.cs         | 12 ------------
 .../Shared/Interfaces/I[Module]Service.cs      | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs

diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 4ba5c66c..446622cf 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -20,6 +20,7 @@
     <Content Remove="wwwroot\_content\*\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
+    <None Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\MigrateMaster.sql" />
@@ -78,4 +79,8 @@
     <!-- extends watching group to include *.dll files and exclude the ones cause an infinite loop -->
     <Watch Include="**\*.dll" Exclude="**\Microsoft.EntityFrameworkCore.*.dll;**\Oqtane.Database.*.dll;" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Watch Remove="wwwroot\Modules\Templates\**" />
+  </ItemGroup>
 </Project>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
index d433d698..24046476 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
@@ -7,18 +7,6 @@ using Oqtane.Shared;
 
 namespace [Owner].Module.[Module].Services
 {
-    public interface I[Module]Service 
-    {
-        Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId);
-
-        Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId);
-
-        Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module]);
-
-        Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module]);
-
-        Task Delete[Module]Async(int [Module]Id, int ModuleId);
-    }
 
     public class [Module]Service : ServiceBase, I[Module]Service
     {
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs
new file mode 100644
index 00000000..8c75bf44
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace [Owner].Module.[Module].Services
+{
+    public interface I[Module]Service 
+    {
+        Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId);
+
+        Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId);
+
+        Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module]);
+
+        Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module]);
+
+        Task Delete[Module]Async(int [Module]Id, int ModuleId);
+    }
+}

From 563696c7a53031a01cb9c298ea5986b009ba05d3 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Fri, 30 Jan 2026 17:37:35 +0100
Subject: [PATCH 2/2] Removed the Reference to the External Client in the
 External Server project

---
 .../External/Server/[Owner].Module.[Module].Server.csproj        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj
index 45389595..8fabc8ca 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Client\[Owner].Module.[Module].Client.csproj" />
     <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" />
   </ItemGroup>