From 53011bb39a65784b75bf84af179bf821b827e27b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 12 Jun 2018 18:09:06 +0300 Subject: [PATCH] Framework namespace changes. --- .../TagHelpers/AbpTagHelperService.cs | 1 + .../TagHelpers/HtmlHeadingTypeExtensions.cs | 2 +- .../Bundling/TagHelpers/AbpBundleFileTagHelper.cs | 3 ++- .../TagHelpers/AbpBundleFileTagHelperService.cs | 3 ++- .../TagHelpers/AbpBundleTagHelperServiceBase.cs | 4 ++-- .../TagHelpers/AbpScriptBundleTagHelper.cs | 3 ++- .../TagHelpers/AbpScriptBundleTagHelperService.cs | 3 +-- .../Bundling/TagHelpers/AbpStyleBundleTagHelper.cs | 3 ++- .../TagHelpers/AbpStyleBundleTagHelperService.cs | 3 +-- .../Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs | 2 +- .../Pages/_ViewImports.cshtml | 1 - .../Themes/Basic/_ViewImports.cshtml | 1 - .../Views/_ViewImports.cshtml | 1 - .../Bundling/SharedThemeGlobalScriptContributor.cs | 14 +++++++------- .../Bundling/SharedThemeGlobalStyleContributor.cs | 8 ++++---- .../Volo.Abp.AspNetCore.Mvc.UI.csproj | 2 +- .../AspNetCore/Mvc}/UI/AbpAspNetCoreMvcUiModule.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Alerts/AlertList.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Alerts/AlertManager.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Alerts/AlertMessage.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Alerts/AlertType.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Alerts/IAlertManager.cs | 0 .../Abp/AspNetCore/Mvc/UI}/RazorPages/AbpPage.cs | 2 +- .../AspNetCore/Mvc/UI}/RazorPages/AbpPageModel.cs | 2 +- .../ServiceBasedPageModelActivatorProvider.cs | 2 +- .../Mvc}/UI/Theming/DefaultThemeManager.cs | 0 .../Mvc}/UI/Theming/DefaultThemeSelector.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Theming/ITheme.cs | 0 .../AspNetCore/Mvc}/UI/Theming/IThemeManager.cs | 0 .../AspNetCore/Mvc}/UI/Theming/IThemeSelector.cs | 0 .../AspNetCore/Mvc}/UI/Theming/StandardLayouts.cs | 0 .../AspNetCore/Mvc}/UI/Theming/ThemeDictionary.cs | 0 .../AspNetCore/Mvc}/UI/Theming/ThemeExtensions.cs | 0 .../Abp/AspNetCore/Mvc}/UI/Theming/ThemeInfo.cs | 0 .../Mvc}/UI/Theming/ThemeNameAttribute.cs | 0 .../AspNetCore/Mvc}/UI/Theming/ThemingOptions.cs | 0 src/Volo.Abp.AspNetCore.Mvc.UI/web.config | 14 -------------- .../Volo/Abp/RemoteServiceAttribute.cs | 2 +- .../Application/Services/IApplicationService.cs | 1 + .../Volo/Abp/Validation/IValidationEnabled.cs | 2 +- .../Validation/ValidationInterceptorRegistrar.cs | 3 +-- .../Pages/_ViewImports.cshtml | 1 - 42 files changed, 34 insertions(+), 49 deletions(-) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/AbpAspNetCoreMvcUiModule.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Alerts/AlertList.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Alerts/AlertManager.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Alerts/AlertMessage.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Alerts/AlertType.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Alerts/IAlertManager.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc/UI}/RazorPages/AbpPage.cs (83%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc/UI}/RazorPages/AbpPageModel.cs (98%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc/UI}/RazorPages/ServiceBasedPageModelActivatorProvider.cs (94%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/DefaultThemeManager.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/DefaultThemeSelector.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ITheme.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/IThemeManager.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/IThemeSelector.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/StandardLayouts.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ThemeDictionary.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ThemeExtensions.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ThemeInfo.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ThemeNameAttribute.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI/{ => Volo/Abp/AspNetCore/Mvc}/UI/Theming/ThemingOptions.cs (100%) delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI/web.config diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs index 356bf12c4f..9f36c400d8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs @@ -12,6 +12,7 @@ using Volo.Abp.Threading; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { + //TODO: Refactor this class, extract bootstrap functionality! public abstract class AbpTagHelperService : IAbpTagHelperService where TTagHelper : TagHelper { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/HtmlHeadingTypeExtensions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/HtmlHeadingTypeExtensions.cs index 192dc593d3..ae1e26f571 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/HtmlHeadingTypeExtensions.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/HtmlHeadingTypeExtensions.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { public static class HtmlHeadingTypeExtensions { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs index 34e1eefb9a..91fcb17eb3 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { [HtmlTargetElement("abp-bundle-file", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-style-bundle")] [HtmlTargetElement("abp-bundle-file", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-script-bundle")] diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs index 92db2b5eb3..129043e2a3 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Razor.TagHelpers; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { public class AbpBundleFileTagHelperService : AbpTagHelperService { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs index d2ba25b79e..b6ad5dbab6 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Razor.TagHelpers; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { public abstract class AbpBundleTagHelperServiceBase : AbpTagHelperService where TTagHelper : TagHelper, IBundleTagHelper diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs index 029b1e8456..efb7c67ded 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { [HtmlTargetElement("abp-script-bundle", TagStructure = TagStructure.NormalOrSelfClosing)] public class AbpScriptBundleTagHelper : AbpTagHelper, IBundleTagHelper diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs index f882d45412..c487a4a878 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.TagHelpers; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { public class AbpScriptBundleTagHelperService : AbpBundleTagHelperServiceBase { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs index e2c47f4ff5..8d0fdde1d5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { //TODO: Move to Volo.Abp.AspNetCore.Mvc.UI package. diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs index 8c4fcfaf66..5dc1aa46d8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.TagHelpers; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { public class AbpStyleBundleTagHelperService : AbpBundleTagHelperServiceBase { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs index 226f5a8572..c502523e1d 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Bundling +namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers { public interface IBundleTagHelper { 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 c1da1f5f10..225780c2c2 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,4 +1,3 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @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 c1da1f5f10..225780c2c2 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,4 +1,3 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @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 c1da1f5f10..225780c2c2 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,4 +1,3 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @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/Bundling/SharedThemeGlobalScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs index f73c38dd36..cf3bab7632 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs @@ -1,11 +1,11 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryForm; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidationUnobtrusive; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.SweetAlert; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNetBs4; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryForm; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidationUnobtrusive; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr; using Volo.Abp.Modularity; namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs index c7bc3ff815..bb81b4c9a1 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs @@ -1,8 +1,8 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.FontAwesome; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNetBs4; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.FontAwesome; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr; using Volo.Abp.Modularity; namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index f2733610fa..be77592f2c 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -7,7 +7,7 @@ Volo.Abp.AspNetCore.Mvc.UI Volo.Abp.AspNetCore.Mvc.UI $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - Volo.Abp.AspNetCore.Mvc + diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertList.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertList.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertList.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertList.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertMessage.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertMessage.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertMessage.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertMessage.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertType.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertType.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/AlertType.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/AlertType.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/IAlertManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/IAlertManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Alerts/IAlertManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Alerts/IAlertManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPage.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPage.cs similarity index 83% rename from src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPage.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPage.cs index 338e4a5850..f9629da3fe 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPage.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPage.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Volo.Abp.Users; -namespace Volo.Abp.AspNetCore.Mvc.RazorPages +namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages { public abstract class AbpPage : Page { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPageModel.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs similarity index 98% rename from src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPageModel.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs index 3fe7c81536..fc2e46d42a 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/AbpPageModel.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs @@ -16,7 +16,7 @@ using Volo.Abp.Timing; using Volo.Abp.Uow; using Volo.Abp.Users; -namespace Volo.Abp.AspNetCore.Mvc.RazorPages +namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages { public abstract class AbpPageModel : PageModel { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs similarity index 94% rename from src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs index 89e0bd12ff..eb00a2998b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/ServiceBasedPageModelActivatorProvider.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.AspNetCore.Mvc.RazorPages +namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages { [Dependency(ReplaceServices = true)] public class ServiceBasedPageModelActivatorProvider : IPageModelActivatorProvider, ITransientDependency diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/DefaultThemeManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/DefaultThemeManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/DefaultThemeSelector.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/DefaultThemeSelector.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ITheme.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ITheme.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ITheme.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ITheme.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/IThemeManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/IThemeManager.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/IThemeManager.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/IThemeManager.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/IThemeSelector.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/IThemeSelector.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/IThemeSelector.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/IThemeSelector.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/StandardLayouts.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/StandardLayouts.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/StandardLayouts.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeDictionary.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeDictionary.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeDictionary.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeDictionary.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeExtensions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeExtensions.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeInfo.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeInfo.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeInfo.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeInfo.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeNameAttribute.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeNameAttribute.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemeNameAttribute.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeNameAttribute.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemingOptions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI/UI/Theming/ThemingOptions.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/web.config b/src/Volo.Abp.AspNetCore.Mvc.UI/web.config deleted file mode 100644 index dc0514fca5..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs b/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs index c73ea3cc0b..e866022437 100644 --- a/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs +++ b/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace Volo.Abp.Application.Services +namespace Volo.Abp { [Serializable] [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Method)] diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs index b9eefa3411..4c9a6ccedf 100644 --- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs +++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs @@ -1,6 +1,7 @@ using Volo.Abp.Authorization; using Volo.Abp.DependencyInjection; using Volo.Abp.Uow; +using Volo.Abp.Validation; namespace Volo.Abp.Application.Services { diff --git a/src/Volo.Abp.Validation/Volo/Abp/Validation/IValidationEnabled.cs b/src/Volo.Abp.Validation/Volo/Abp/Validation/IValidationEnabled.cs index 8116553fce..8ff5591d7c 100644 --- a/src/Volo.Abp.Validation/Volo/Abp/Validation/IValidationEnabled.cs +++ b/src/Volo.Abp.Validation/Volo/Abp/Validation/IValidationEnabled.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.Application.Services +namespace Volo.Abp.Validation { public interface IValidationEnabled { diff --git a/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptorRegistrar.cs b/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptorRegistrar.cs index 75c97e0936..81f6eb6597 100644 --- a/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptorRegistrar.cs +++ b/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationInterceptorRegistrar.cs @@ -1,5 +1,4 @@ -using Volo.Abp.Application.Services; -using Volo.Abp.DependencyInjection; +using Volo.Abp.DependencyInjection; namespace Volo.Abp.Validation { 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 c1da1f5f10..225780c2c2 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,4 +1,3 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file