diff --git a/modules/docs/Volo.Docs.sln b/modules/docs/Volo.Docs.sln index 030682aa66..a894fbbe2b 100644 --- a/modules/docs/Volo.Docs.sln +++ b/modules/docs/Volo.Docs.sln @@ -41,7 +41,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Docs.Admin.Web", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoloDocs.EntityFrameworkCore", "app\VoloDocs.EntityFrameworkCore\VoloDocs.EntityFrameworkCore.csproj", "{1B459653-8DAC-41CD-A08E-28D6E74265D3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoloDocs", "app\VoloDocs\VoloDocs.csproj", "{057EA924-4524-4452-840C-5E3D509F2ED3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoloDocs.Web", "app\VoloDocs\VoloDocs.Web.csproj", "{057EA924-4524-4452-840C-5E3D509F2ED3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoloDocs.Migrator", "app\VoloDocs.Migrator\VoloDocs.Migrator.csproj", "{8A5E5001-C017-44A8-ADDA-DC66C102556E}" EndProject diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj index 02d4be4be8..b70794e39b 100644 --- a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj +++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocs.EntityFrameworkCore.csproj @@ -2,6 +2,7 @@ netstandard2.0 + diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj index 06d6572dad..aa8fb71b53 100644 --- a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj +++ b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj @@ -3,6 +3,7 @@ Exe netcoreapp2.2 + diff --git a/modules/docs/app/VoloDocs/Branding/VoloDocsBrandingProvider.cs b/modules/docs/app/VoloDocs/Branding/VoloDocsBrandingProvider.cs index a3408efdda..db283751da 100644 --- a/modules/docs/app/VoloDocs/Branding/VoloDocsBrandingProvider.cs +++ b/modules/docs/app/VoloDocs/Branding/VoloDocsBrandingProvider.cs @@ -1,7 +1,8 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; -namespace VoloDocs.Branding + +namespace Volo.Docs.Branding { [Dependency(ReplaceServices = true)] public class VoloDocsBrandingProvider : DefaultBrandingProvider diff --git a/modules/docs/app/VoloDocs/Controllers/HomeController.cs b/modules/docs/app/VoloDocs/Controllers/HomeController.cs index 56fe9ce6c8..a049f98ec4 100644 --- a/modules/docs/app/VoloDocs/Controllers/HomeController.cs +++ b/modules/docs/app/VoloDocs/Controllers/HomeController.cs @@ -1,6 +1,6 @@ using Volo.Abp.AspNetCore.Mvc; -namespace VoloDocs.Controllers +namespace Volo.Docs.Controllers { public class HomeController : AbpController { diff --git a/modules/docs/app/VoloDocs/Pages/Error.cshtml b/modules/docs/app/VoloDocs/Pages/Error.cshtml index a6679a4bc2..b8a912bb7e 100644 --- a/modules/docs/app/VoloDocs/Pages/Error.cshtml +++ b/modules/docs/app/VoloDocs/Pages/Error.cshtml @@ -1,5 +1,5 @@ @page -@model VoloDocs.Pages.ErrorModel +@model Volo.Docs.Pages.ErrorModel @{ 
diff --git a/modules/docs/app/VoloDocs/Pages/Error.cshtml.cs b/modules/docs/app/VoloDocs/Pages/Error.cshtml.cs
index 2141a10f19..0a3f977349 100644
--- a/modules/docs/app/VoloDocs/Pages/Error.cshtml.cs
+++ b/modules/docs/app/VoloDocs/Pages/Error.cshtml.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Domain.Entities;
 
-namespace VoloDocs.Pages
+namespace Volo.Docs.Pages
 {
     public class ErrorModel : AbpPageModel
     {
diff --git a/modules/docs/app/VoloDocs/Pages/Index.cshtml b/modules/docs/app/VoloDocs/Pages/Index.cshtml
index c7a637ef90..0160146d36 100644
--- a/modules/docs/app/VoloDocs/Pages/Index.cshtml
+++ b/modules/docs/app/VoloDocs/Pages/Index.cshtml
@@ -5,7 +5,7 @@
 @using Volo.Docs.Localization
 @using Volo.Docs.Pages.Documents
 
-@model VoloDocs.Pages.IndexModel
+@model Volo.Docs.Pages.IndexModel
 @inject IHtmlLocalizer L
 
 @section styles {
@@ -18,7 +18,7 @@
 

 
     

-       @L["WelcomeVoloDocs"]
+        @L["WelcomeVoloDocs"]
     

 
     @if (!Model.Projects.Any())
diff --git a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
index 7f3277c237..ee2b333775 100644
--- a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
+++ b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
@@ -3,10 +3,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Volo.Abp.Users;
-using Volo.Docs;
 using Volo.Docs.Projects;
 
-namespace VoloDocs.Pages
+namespace Volo.Docs.Pages
 {
     public class IndexModel : PageModel
     {
diff --git a/modules/docs/app/VoloDocs/Program.cs b/modules/docs/app/VoloDocs/Program.cs
index 766cd07361..2d3007d5f1 100644
--- a/modules/docs/app/VoloDocs/Program.cs
+++ b/modules/docs/app/VoloDocs/Program.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting;
 using Serilog;
 using Serilog.Events;
 
-namespace VoloDocs
+namespace Volo.Docs
 {
     public class Program
     {
diff --git a/modules/docs/app/VoloDocs/Startup.cs b/modules/docs/app/VoloDocs/Startup.cs
index 0c084c79d5..10ab8dde95 100644
--- a/modules/docs/app/VoloDocs/Startup.cs
+++ b/modules/docs/app/VoloDocs/Startup.cs
@@ -5,13 +5,13 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp;
 
-namespace VoloDocs
+namespace Volo.Docs
 {
     public class Startup
     {
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            services.AddApplication(options =>
+            services.AddApplication(options =>
             {
                 options.UseAutofac();
             });
diff --git a/modules/docs/app/VoloDocs/Utils/GlobalExceptionHandlerMiddleware.cs b/modules/docs/app/VoloDocs/Utils/GlobalExceptionHandlerMiddleware.cs
index 775f141b60..8d1497bcef 100644
--- a/modules/docs/app/VoloDocs/Utils/GlobalExceptionHandlerMiddleware.cs
+++ b/modules/docs/app/VoloDocs/Utils/GlobalExceptionHandlerMiddleware.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.AspNetCore.Uow;
 
-namespace VoloDocs.Utils
+namespace Volo.Docs.Utils
 {
     public class GlobalExceptionHandlerMiddleware
     {
diff --git a/modules/docs/app/VoloDocs/VoloDocs.csproj b/modules/docs/app/VoloDocs/VoloDocs.Web.csproj
similarity index 98%
rename from modules/docs/app/VoloDocs/VoloDocs.csproj
rename to modules/docs/app/VoloDocs/VoloDocs.Web.csproj
index dcb284f466..a251325089 100644
--- a/modules/docs/app/VoloDocs/VoloDocs.csproj
+++ b/modules/docs/app/VoloDocs/VoloDocs.Web.csproj
@@ -3,6 +3,7 @@
   
     netcoreapp2.2
     b5e1445f-a53c-4d4b-9539-061359f52fcf
+    Volo.Docs
   
 
   
diff --git a/modules/docs/app/VoloDocs/VoloDocsModule.cs b/modules/docs/app/VoloDocs/VoloDocsWebModule.cs
similarity index 97%
rename from modules/docs/app/VoloDocs/VoloDocsModule.cs
rename to modules/docs/app/VoloDocs/VoloDocsWebModule.cs
index 7bb7fb9a7c..4291ebc5fe 100644
--- a/modules/docs/app/VoloDocs/VoloDocsModule.cs
+++ b/modules/docs/app/VoloDocs/VoloDocsWebModule.cs
@@ -29,13 +29,12 @@ using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.UI;
 using Volo.Abp.VirtualFileSystem;
-using Volo.Docs;
 using Volo.Docs.Admin;
 using Volo.Docs.Localization;
+using Volo.Docs.Utils;
 using VoloDocs.EntityFrameworkCore;
-using VoloDocs.Utils;
 
-namespace VoloDocs
+namespace Volo.Docs
 {  
     [DependsOn(
         typeof(DocsWebModule),
@@ -51,13 +50,13 @@ namespace VoloDocs
         typeof(AbpPermissionManagementApplicationModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule)
     )]
-    public class VoloDocsModule : AbpModule
+    public class VoloDocsWebModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             PreConfigure(options =>
             {
-                options.AddAssemblyResource(typeof(DocsResource), typeof(VoloDocsModule).Assembly);
+                options.AddAssemblyResource(typeof(DocsResource), typeof(VoloDocsWebModule).Assembly);
             });
         }
 
@@ -113,7 +112,7 @@ namespace VoloDocs
 
             Configure(options =>
             {
-                options.FileSets.AddEmbedded();
+                options.FileSets.AddEmbedded();
             });
 
             Configure(options =>