Move localization resource to UI module.

src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs

@@ -2,8 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.EmbeddedFiles;
 using Volo.Abp.AspNetCore.Mvc.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
@@ -22,11 +20,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
                 options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiBootstrapModule>("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap");
             });
 
-            services.Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources.AddVirtualJson<AbpBootstrapResource>("en", "/Localization/Resources/AbpBootstrap");
-            });
-
             services.Configure<BundlingOptions>(options =>
             {
                 options.StyleBundles.Add("GlobalStyles", new[]

src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs

@@ -1,9 +0,0 @@
-using Volo.Abp.Localization;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap
-{
-    [ShortLocalizationResourceName("AbpBootstrap")]
-    public class AbpBootstrapResource
-    {
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs

@@ -1,15 +1,15 @@
 using System.Text;
+using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 {
     public class AbpModalFooterTagHelper : TagHelper
     {
-        private readonly IStringLocalizer<AbpBootstrapResource> _localizer;
+        private readonly IStringLocalizer<AbpUiResource> _localizer;
 
-        public AbpModalFooterTagHelper(IStringLocalizer<AbpBootstrapResource> localizer)
+        public AbpModalFooterTagHelper(IStringLocalizer<AbpUiResource> localizer)
         {
             _localizer = localizer;
         }

src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
   </ItemGroup>

src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

@@ -11,20 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Views\Shared\Components\AbpMenu\AbpMenuViewComponent.cs" />
-    <EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\AbpStyleBundleViewComponent.cs" />
-    <EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\Default.cshtml" />
-    <EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\AbpStyleBundleViewComponent.cs" />
-    <EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\Default.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="wwwroot\libs\abp\abp.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="wwwroot\libs\abp\abp-jquery.js" />
-    <EmbeddedResource Include="wwwroot\libs\abp\abp.js" />
+    <EmbeddedResource Include="wwwroot\**\*.*" />
+    <EmbeddedResource Include="Views\**\*.cshtml" />
   </ItemGroup>
 
   <ItemGroup>

src/Volo.Abp.UI/Localization/Resources/AbpUi/AbpUiResource.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Localization;
+
+namespace Localization.Resources.AbpUi
+{
+    [ShortLocalizationResourceName("AbpUi")]
+    public class AbpUiResource
+    {
+    }
+}

src/Volo.Abp.UI/Volo.Abp.UI.csproj

@@ -14,7 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <EmbeddedResource Include="Localization\**\*.json" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
 </Project>

src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs

@@ -1,4 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
+using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Ui
@@ -7,6 +9,11 @@ namespace Volo.Abp.Ui
     {
         public override void ConfigureServices(IServiceCollection services)
         {
+            services.Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources.AddVirtualJson<AbpUiResource>("en", "/Localization/Resources/AbpUi");
+            });
+
             services.AddAssemblyOf<AbpUiModule>();
         }
     }