[ENHANCE] - Added Module to NameSpace [Owner].Module.[Module]
[ENHANCE] - Added Module to NameSpace [Owner].Module.[Module]
This commit is contained in:
		| @ -1,4 +1,4 @@ | ||||
| using System.Resources; | ||||
| using System.Resources; | ||||
| using Microsoft.Extensions.Localization; | ||||
|  | ||||
| [assembly: RootNamespace("[Owner].[Module].Client")] | ||||
| [assembly: RootNamespace("[Owner].Module.[Module].Client")] | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| using Microsoft.JSInterop; | ||||
| using Microsoft.JSInterop; | ||||
| using System.Threading.Tasks; | ||||
|  | ||||
| namespace [Owner].[Module] | ||||
| namespace [Owner].Module.[Module] | ||||
| { | ||||
|     public class Interop | ||||
|     { | ||||
|  | ||||
| @ -1,8 +1,8 @@ | ||||
| @using Oqtane.Modules.Controls | ||||
| @using [Owner].[Module].Services | ||||
| @using [Owner].[Module].Models | ||||
| @using [Owner].Module.[Module].Services | ||||
| @using [Owner].Module.[Module].Models | ||||
| 
 | ||||
| @namespace [Owner].[Module] | ||||
| @namespace [Owner].Module.[Module] | ||||
| @inherits ModuleBase | ||||
| @inject I[Module]Service [Module]Service | ||||
| @inject NavigationManager NavigationManager | ||||
| @ -1,7 +1,7 @@ | ||||
| @using [Owner].[Module].Services | ||||
| @using [Owner].[Module].Models | ||||
| @using [Owner].Module.[Module].Services | ||||
| @using [Owner].Module.[Module].Models | ||||
| 
 | ||||
| @namespace [Owner].[Module] | ||||
| @namespace [Owner].Module.[Module] | ||||
| @inherits ModuleBase | ||||
| @inject I[Module]Service [Module]Service | ||||
| @inject NavigationManager NavigationManager | ||||
| @ -1,7 +1,7 @@ | ||||
| using Oqtane.Models; | ||||
| using Oqtane.Modules; | ||||
| 
 | ||||
| namespace [Owner].[Module] | ||||
| namespace [Owner].Module.[Module] | ||||
| { | ||||
|     public class ModuleInfo : IModule | ||||
|     { | ||||
| @ -12,8 +12,8 @@ namespace [Owner].[Module] | ||||
|             Version = "1.0.0", | ||||
|             ServerManagerType = "[ServerManagerType]", | ||||
|             ReleaseVersions = "1.0.0", | ||||
|             Dependencies = "[Owner].[Module].Shared.Oqtane", | ||||
|             PackageName = "[Owner].[Module]"  | ||||
|             Dependencies = "[Owner].Module.[Module].Shared.Oqtane", | ||||
|             PackageName = "[Owner].Module.[Module]"  | ||||
|         }; | ||||
|     } | ||||
| } | ||||
| @ -1,4 +1,4 @@ | ||||
| @namespace [Owner].[Module] | ||||
| @namespace [Owner].Module.[Module] | ||||
| @inherits ModuleBase | ||||
| @inject ISettingService SettingService | ||||
| @inject IStringLocalizer<Settings> Localizer | ||||
| @ -1,8 +1,8 @@ | ||||
| using System.Collections.Generic; | ||||
| using System.Threading.Tasks; | ||||
| using [Owner].[Module].Models; | ||||
| using [Owner].Module.[Module].Models; | ||||
|  | ||||
| namespace [Owner].[Module].Services | ||||
| namespace [Owner].Module.[Module].Services | ||||
| { | ||||
|     public interface I[Module]Service  | ||||
|     { | ||||
|  | ||||
| @ -5,9 +5,9 @@ using System.Threading.Tasks; | ||||
| using Oqtane.Modules; | ||||
| using Oqtane.Services; | ||||
| using Oqtane.Shared; | ||||
| using [Owner].[Module].Models; | ||||
| using [Owner].Module.[Module].Models; | ||||
|  | ||||
| namespace [Owner].[Module].Services | ||||
| namespace [Owner].Module.[Module].Services | ||||
| { | ||||
|     public class [Module]Service : ServiceBase, I[Module]Service, IService | ||||
|     { | ||||
|  | ||||
| @ -7,9 +7,9 @@ | ||||
|     <Authors>[Owner]</Authors> | ||||
|     <Company>[Owner]</Company> | ||||
|     <Description>[Description]</Description> | ||||
|     <Product>[Owner].[Module]</Product> | ||||
|     <Product>[Owner].Module.[Module]</Product> | ||||
|     <Copyright>[Owner]</Copyright> | ||||
|     <AssemblyName>[Owner].[Module].Client.Oqtane</AssemblyName> | ||||
|     <AssemblyName>[Owner].Module.[Module].Client.Oqtane</AssemblyName> | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
| @ -22,7 +22,7 @@ | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\Shared\[Owner].[Module].Shared.csproj" /> | ||||
|     <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||
| 
 | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net7.0</TargetFramework> | ||||
| @ -13,9 +13,9 @@ | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\Client\[Owner].[Module].Client.csproj" /> | ||||
|     <ProjectReference Include="..\Server\[Owner].[Module].Server.csproj" /> | ||||
|     <ProjectReference Include="..\Shared\[Owner].[Module].Shared.csproj" /> | ||||
|     <ProjectReference Include="..\Client\[Owner].Module.[Module].Client.csproj" /> | ||||
|     <ProjectReference Include="..\Server\[Owner].Module.[Module].Server.csproj" /> | ||||
|     <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <Target Name="PostBuild" AfterTargets="PostBuildEvent"> | ||||
| @ -1,7 +1,7 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> | ||||
|   <metadata> | ||||
|     <id>[Owner].[Module]</id> | ||||
|     <id>[Owner].Module.[Module]</id> | ||||
|     <version>1.0.0</version> | ||||
|     <authors>[Owner]</authors> | ||||
|     <owners>[Owner]</owners> | ||||
| @ -20,12 +20,12 @@ | ||||
|     </dependencies> | ||||
|   </metadata> | ||||
|   <files> | ||||
|     <file src="..\Client\bin\Release\net7.0\[Owner].[Module].Client.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Client\bin\Release\net7.0\[Owner].[Module].Client.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Server\bin\Release\net7.0\[Owner].[Module].Server.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Server\bin\Release\net7.0\[Owner].[Module].Server.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Shared\bin\Release\net7.0\[Owner].[Module].Shared.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Shared\bin\Release\net7.0\[Owner].[Module].Shared.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Client\bin\Release\net7.0\[Owner].Module.[Module].Client.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Client\bin\Release\net7.0\[Owner].Module.[Module].Client.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Server\bin\Release\net7.0\[Owner].Module.[Module].Server.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Server\bin\Release\net7.0\[Owner].Module.[Module].Server.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Shared\bin\Release\net7.0\[Owner].Module.[Module].Shared.Oqtane.dll" target="lib\net7.0" />  | ||||
|     <file src="..\Shared\bin\Release\net7.0\[Owner].Module.[Module].Shared.Oqtane.pdb" target="lib\net7.0" />  | ||||
|     <file src="..\Server\wwwroot\**\*.*" target="wwwroot" />  | ||||
|     <file src="icon.png" target="" /> | ||||
|   </files> | ||||
| @ -1,7 +1,7 @@ | ||||
| XCOPY "..\Client\bin\Debug\net7.0\[Owner].[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Client\bin\Debug\net7.0\[Owner].[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Server\bin\Debug\net7.0\[Owner].[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Server\bin\Debug\net7.0\[Owner].[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Shared\bin\Debug\net7.0\[Owner].[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Shared\bin\Debug\net7.0\[Owner].[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Client\bin\Debug\net7.0\[Owner].Module.[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Client\bin\Debug\net7.0\[Owner].Module.[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Server\bin\Debug\net7.0\[Owner].Module.[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Server\bin\Debug\net7.0\[Owner].Module.[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Shared\bin\Debug\net7.0\[Owner].Module.[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Shared\bin\Debug\net7.0\[Owner].Module.[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y | ||||
| XCOPY "..\Server\wwwroot\*" "..\..\[RootFolder]\Oqtane.Server\wwwroot\" /Y /S /I | ||||
|  | ||||
| @ -1,3 +1,3 @@ | ||||
| "..\..\[RootFolder]\oqtane.package\nuget.exe" pack [Owner].[Module].nuspec  | ||||
| "..\..\[RootFolder]\oqtane.package\nuget.exe" pack [Owner].Module.[Module].nuspec  | ||||
| XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\Packages\" /Y | ||||
|  | ||||
|  | ||||
| @ -5,11 +5,11 @@ using Microsoft.AspNetCore.Http; | ||||
| using Oqtane.Shared; | ||||
| using Oqtane.Enums; | ||||
| using Oqtane.Infrastructure; | ||||
| using [Owner].[Module].Repository; | ||||
| using [Owner].Module.[Module].Repository; | ||||
| using Oqtane.Controllers; | ||||
| using System.Net; | ||||
|  | ||||
| namespace [Owner].[Module].Controllers | ||||
| namespace [Owner].Module.[Module].Controllers | ||||
| { | ||||
|     [Route(ControllerRoutes.ApiRoute)] | ||||
|     public class [Module]Controller : ModuleControllerBase | ||||
|  | ||||
| @ -7,9 +7,9 @@ using Oqtane.Models; | ||||
| using Oqtane.Infrastructure; | ||||
| using Oqtane.Enums; | ||||
| using Oqtane.Repository; | ||||
| using [Owner].[Module].Repository; | ||||
| using [Owner].Module.[Module].Repository; | ||||
|  | ||||
| namespace [Owner].[Module].Manager | ||||
| namespace [Owner].Module.[Module].Manager | ||||
| { | ||||
|     public class [Module]Manager : MigratableModuleBase, IInstallable, IPortable | ||||
|     { | ||||
| @ -32,7 +32,7 @@ namespace [Owner].[Module].Manager | ||||
|             return Migrate(new [Module]Context(_DBContextDependencies), tenant, MigrationType.Down); | ||||
|         } | ||||
|  | ||||
|         public string ExportModule(Module module) | ||||
|         public string ExportModule(Oqtane.Models.Module module) | ||||
|         { | ||||
|             string content = ""; | ||||
|             List<Models.[Module]> [Module]s = _[Module]Repository.Get[Module]s(module.ModuleId).ToList(); | ||||
| @ -43,7 +43,7 @@ namespace [Owner].[Module].Manager | ||||
|             return content; | ||||
|         } | ||||
|  | ||||
|         public void ImportModule(Module module, string content, string version) | ||||
|         public void ImportModule(Oqtane.Models.Module module, string content, string version) | ||||
|         { | ||||
|             List<Models.[Module]> [Module]s = null; | ||||
|             if (!string.IsNullOrEmpty(content)) | ||||
|  | ||||
| @ -2,13 +2,13 @@ using Microsoft.EntityFrameworkCore.Infrastructure; | ||||
| using Microsoft.EntityFrameworkCore.Migrations; | ||||
| using Oqtane.Databases.Interfaces; | ||||
| using Oqtane.Migrations; | ||||
| using [Owner].[Module].Migrations.EntityBuilders; | ||||
| using [Owner].[Module].Repository; | ||||
| using [Owner].Module.[Module].Migrations.EntityBuilders; | ||||
| using [Owner].Module.[Module].Repository; | ||||
|  | ||||
| namespace [Owner].[Module].Migrations | ||||
| namespace [Owner].Module.[Module].Migrations | ||||
| { | ||||
|     [DbContext(typeof([Module]Context))] | ||||
|     [Migration("[Owner].[Module].01.00.00.00")] | ||||
|     [Migration("[Owner].Module.[Module].01.00.00.00")] | ||||
|     public class InitializeModule : MultiDatabaseMigration | ||||
|     { | ||||
|         public InitializeModule(IDatabase database) : base(database) | ||||
|  | ||||
| @ -5,7 +5,7 @@ using Oqtane.Databases.Interfaces; | ||||
| using Oqtane.Migrations; | ||||
| using Oqtane.Migrations.EntityBuilders; | ||||
|  | ||||
| namespace [Owner].[Module].Migrations.EntityBuilders | ||||
| namespace [Owner].Module.[Module].Migrations.EntityBuilders | ||||
| { | ||||
|     public class [Module]EntityBuilder : AuditableBaseEntityBuilder<[Module]EntityBuilder> | ||||
|     { | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| using System.Collections.Generic; | ||||
| using [Owner].[Module].Models; | ||||
| using [Owner].Module.[Module].Models; | ||||
|  | ||||
| namespace [Owner].[Module].Repository | ||||
| namespace [Owner].Module.[Module].Repository | ||||
| { | ||||
|     public interface I[Module]Repository | ||||
|     { | ||||
|  | ||||
| @ -5,7 +5,7 @@ using Oqtane.Repository; | ||||
| using Oqtane.Infrastructure; | ||||
| using Oqtane.Repository.Databases.Interfaces; | ||||
|  | ||||
| namespace [Owner].[Module].Repository | ||||
| namespace [Owner].Module.[Module].Repository | ||||
| { | ||||
|     public class [Module]Context : DBContextBase, ITransientService, IMultiDatabase | ||||
|     { | ||||
|  | ||||
| @ -2,9 +2,9 @@ using Microsoft.EntityFrameworkCore; | ||||
| using System.Linq; | ||||
| using System.Collections.Generic; | ||||
| using Oqtane.Modules; | ||||
| using [Owner].[Module].Models; | ||||
| using [Owner].Module.[Module].Models; | ||||
|  | ||||
| namespace [Owner].[Module].Repository | ||||
| namespace [Owner].Module.[Module].Repository | ||||
| { | ||||
|     public class [Module]Repository : I[Module]Repository, ITransientService | ||||
|     { | ||||
|  | ||||
| @ -4,12 +4,12 @@ | ||||
|     <TargetFramework>net7.0</TargetFramework> | ||||
|     <AddRazorSupportForMvc>true</AddRazorSupportForMvc> | ||||
|     <Version>1.0.0</Version> | ||||
|     <Product>[Owner].[Module]</Product> | ||||
|     <Product>[Owner].Module.[Module]</Product> | ||||
|     <Authors>[Owner]</Authors> | ||||
|     <Company>[Owner]</Company> | ||||
|     <Description>[Description]</Description> | ||||
|     <Copyright>[Owner]</Copyright> | ||||
|     <AssemblyName>[Owner].[Module].Server.Oqtane</AssemblyName> | ||||
|     <AssemblyName>[Owner].Module.[Module].Server.Oqtane</AssemblyName> | ||||
|     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
| @ -26,7 +26,7 @@ | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\Shared\[Owner].[Module].Shared.csproj" /> | ||||
|     <ProjectReference Include="..\Shared\[Owner].Module.[Module].Shared.csproj" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
| @ -1,5 +1,5 @@ | ||||
| /* Module Script */ | ||||
| var [Owner] = [Owner] || {}; | ||||
| 
 | ||||
| [Owner].[Module] = { | ||||
| [Owner].Module.[Module] = { | ||||
| }; | ||||
| @ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; | ||||
| using System.ComponentModel.DataAnnotations.Schema; | ||||
| using Oqtane.Models; | ||||
|  | ||||
| namespace [Owner].[Module].Models | ||||
| namespace [Owner].Module.[Module].Models | ||||
| { | ||||
|     [Table("[Owner][Module]")] | ||||
|     public class [Module] : IAuditable | ||||
|  | ||||
| @ -3,12 +3,12 @@ | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net7.0</TargetFramework>     | ||||
|     <Version>1.0.0</Version> | ||||
|     <Product>[Owner].[Module]</Product> | ||||
|     <Product>[Owner].Module.[Module]</Product> | ||||
|     <Authors>[Owner]</Authors> | ||||
|     <Company>[Owner]</Company> | ||||
|     <Description>[Description]</Description> | ||||
|     <Copyright>[Owner]</Copyright> | ||||
|     <AssemblyName>[Owner].[Module].Shared.Oqtane</AssemblyName> | ||||
|     <AssemblyName>[Owner].Module.[Module].Shared.Oqtane</AssemblyName> | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
| @ -1,17 +1,17 @@ | ||||
|  | ||||
| 
 | ||||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||||
| # Visual Studio Version 16 | ||||
| VisualStudioVersion = 16.0.28621.142 | ||||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\[RootFolder]\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" | ||||
| EndProject | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Client", "Client\[Owner].[Module].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Client", "Client\[Owner].Module.[Module].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" | ||||
| EndProject | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Server", "Server\[Owner].[Module].Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}" | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Server", "Server\[Owner].Module.[Module].Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}" | ||||
| EndProject | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Shared", "Shared\[Owner].[Module].Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}" | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Shared", "Shared\[Owner].Module.[Module].Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}" | ||||
| EndProject | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Package", "Package\[Owner].[Module].Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}" | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].Module.[Module].Package", "Package\[Owner].Module.[Module].Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}" | ||||
| EndProject | ||||
| Global | ||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
		Reference in New Issue
	
	Block a user
	 vnetonline
					vnetonline