Remove embedded resources from content.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs

@@ -1,6 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.AspNetCore.Mvc.UI.Theming;
 using Volo.Abp.Modularity;
@@ -34,7 +37,26 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic
             {
                 options.Contributors.Add(new BasicThemeMainTopToolbarContributor());
             });
-            
+
+            services.Configure<BundlingOptions>(options =>
+            {
+                options
+                    .StyleBundles
+                    .Add(BasicThemeBundles.Styles.Global, bundle =>
+                    {
+                        bundle
+                            .AddBaseBundles(StandardBundles.Styles.Global)
+                            .AddContributors(new BasicThemeGlobalStyleContributor());
+                    });
+
+                options
+                    .ScriptBundles
+                    .Add(BasicThemeBundles.Scripts.Global, bundle =>
+                    {
+                        bundle.AddBaseBundles(StandardBundles.Scripts.Global);
+                    });
+            });
+
             services.AddAssemblyOf<AbpAspNetCoreMvcUiBasicThemeModule>();
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeBundles.cs

@@ -0,0 +1,15 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
+{
+    public static class BasicThemeBundles
+    {
+        public static class Styles
+        {
+            public const string Global = "Basic.Global";
+        }
+
+        public static class Scripts
+        {
+            public const string Global = "Basic.Global";
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs

@@ -0,0 +1,12 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
+{
+    public class BasicThemeGlobalStyleContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.Add("/themes/basic/layout.css");
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml

@@ -1,7 +1,7 @@
 @using Volo.Abp.AspNetCore.Mvc.AntiForgery
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts
-@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components
 @inject IAbpAntiForgeryManager AbpAntiForgeryManager
 @inject IBrandingProvider BrandingProvider
@@ -20,9 +20,7 @@
 
     <title>@(ViewBag.Title == null ? BrandingProvider.AppName : ViewBag.Title)</title>
 
-    <abp-style-bundle name="@StandardBundles.Styles.Global" />
+    <abp-style-bundle name="@BasicThemeBundles.Styles.Global" />
-
-    <link rel="stylesheet" type="text/css" href="~/views/shared/_AppLayout.css" />
 
     @RenderSection("styles", false)
 </head>
@@ -35,7 +33,7 @@
         @RenderBody()
     </div>
 
-    <abp-script-bundle name="@StandardBundles.Scripts.Global" />
+    <abp-script-bundle name="@BasicThemeBundles.Scripts.Global" />
 
     <script type="text/javascript" src="~/Abp/ApplicationConfigurationScript"></script>
     <script type="text/javascript" src="~/Abp/ServiceProxyScript"></script>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml

@@ -1,6 +1,6 @@
 @using Volo.Abp.AspNetCore.Mvc.AntiForgery
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts
-@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components
 @inject IAbpAntiForgeryManager AbpAntiForgeryManager
 @inject IBrandingProvider BrandingProvider
@@ -18,9 +18,7 @@
 
     <title>@(ViewBag.Title == null ? BrandingProvider.AppName : ViewBag.Title)</title>
 
-    <abp-style-bundle name="@StandardBundles.Styles.Global" />
+    <abp-style-bundle name="@BasicThemeBundles.Styles.Global" />
-
-    <link rel="stylesheet" type="text/css" href="~/views/shared/_AppLayout.css" />
 
     @RenderSection("styles", false)
 </head>
@@ -31,7 +29,7 @@
         @RenderBody()
     </div>
 
-    <abp-script-bundle name="@StandardBundles.Scripts.Global" />
+    <abp-script-bundle name="@BasicThemeBundles.Scripts.Global" />
 
     <script type="text/javascript" src="~/Abp/ApplicationConfigurationScript"></script>
     <script type="text/javascript" src="~/Abp/ServiceProxyScript"></script>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj

@@ -21,6 +21,14 @@
     <EmbeddedResource Include="wwwroot\**\*.*" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="wwwroot\**\*.*" />
+    <Content Remove="Pages\**\*.cshtml" />
+    <Content Remove="Views\**\*.cshtml" />
+    <Content Remove="Properties\launchSettings.json" />
+    <None Include="Properties\launchSettings.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

@@ -21,6 +21,17 @@
     <EmbeddedResource Include="Areas\**\*.cshtml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="wwwroot\**\*.*" />
+    <Content Remove="Pages\**\*.cshtml" />
+    <Content Remove="Views\**\*.cshtml" />
+    <Content Remove="Areas\**\*.cshtml" />
+    <Content Remove="compilerconfig.json" />
+    <Content Remove="Properties\launchSettings.json" />
+    <None Include="compilerconfig.json" />
+    <None Include="Properties\launchSettings.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.0" />
   </ItemGroup>

modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj

@@ -19,6 +19,13 @@
     <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
     <EmbeddedResource Include="Localization\Resources\*.json" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Remove="Pages\**\*.cshtml" />
+    <Content Remove="Localization\Resources\*.json" />
+    <Content Remove="Properties\launchSettings.json" />
+    <None Include="Properties\launchSettings.json" />
+  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\..\..\identity\src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />

modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@@ -18,14 +18,15 @@
     <EmbeddedResource Include="wwwroot\**\*.*" />
     <EmbeddedResource Include="Pages\**\*.cshtml" Exclude="*.cs" />
     <EmbeddedResource Include="Localization\Resources\**\*.json" />
+  </ItemGroup>
 
+  <ItemGroup>
     <Content Remove="wwwroot\**\*.*" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
     <Content Remove="Properties\launchSettings.json" />
-
     <None Include="compilerconfig.json" />
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>