From 441233fc074eb4be86ae7b6ed454141dc2dbcb05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 22 Nov 2017 14:25:10 +0300
Subject: [PATCH] Simplified virtual file set adding for embedded files sets.

---
 .../Blogging/AbpDeskMongoBlogModule.cs        | 12 ++---------
 .../AbpAccountWebModule.cs                    | 20 ++-----------------
 .../AbpAspNetCoreMvcUiBootstrapModule.cs      | 12 ++---------
 .../AbpAspNetCoreMvcUiModule.cs               | 12 ++---------
 .../AbpIdentityWebModule.cs                   | 20 ++-----------------
 5 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
index eb3d63d733..21dc026329 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
@@ -28,17 +28,9 @@ namespace AbpDesk.Blogging
             {
                 options.FileSets.Add(
                     new EmbeddedFileSet(
-                        "/Areas/",
+                        "/",
                         GetType().Assembly,
-                        "Areas"
-                        )
-                    );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/wwwroot/",
-                        GetType().Assembly,
-                        "wwwroot" //TODO: This is not tested yet!
+                        "" //TODO: This is not tested yet!
                     )
                 );
             });
diff --git a/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
index 86821b802d..790b695e28 100644
--- a/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
+++ b/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
@@ -21,25 +21,9 @@ namespace Volo.Abp.Account.Web
             {
                 options.FileSets.Add(
                     new EmbeddedFileSet(
-                        "/Areas/",
+                        "/",
                         GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.Account.Web.Areas"
-                    )
-                );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/Pages/",
-                        GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.Account.Web.Pages"
-                    )
-                );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/wwwroot/",
-                        GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.Account.Web.wwwroot"
+                        "Volo.Abp.Account.Web"
                     )
                 );
             });
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs
index eb26848c2d..501090e727 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs
@@ -19,17 +19,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
             {
                 options.FileSets.Add(
                     new EmbeddedFileSet(
-                        "/wwwroot/",
+                        "/",
                         GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.wwwroot"
-                        )
-                    );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/Views/",
-                        GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Views"
+                        "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"
                         )
                     );
             });
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
index 5be312b7d8..eec4107a5b 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
@@ -19,17 +19,9 @@ namespace Volo.Abp.AspNetCore.Mvc
             {
                 options.FileSets.Add(
                     new EmbeddedFileSet(
-                        "/Views/",
+                        "/",
                         GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.AspNetCore.Mvc.Views"
-                        )
-                    );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/wwwroot/",
-                        GetType().GetTypeInfo().Assembly,
-                        "Volo.Abp.AspNetCore.Mvc.wwwroot"
+                        "Volo.Abp.AspNetCore.Mvc"
                     )
                 );
             });
diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
index 676837ca85..9991a2dc9c 100644
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@@ -27,25 +27,9 @@ namespace Volo.Abp.Identity.Web
             {
                 options.FileSets.Add(
                     new EmbeddedFileSet(
-                        "/Pages/",
+                        "/",
                         GetType().Assembly,
-                        "Volo.Abp.Identity.Web.Pages"
-                    )
-                );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/Areas/",
-                        GetType().Assembly,
-                        "Volo.Abp.Identity.Web.Areas"
-                    )
-                );
-
-                options.FileSets.Add(
-                    new EmbeddedFileSet(
-                        "/wwwroot/",
-                        GetType().Assembly,
-                        "Volo.Abp.Identity.Web.wwwroot"
+                        "Volo.Abp.Identity.Web"
                     )
                 );
             });