diff --git a/Volo.Abp.sln b/Volo.Abp.sln index cc2a6643fe..a4dbe71987 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -186,7 +186,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Emailing", "src\Volo.Abp.Emailing\Volo.Abp.Emailing.csproj", "{8B1CB44B-BA40-4C78-9447-A7864126D7C3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Sms", "src\Volo.Abp.Sms\Volo.Abp.Sms.csproj", "{8BB10746-8BAD-4317-8EE5-A36805DB93F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Sms", "src\Volo.Abp.Sms\Volo.Abp.Sms.csproj", "{8BB10746-8BAD-4317-8EE5-A36805DB93F6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Bundling", "src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj", "{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Packages", "src\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj", "{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -526,6 +530,14 @@ Global {8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Release|Any CPU.Build.0 = Release|Any CPU + {EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Release|Any CPU.Build.0 = Release|Any CPU + {CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -616,6 +628,8 @@ Global {869F7453-7DDC-4915-B92C-7861466AB68B} = {447C8A77-E5F0-4538-8687-7383196D04EA} {8B1CB44B-BA40-4C78-9447-A7864126D7C3} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {8BB10746-8BAD-4317-8EE5-A36805DB93F6} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {CAE68246-70A8-4E87-9B83-A9F7DA343E5E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj new file mode 100644 index 0000000000..3d4241eb2c --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs new file mode 100644 index 0000000000..0f305efe33 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling +{ + [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] + public class AbpAspNetCoreMvcUiBundlingModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleCache.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleCache.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleCache.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleCache.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfiguration.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfiguration.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfiguration.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfiguration.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationCollection.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationCollection.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationContext.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationContext.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationExtensions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleConfigurationExtensions.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributor.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributorCollection.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributorCollection.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributorListExtensions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorListExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleContributorListExtensions.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorListExtensions.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleResult.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleResult.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundleResult.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleResult.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlerBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlerBase.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlerContext.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerContext.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlerContext.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerContext.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlingOptions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/BundlingOptions.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleCache.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleCache.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleCache.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleCache.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleConfigurationContext.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleConfigurationContext.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleConfigurationContext.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleConfigurationContext.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleContributor.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundleManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundler.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundler.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundler.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundler.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundlerContext.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundlerContext.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/IBundlerContext.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundlerContext.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Scripts/IScriptBundler.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/IScriptBundler.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Scripts/IScriptBundler.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/IScriptBundler.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Scripts/ScriptBundler.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Scripts/ScriptBundler.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/SimpleBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/SimpleBundleContributor.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/SimpleBundleContributor.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/SimpleBundleContributor.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/CssRelativePathAdjuster.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/CssRelativePathAdjuster.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/CssRelativePathAdjuster.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/CssRelativePathAdjuster.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/IStyleBundler.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/IStyleBundler.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/IStyleBundler.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/IStyleBundler.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/StyleBundler.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Styles/StyleBundler.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleFileTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleFileTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleFileTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleFileTagHelperService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleTagHelperServiceBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpBundleTagHelperServiceBase.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpScriptBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpScriptBundleTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpScriptBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpScriptBundleTagHelperService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpStyleBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpStyleBundleTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpStyleBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/AbpStyleBundleTagHelperService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/IBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Bundling/IBundleTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/IMinifier.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/IMinifier.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/IMinifier.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/IMinifier.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyCssMinifier.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyCssMinifier.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyCssMinifier.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyCssMinifier.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyException.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyException.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyException.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyException.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyMinifierBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyMinifierBase.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/NUglify/NUglifyMinifierBase.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyMinifierBase.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/Scripts/IJavascriptMinifier.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Scripts/IJavascriptMinifier.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/Scripts/IJavascriptMinifier.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Scripts/IJavascriptMinifier.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/Styles/ICssMinifier.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Styles/ICssMinifier.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Minification/Styles/ICssMinifier.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Styles/ICssMinifier.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj new file mode 100644 index 0000000000..cf73d4a72a --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/_ViewImports.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/_ViewImports.cshtml index 05e1baf060..c1da1f5f10 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/_ViewImports.cshtml +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/_ViewImports.cshtml @@ -1,3 +1,4 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml index 05e1baf060..c1da1f5f10 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml @@ -1,3 +1,4 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/_ViewImports.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/_ViewImports.cshtml index 05e1baf060..c1da1f5f10 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/_ViewImports.cshtml +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/_ViewImports.cshtml @@ -1,3 +1,4 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs index 530a0eda59..2c24cc725d 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -8,7 +9,8 @@ using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared { [DependsOn( - typeof(AbpAspNetCoreMvcUiBootstrapModule) + typeof(AbpAspNetCoreMvcUiBootstrapModule), + typeof(AbpAspNetCoreMvcUiPackagesModule) )] public class AbpAspNetCoreMvcUiThemeSharedModule : AbpModule { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj index 051eece443..2b8b69be6b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj @@ -27,6 +27,7 @@ + \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs index c7e1cd0336..7dc8c53bc8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; -using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AspNetCore.Mvc.UI { @@ -12,11 +11,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI public override void ConfigureServices(IServiceCollection services) { services.AddAssemblyOf(); - - services.Configure(options => - { - options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc"); - }); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapScriptContributor.cs deleted file mode 100644 index 5b58d320e3..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap -{ - [DependsOn(typeof(JQueryScriptContributor))] - public class BootstrapScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/bootstrap/js/bootstrap.bundle.js"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapStyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapStyleContributor.cs deleted file mode 100644 index 803a6dfb35..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapStyleContributor.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap -{ - public class BootstrapStyleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/bootstrap/css/bootstrap.css"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Core/CoreScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Core/CoreScriptContributor.cs deleted file mode 100644 index a23b17804e..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Core/CoreScriptContributor.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core -{ - public class CoreScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/abp/core/abp.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNet/DatatablesNetScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNet/DatatablesNetScriptContributor.cs deleted file mode 100644 index 066d162b79..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNet/DatatablesNetScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNet -{ - [DependsOn(typeof(JQueryScriptContributor))] - public class DatatablesNetScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/datatables.net/js/jquery.dataTables.js"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs deleted file mode 100644 index d24b3bc456..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNet; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4 -{ - [DependsOn(typeof(DatatablesNetScriptContributor))] - [DependsOn(typeof(BootstrapScriptContributor))] - public class DatatablesNetBs4ScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/datatables.net-bs4/js/dataTables.bootstrap4.js"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs deleted file mode 100644 index d0f5726246..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4 -{ - [DependsOn(typeof(BootstrapStyleContributor))] - public class DatatablesNetBs4StyleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/datatables.net-bs4/css/dataTables.bootstrap4.css"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/FontAwesome/BootstrapStyleBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/FontAwesome/BootstrapStyleBundleContributor.cs deleted file mode 100644 index b53ea96733..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/FontAwesome/BootstrapStyleBundleContributor.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.FontAwesome -{ - public class FontAwesomeStyleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/font-awesome/css/font-awesome.css"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQuery/JQueryScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQuery/JQueryScriptContributor.cs deleted file mode 100644 index a5f091e9ea..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQuery/JQueryScriptContributor.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery -{ - [DependsOn(typeof(CoreScriptContributor))] - public class JQueryScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/jquery/jquery.js"); - context.Files.Add("/libs/abp/jquery/abp.jquery.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryForm/JQueryFormScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryForm/JQueryFormScriptContributor.cs deleted file mode 100644 index 5c8ce4c6c2..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryForm/JQueryFormScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryForm -{ - [DependsOn(typeof(JQueryScriptContributor))] - public class JQueryFormScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/jquery-form/jquery.form.min.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidation/JQueryValidationScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidation/JQueryValidationScriptContributor.cs deleted file mode 100644 index de93a5a32d..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidation/JQueryValidationScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidation -{ - [DependsOn(typeof(JQueryScriptContributor))] - public class JQueryValidationScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/jquery-validation/jquery.validate.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs deleted file mode 100644 index 1d207a86a8..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidation; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidationUnobtrusive -{ - [DependsOn(typeof(JQueryValidationScriptContributor))] - public class JQueryValidationUnobtrusiveScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/SweetAlert/SweetalertScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/SweetAlert/SweetalertScriptContributor.cs deleted file mode 100644 index 15a423c790..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/SweetAlert/SweetalertScriptContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.SweetAlert -{ - [DependsOn(typeof(CoreScriptContributor))] - public class SweetalertScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/sweetalert/sweetalert.min.js"); - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrScriptBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrScriptBundleContributor.cs deleted file mode 100644 index 5eda26aee8..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrScriptBundleContributor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr -{ - [DependsOn(typeof(JQueryScriptContributor))] - public class ToastrScriptBundleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/toastr/toastr.min.js"); - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrStyleBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrStyleBundleContributor.cs deleted file mode 100644 index 2b8c75294b..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrStyleBundleContributor.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr -{ - public class ToastrStyleBundleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/toastr/toastr.min.css"); - } - } -} \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewImports.cshtml b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewImports.cshtml index 05e1baf060..c1da1f5f10 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewImports.cshtml +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewImports.cshtml @@ -1,3 +1,4 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj b/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj index 641796cd8e..b4b7fc1ef4 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestModule.cs b/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestModule.cs index 7df5be3bf7..3daf708a07 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestModule.cs +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestModule.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.TestBase; using Volo.Abp.Autofac; using Volo.Abp.Modularity; @@ -7,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI { [DependsOn( typeof(AbpAspNetCoreTestBaseModule), - typeof(AbpAspNetCoreMvcUiModule), + typeof(AbpAspNetCoreMvcUiBundlingModule), typeof(AbpAutofacModule) )] public class AbpAspNetCoreMvcUiTestModule : AbpModule