diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 00ab86b3..3d13adff 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -1,5 +1,4 @@ -@using Oqtane.Services.Interfaces -@inject IInstallationService InstallationService +@inject IInstallationService InstallationService @if (_initialized) { diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index bb83de5e..7e3004fb 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Dashboard -@using Oqtane.Enums @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor index 43a4c9a0..9e0df574 100644 --- a/Oqtane.Client/Modules/Admin/Error/Index.razor +++ b/Oqtane.Client/Modules/Admin/Error/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Error -@using Oqtane.Enums @inherits ModuleBase @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index b8daae66..182f08f7 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Files -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index e7e49e7c..167c0b3c 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Files -@using Oqtane.Enums @inherits ModuleBase @inject IFolderService FolderService @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 610d9d99..d92e0994 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Files -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFolderService FolderService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor index ee2b440a..4775f8a0 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Jobs -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index d4a2f624..5339a226 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Jobs -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor index 9ccab6e7..f15c50df 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Jobs -@using Oqtane.Enums @inherits ModuleBase @inject IJobService JobService diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index fc466aa5..9efc1486 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Jobs -@using Oqtane.Enums @inherits ModuleBase @inject IJobLogService JobLogService diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 70922950..098ebcb4 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Login -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IJSRuntime JsRuntime diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 1d4fd33c..2f9c054d 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -1,6 +1,5 @@ @namespace Oqtane.Modules.Admin.Logs @using System.Globalization -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ILogService LogService diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index b51a4bc1..e87450bd 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Logs -@using Oqtane.Enums @inherits ModuleBase @inject ILogService LogService diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index 7dcb0ee7..b1d72ce0 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.ModuleCreator -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 6158f7b4..a342297b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index f9fb24a9..732d7d5c 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions -@using Oqtane.Enums @inherits ModuleBase @inject IModuleDefinitionService ModuleDefinitionService @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 06793559..d348ddb4 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index b797755c..77c0ba53 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Modules -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 95d99999..2a4d3aa0 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Modules -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IModuleService ModuleService diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index ee10e2cd..a98d015e 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Modules -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index e1ec4aad..483cc107 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Pages -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 6624c9fe..2b13870e 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Pages -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index 005f85ea..b53f3811 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Pages -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageService PageService diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index a3c7fb4b..bcfd2d3f 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Profiles -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IProfileService ProfileService diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor index dedcc2c3..e3cefdaa 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Profiles -@using Oqtane.Enums @inherits ModuleBase @inject IProfileService ProfileService diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor index d10240ae..d3955307 100644 --- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor +++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.RecycleBin -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IPageModuleService PageModuleService diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index ba85ef58..f358d905 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Register -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor index 8b309a16..b6e4eb66 100644 --- a/Oqtane.Client/Modules/Admin/Reset/Index.razor +++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Reset -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index 7637d0b1..34e93e2d 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Roles -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index e82050e6..4b0dd0e0 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Roles -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index 9e329c0c..0acfa614 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Roles -@using Oqtane.Enums @inherits ModuleBase @inject IRoleService RoleService diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index b734013a..b20ccd1d 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Site -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ISiteService SiteService diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index f91abfe9..0bb51513 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Sites -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor index 414fc10b..838615ee 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Sites -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ISiteService SiteService diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index 00c5dabc..978f7ad3 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Sites -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IAliasService AliasService diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index 54bab14d..4899301c 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Sql -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor index 9b8020c7..962b9e4c 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Tenants -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index 8d24fec6..56f3fe20 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Tenants -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index 1c333833..018c1f68 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Tenants -@using Oqtane.Enums @inherits ModuleBase @inject ITenantService TenantService diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 9c1ee9bf..d78ab5e5 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Themes -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 287b46f1..4a3113b6 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Themes -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index ea80e420..5d55b6aa 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Upgrade -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index 967a62b4..6cf41e3f 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.UserProfile -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index 38ee0ac8..6711617a 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.UserProfile -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor index 61a9920c..07140f63 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.UserProfile -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index a339b3df..561185f6 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Users -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index ba041d7d..a0b8370b 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Users -@using Oqtane.Enums @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index 0abeb865..a9d4366f 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Users -@using Oqtane.Enums @inherits ModuleBase @inject IUserRoleService UserRoleService @inject IUserService UserService diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 22453aa0..fa84b46d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Admin.Users -@using Oqtane.Enums @inherits ModuleBase @inject IRoleService RoleService @inject IUserRoleService UserRoleService diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index 310abc06..08b2d77d 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Controls -@using Oqtane.Enums @inherits ModuleBase @if (_visible) diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index 887f1b2f..cf588579 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -1,5 +1,4 @@ @namespace Oqtane.Modules.Controls -@using Oqtane.Enums @inherits ModuleBase @inject IUserService UserService diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index e90603d9..41c55192 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -1,6 +1,6 @@ @using Oqtane.Modules.HtmlText.Services -@using Oqtane.Modules.Models.HtmlText -@using Oqtane.Enums +@using Oqtane.Modules.HtmlText.Models +@using Oqtane.Modules.Controls @namespace Oqtane.Modules.HtmlText @inherits ModuleBase @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor index 3e5c35d6..47bf0b61 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -1,4 +1,5 @@ @using Oqtane.Modules.HtmlText.Services +@using Oqtane.Modules.HtmlText.Models @namespace Oqtane.Modules.HtmlText @inherits ModuleBase @inject NavigationManager NavigationManager diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index cfbe8a7f..1b3a7834 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Modules.Models.HtmlText; +using Oqtane.Modules.HtmlText.Models; using Oqtane.Services; using Oqtane.Shared; diff --git a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs index 246612a4..6ce1d646 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Modules.Models.HtmlText; +using Oqtane.Modules.HtmlText.Models; namespace Oqtane.Modules.HtmlText.Services { diff --git a/Oqtane.Client/Modules/IModuleControl.cs b/Oqtane.Client/Modules/IModuleControl.cs index 4fb55d7b..c4f2fdee 100644 --- a/Oqtane.Client/Modules/IModuleControl.cs +++ b/Oqtane.Client/Modules/IModuleControl.cs @@ -1,5 +1,4 @@ -using Oqtane.Enums; -using Oqtane.Shared; +using Oqtane.Shared; namespace Oqtane.Modules { diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index db39b87d..1fa56c65 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Oqtane.Services; using System; using Oqtane.Enums; -using Oqtane.Services.Interfaces; using Oqtane.UI; namespace Oqtane.Modules diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor index ae440590..2d20ff38 100644 --- a/Oqtane.Client/Modules/Weather/Index.razor +++ b/Oqtane.Client/Modules/Weather/Index.razor @@ -1,5 +1,4 @@ @using Oqtane.Modules.Weather.Services -@using Oqtane.Modules.Weather.Models @namespace Oqtane.Modules.Weather @inherits ModuleBase @@ -40,4 +39,4 @@ else WeatherForecastService forecastservice = new WeatherForecastService(); forecasts = await forecastservice.GetForecastAsync(DateTime.UtcNow); } -} +} \ No newline at end of file diff --git a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs index ea5e7156..7e02ea8a 100644 --- a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs +++ b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Modules.Weather.Models +namespace Oqtane.Modules.Weather { public class WeatherForecast { diff --git a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs index 2b6b9621..743848fb 100644 --- a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs +++ b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Oqtane.Modules.Weather.Models; namespace Oqtane.Modules.Weather.Services { diff --git a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs index 1fde0100..e6ad13d9 100644 --- a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs +++ b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs @@ -2,7 +2,6 @@ using Oqtane.Modules; using System; using System.Linq; using System.Threading.Tasks; -using Oqtane.Modules.Weather.Models; namespace Oqtane.Modules.Weather.Services { diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs index 3563396e..4172834b 100644 --- a/Oqtane.Client/Program.cs +++ b/Oqtane.Client/Program.cs @@ -1,19 +1,16 @@ -using System; -using System.Linq; -using System.Reflection; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; -using Oqtane.Interfaces; -using Oqtane.Models; -using Oqtane.Modules; -using Oqtane.Providers; +using System.Threading.Tasks; using Oqtane.Services; -using Oqtane.Services.Interfaces; +using System.Reflection; +using System; +using System.Linq; +using Oqtane.Modules; using Oqtane.Shared; +using Oqtane.Providers; +using Microsoft.AspNetCore.Components.Authorization; -namespace Oqtane +namespace Oqtane.Client { public class Program { diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index 8c3c2fa7..d7fdf3e6 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using Oqtane.Shared; using System.Net; using System; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index d4714d6f..3a875ac4 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using Oqtane.Models; -using Oqtane.Services.Interfaces; using Oqtane.Shared; using Oqtane.UI; diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 44522474..642aeafa 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -8,7 +8,6 @@ using Oqtane.Shared; using System; using System.Diagnostics.CodeAnalysis; using System.Net; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index 014aa436..40da3010 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using System.Net.Http; using Microsoft.AspNetCore.Components; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/Interfaces/IAliasService.cs b/Oqtane.Client/Services/Interfaces/IAliasService.cs index 2bd39d7e..f15356f1 100644 --- a/Oqtane.Client/Services/Interfaces/IAliasService.cs +++ b/Oqtane.Client/Services/Interfaces/IAliasService.cs @@ -1,9 +1,9 @@ -using System; +using Oqtane.Models; +using System; using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IAliasService { diff --git a/Oqtane.Client/Services/Interfaces/IFileService.cs b/Oqtane.Client/Services/Interfaces/IFileService.cs index 925f699d..7e10f4fd 100644 --- a/Oqtane.Client/Services/Interfaces/IFileService.cs +++ b/Oqtane.Client/Services/Interfaces/IFileService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IFileService { diff --git a/Oqtane.Client/Services/Interfaces/IFolderService.cs b/Oqtane.Client/Services/Interfaces/IFolderService.cs index 9e70b690..34edb609 100644 --- a/Oqtane.Client/Services/Interfaces/IFolderService.cs +++ b/Oqtane.Client/Services/Interfaces/IFolderService.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IFolderService { diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs index 0485bdec..c9eeaca8 100644 --- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs +++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs @@ -1,8 +1,8 @@ -using System.Threading.Tasks; -using Oqtane.Models; +using Oqtane.Models; +using System.Threading.Tasks; using Oqtane.Shared; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IInstallationService { diff --git a/Oqtane.Client/Services/Interfaces/IJobLogService.cs b/Oqtane.Client/Services/Interfaces/IJobLogService.cs index 70d0da46..015d83f0 100644 --- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs +++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IJobLogService { diff --git a/Oqtane.Client/Services/Interfaces/IJobService.cs b/Oqtane.Client/Services/Interfaces/IJobService.cs index 8e56454f..d6f0decf 100644 --- a/Oqtane.Client/Services/Interfaces/IJobService.cs +++ b/Oqtane.Client/Services/Interfaces/IJobService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IJobService { diff --git a/Oqtane.Client/Services/Interfaces/ILogService.cs b/Oqtane.Client/Services/Interfaces/ILogService.cs index cdcdd26a..30867c72 100644 --- a/Oqtane.Client/Services/Interfaces/ILogService.cs +++ b/Oqtane.Client/Services/Interfaces/ILogService.cs @@ -1,11 +1,11 @@ -using System; +using Oqtane.Models; +using Oqtane.Shared; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Oqtane.Enums; -using Oqtane.Models; -using Oqtane.Shared; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ILogService { diff --git a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs index 88417a29..8560c661 100644 --- a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs +++ b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Oqtane.Models; +using Oqtane.Models; using Oqtane.UI; +using System.Collections.Generic; +using System.Threading.Tasks; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IModuleDefinitionService { diff --git a/Oqtane.Client/Services/Interfaces/IModuleService.cs b/Oqtane.Client/Services/Interfaces/IModuleService.cs index ad85a26f..27f11dff 100644 --- a/Oqtane.Client/Services/Interfaces/IModuleService.cs +++ b/Oqtane.Client/Services/Interfaces/IModuleService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IModuleService { diff --git a/Oqtane.Client/Services/Interfaces/INotificationService.cs b/Oqtane.Client/Services/Interfaces/INotificationService.cs index bc479803..bd52b7d0 100644 --- a/Oqtane.Client/Services/Interfaces/INotificationService.cs +++ b/Oqtane.Client/Services/Interfaces/INotificationService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface INotificationService { diff --git a/Oqtane.Client/Services/Interfaces/IPackageService.cs b/Oqtane.Client/Services/Interfaces/IPackageService.cs index a1e69541..eeb243c1 100644 --- a/Oqtane.Client/Services/Interfaces/IPackageService.cs +++ b/Oqtane.Client/Services/Interfaces/IPackageService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IPackageService { diff --git a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs index 3cae8abc..f51c56a8 100644 --- a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs +++ b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs @@ -1,7 +1,7 @@ -using System.Threading.Tasks; -using Oqtane.Models; +using Oqtane.Models; +using System.Threading.Tasks; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IPageModuleService { diff --git a/Oqtane.Client/Services/Interfaces/IPageService.cs b/Oqtane.Client/Services/Interfaces/IPageService.cs index 4cd8dd69..60f1d86e 100644 --- a/Oqtane.Client/Services/Interfaces/IPageService.cs +++ b/Oqtane.Client/Services/Interfaces/IPageService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IPageService { diff --git a/Oqtane.Client/Services/Interfaces/IProfileService.cs b/Oqtane.Client/Services/Interfaces/IProfileService.cs index 83fd6c5d..cc079f3c 100644 --- a/Oqtane.Client/Services/Interfaces/IProfileService.cs +++ b/Oqtane.Client/Services/Interfaces/IProfileService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IProfileService { diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs index 90373202..23ae0d05 100644 --- a/Oqtane.Client/Services/Interfaces/IRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IRoleService { diff --git a/Oqtane.Client/Services/Interfaces/ISettingService.cs b/Oqtane.Client/Services/Interfaces/ISettingService.cs index 9c128612..f7c06591 100644 --- a/Oqtane.Client/Services/Interfaces/ISettingService.cs +++ b/Oqtane.Client/Services/Interfaces/ISettingService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ISettingService { diff --git a/Oqtane.Client/Services/Interfaces/ISiteService.cs b/Oqtane.Client/Services/Interfaces/ISiteService.cs index 0ca7847c..32ca6926 100644 --- a/Oqtane.Client/Services/Interfaces/ISiteService.cs +++ b/Oqtane.Client/Services/Interfaces/ISiteService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ISiteService { diff --git a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs index 5993b7f8..abb9a6c1 100644 --- a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs +++ b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ISiteTemplateService { diff --git a/Oqtane.Client/Services/Interfaces/ISqlService.cs b/Oqtane.Client/Services/Interfaces/ISqlService.cs index 5c7127ee..f563a795 100644 --- a/Oqtane.Client/Services/Interfaces/ISqlService.cs +++ b/Oqtane.Client/Services/Interfaces/ISqlService.cs @@ -1,7 +1,7 @@ -using System.Threading.Tasks; -using Oqtane.Models; +using Oqtane.Models; +using System.Threading.Tasks; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ISqlService { diff --git a/Oqtane.Client/Services/Interfaces/ITenantService.cs b/Oqtane.Client/Services/Interfaces/ITenantService.cs index 0b863bab..24bdd79b 100644 --- a/Oqtane.Client/Services/Interfaces/ITenantService.cs +++ b/Oqtane.Client/Services/Interfaces/ITenantService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface ITenantService { diff --git a/Oqtane.Client/Services/Interfaces/IThemeService.cs b/Oqtane.Client/Services/Interfaces/IThemeService.cs index 36e25e9f..8756042b 100644 --- a/Oqtane.Client/Services/Interfaces/IThemeService.cs +++ b/Oqtane.Client/Services/Interfaces/IThemeService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IThemeService { diff --git a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs index 55d553db..25cb9ab4 100644 --- a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using Oqtane.Models; +using System.Collections.Generic; using System.Threading.Tasks; -using Oqtane.Models; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IUserRoleService { diff --git a/Oqtane.Client/Services/Interfaces/IUserService.cs b/Oqtane.Client/Services/Interfaces/IUserService.cs index 9eba77b3..0a18b23d 100644 --- a/Oqtane.Client/Services/Interfaces/IUserService.cs +++ b/Oqtane.Client/Services/Interfaces/IUserService.cs @@ -1,7 +1,7 @@ -using System.Threading.Tasks; -using Oqtane.Models; +using Oqtane.Models; +using System.Threading.Tasks; -namespace Oqtane.Services.Interfaces +namespace Oqtane.Services { public interface IUserService { diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index 4cb22566..f564f46c 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index 3903a375..b06b2fd7 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index d278fbd7..a679ee3d 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Oqtane.Enums; using Oqtane.Models; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index f0aa9818..119aa9dd 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using System; using System.Reflection; -using Oqtane.Services.Interfaces; using Oqtane.Shared; using Oqtane.UI; diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index 4408fbd2..c78403e4 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index 7eb28b28..6239ca8a 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index 117ec952..952ea4cb 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Linq; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index a2ae4b6c..11fece8c 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -2,7 +2,6 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index c191f1e0..6cc832c7 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using Oqtane.Shared; using System; using System.Net; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 0f0fca14..4ceb4cac 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index 614293af..708f0721 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index 7082bf89..22ac7fc4 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index eab64ad1..ce4a379c 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Linq; using Microsoft.AspNetCore.Components; using System.Collections.Generic; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SiteTemplateService.cs b/Oqtane.Client/Services/SiteTemplateService.cs index 48cff86c..410f2abc 100644 --- a/Oqtane.Client/Services/SiteTemplateService.cs +++ b/Oqtane.Client/Services/SiteTemplateService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/SqlService.cs b/Oqtane.Client/Services/SqlService.cs index 0f1440ea..52371df8 100644 --- a/Oqtane.Client/Services/SqlService.cs +++ b/Oqtane.Client/Services/SqlService.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index 14f7c277..d325fd91 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Components; using Oqtane.Shared; using System.Collections.Generic; using System.Linq; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index 0f633501..e872aae1 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using System.Reflection; using System; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index 137462ca..66e9feb9 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane.Services diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index ac306e8e..d81077ff 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -3,7 +3,6 @@ using Oqtane.Models; using System.Net.Http; using Microsoft.AspNetCore.Components; using System.Threading.Tasks; -using Oqtane.Services.Interfaces; namespace Oqtane.Services { diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor index 5ed6e109..9d0c7dd4 100644 --- a/Oqtane.Client/UI/Pane.razor +++ b/Oqtane.Client/UI/Pane.razor @@ -1,5 +1,4 @@ -@using Oqtane.Enums -@namespace Oqtane.UI +@namespace Oqtane.UI @inject IUserService UserService @inject IModuleService ModuleService @inject IModuleDefinitionService ModuleDefinitionService diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor index 1c87349b..22d11669 100644 --- a/Oqtane.Client/_Imports.razor +++ b/Oqtane.Client/_Imports.razor @@ -14,8 +14,7 @@ @using Oqtane.Providers @using Oqtane.Security @using Oqtane.Services -@using Oqtane.Services.Interfaces @using Oqtane.Shared @using Oqtane.Themes @using Oqtane.Themes.Controls -@using Oqtane.UI +@using Oqtane.UI \ No newline at end of file diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 922c71de..47f2d0a9 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -10,7 +10,6 @@ using System.Globalization; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 5a5da650..ad85e6c2 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -16,7 +16,6 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index c2b22fc4..1a2fdb2f 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -8,7 +8,6 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 6db3404e..838a62fb 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index e1f766a2..f2a506d5 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -6,7 +6,6 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index 575ee6c8..d59b9411 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index fe2064d8..348f973e 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -7,7 +7,6 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 1d7cd5ad..5e4659ce 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -12,8 +12,6 @@ using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; using Oqtane.Security; using System; -using Oqtane.Repository.Interfaces; - // ReSharper disable StringIndexOfIsCultureSpecific.1 namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 33c2a70f..47f0f85f 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -6,7 +6,6 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 7e73dd6a..607ceaef 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -9,7 +9,6 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index 057efe0e..c6149cbd 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -7,7 +7,6 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Security; namespace Oqtane.Controllers diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 21b5621d..1a3c0f40 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -6,7 +6,6 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 84ff016f..61f58f4a 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -6,7 +6,6 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 0ccc0e6a..4c551098 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -7,7 +7,6 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index afa80966..a8db1073 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -7,7 +7,6 @@ using System.Linq; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs index c560d45e..c74e69a4 100644 --- a/Oqtane.Server/Controllers/SiteTemplateController.cs +++ b/Oqtane.Server/Controllers/SiteTemplateController.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Mvc; using Oqtane.Models; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs index 21c0e6fb..1ec75d19 100644 --- a/Oqtane.Server/Controllers/SqlController.cs +++ b/Oqtane.Server/Controllers/SqlController.cs @@ -11,7 +11,6 @@ using System.Data; using System.Dynamic; using Newtonsoft.Json; using System; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index feb31480..83f84355 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -6,7 +6,6 @@ using Oqtane.Enums; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index 72eb2bb3..5fadf164 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Hosting; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 4cd74157..d2bc94db 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -13,7 +13,6 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index fcfc7665..fa3d2d6c 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -6,7 +6,6 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Controllers { diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index e16ba3fb..aef47901 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -6,11 +6,7 @@ using System.Reflection; using System.Runtime.Loader; using Microsoft.Extensions.Hosting; using Oqtane.Infrastructure; -using Oqtane.Infrastructure.Jobs; -using Oqtane.Interfaces; -using Oqtane.Models; using Oqtane.Modules; -using File = System.IO.File; // ReSharper disable once CheckNamespace namespace Microsoft.Extensions.DependencyInjection diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 46f7b1f7..2d23f219 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -15,8 +15,6 @@ using Oqtane.Controllers; using Oqtane.Extensions; using Oqtane.Models; using Oqtane.Repository; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; using File = System.IO.File; diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index fdc562ad..35b8b0a9 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Oqtane.Models; -using Oqtane.Repository.Interfaces; +using Oqtane.Repository; using Oqtane.Shared; -namespace Oqtane.Infrastructure.Jobs +namespace Oqtane.Infrastructure { public abstract class HostedServiceBase : IHostedService, IDisposable { diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs index 8b2e0a55..bd667486 100644 --- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs @@ -5,10 +5,10 @@ using System.Net; using System.Net.Mail; using Microsoft.Extensions.DependencyInjection; using Oqtane.Models; -using Oqtane.Repository.Interfaces; +using Oqtane.Repository; using Oqtane.Shared; -namespace Oqtane.Infrastructure.Jobs +namespace Oqtane.Infrastructure { public class NotificationJob : HostedServiceBase { diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index e42c83c3..47101016 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; using Oqtane.Security; // ReSharper disable StringIndexOfIsCultureSpecific.2 // ReSharper disable StringIndexOfIsCultureSpecific.1 diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 89b03b6f..45d61327 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -1,11 +1,11 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Hosting; +using Oqtane.Models; using Oqtane.Infrastructure.Interfaces; -using Oqtane.Models; -using Oqtane.Repository.Interfaces; +using System.Collections.Generic; +using Oqtane.Repository; +using Microsoft.AspNetCore.Hosting; using Oqtane.Shared; -namespace Oqtane.Infrastructure.SiteTemplates +namespace Oqtane.SiteTemplates { public class DefaultSiteTemplate : ISiteTemplate { diff --git a/Oqtane.Server/Infrastructure/SyncManager.cs b/Oqtane.Server/Infrastructure/SyncManager.cs index 676f123d..7828bbc3 100644 --- a/Oqtane.Server/Infrastructure/SyncManager.cs +++ b/Oqtane.Server/Infrastructure/SyncManager.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Infrastructure { diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index fea49e28..01eb92cf 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; +using Oqtane.Modules.HtmlText.Models; using Oqtane.Modules.HtmlText.Repository; using Microsoft.AspNetCore.Http; using Oqtane.Shared; @@ -7,7 +8,6 @@ using System; using System.Collections.Generic; using Oqtane.Enums; using Oqtane.Infrastructure.Interfaces; -using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Controllers { diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index a7f6082a..f37ac523 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -1,7 +1,7 @@ using Oqtane.Models; +using Oqtane.Modules.HtmlText.Models; using Oqtane.Modules.HtmlText.Repository; using System.Net; -using Oqtane.Modules.Models.HtmlText; namespace Oqtane.Modules.HtmlText.Manager { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs index c2efd6a5..70cd2065 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs @@ -1,11 +1,7 @@ using Microsoft.EntityFrameworkCore; +using Oqtane.Modules.HtmlText.Models; using Oqtane.Repository; using Microsoft.AspNetCore.Http; -using Oqtane.Interfaces; -using Oqtane.Models; -using Oqtane.Modules.Models.HtmlText; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs index 8163f82d..c97b0de7 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs @@ -1,8 +1,6 @@ using Microsoft.EntityFrameworkCore; using System.Linq; -using Oqtane.Interfaces; -using Oqtane.Models; -using Oqtane.Modules.Models.HtmlText; +using Oqtane.Modules.HtmlText.Models; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs index ff7bd6b8..cbe5d0e4 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs @@ -1,4 +1,4 @@ -using Oqtane.Modules.Models.HtmlText; +using Oqtane.Modules.HtmlText.Models; namespace Oqtane.Modules.HtmlText.Repository { diff --git a/Oqtane.Server/Pages/Login.cshtml b/Oqtane.Server/Pages/Login.cshtml index 44d794dc..f2eab15f 100644 --- a/Oqtane.Server/Pages/Login.cshtml +++ b/Oqtane.Server/Pages/Login.cshtml @@ -1,3 +1,3 @@ @page "/pages/login" -@namespace Oqtane.Pages +@namespace Oqtane.Pages @model Oqtane.Pages.LoginModel diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs index 613f1271..e46805e6 100644 --- a/Oqtane.Server/Program.cs +++ b/Oqtane.Server/Program.cs @@ -1,10 +1,13 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; +// DO NOT REMOVE - needed for client-side Blazor +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore; using Microsoft.Extensions.DependencyInjection; -using Oqtane.Infrastructure; // DO NOT REMOVE - needed for client-side Blazor +using Oqtane.Infrastructure; -namespace Oqtane +namespace Oqtane.Server { public class Program { diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index 08220ff4..ccb26681 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -4,8 +4,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index f0804065..247006bd 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -4,11 +4,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using Oqtane.Interfaces; using Oqtane.Models; -using Oqtane.Repository.Interfaces; -namespace Oqtane.Repository.Context +namespace Oqtane.Repository { public class DBContextBase : IdentityUserContext { diff --git a/Oqtane.Server/Repository/Context/InstallationContext.cs b/Oqtane.Server/Repository/Context/InstallationContext.cs index 618fee17..7b971a16 100644 --- a/Oqtane.Server/Repository/Context/InstallationContext.cs +++ b/Oqtane.Server/Repository/Context/InstallationContext.cs @@ -1,7 +1,8 @@ -using Microsoft.EntityFrameworkCore; +using System.Diagnostics.CodeAnalysis; +using Microsoft.EntityFrameworkCore; using Oqtane.Models; -namespace Oqtane.Repository.Context +namespace Oqtane.Repository { public class InstallationContext : DbContext diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs index cb6a75c6..65312819 100644 --- a/Oqtane.Server/Repository/Context/MasterDBContext.cs +++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs @@ -2,10 +2,9 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; -using Oqtane.Interfaces; using Oqtane.Models; -namespace Oqtane.Repository.Context +namespace Oqtane.Repository { public class MasterDBContext : DbContext { diff --git a/Oqtane.Server/Repository/Context/TenantDBContext.cs b/Oqtane.Server/Repository/Context/TenantDBContext.cs index e865a11e..be085b20 100644 --- a/Oqtane.Server/Repository/Context/TenantDBContext.cs +++ b/Oqtane.Server/Repository/Context/TenantDBContext.cs @@ -1,9 +1,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Interfaces; -namespace Oqtane.Repository.Context +namespace Oqtane.Repository { public class TenantDBContext : DBContextBase { diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index 0939fc41..a74f2ce9 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index 50a1b750..c83fa215 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs index 87908391..4f258307 100644 --- a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IAliasRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs index 8109595d..19715187 100644 --- a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IFileRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs index 85105ddb..65256184 100644 --- a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IFolderRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs index 167c34fc..d5858da5 100644 --- a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IJobLogRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs index 88bfbfdb..12be85c1 100644 --- a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IJobRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs index 7ca86392..27752a03 100644 --- a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ILogRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs index ca711dc1..32c59549 100644 --- a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IModuleDefinitionRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs index 2e108a9b..2ef4185d 100644 --- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IModuleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs index bf7dbdbd..ef53bc3a 100644 --- a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface INotificationRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs index 3efea416..181fb629 100644 --- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IPageModuleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs index 66a213a6..6db92dba 100644 --- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IPageRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs index 00347d88..5be9bb50 100644 --- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IPermissionRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs index 9e0d6edb..c9b4f34b 100644 --- a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IProfileRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs index b9c0bc65..35f9315f 100644 --- a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IRoleRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs index 64301777..976519fb 100644 --- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ISettingRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs index da470601..5e05dccf 100644 --- a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ISiteRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs index 7202cb94..659226ff 100644 --- a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ISiteTemplateRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs index 3b2d9f29..4bd04e91 100644 --- a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs @@ -1,7 +1,7 @@ using System.Data.SqlClient; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ISqlRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs index 790f83b7..5993eb63 100644 --- a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ITenantRepository { diff --git a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs b/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs index 2ee51aed..95e916f7 100644 --- a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs +++ b/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs @@ -1,6 +1,6 @@ using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface ITenantResolver { diff --git a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs b/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs index 595f752f..90afa3bd 100644 --- a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IThemeRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs index be389cfe..be646e56 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IUserRepository { diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs index ad7fba60..c46a0e50 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Oqtane.Models; -namespace Oqtane.Repository.Interfaces +namespace Oqtane.Repository { public interface IUserRoleRepository { diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs index 11db1cf2..440a483d 100644 --- a/Oqtane.Server/Repository/JobLogRepository.cs +++ b/Oqtane.Server/Repository/JobLogRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs index d30f482d..cbe51c19 100644 --- a/Oqtane.Server/Repository/JobRepository.cs +++ b/Oqtane.Server/Repository/JobRepository.cs @@ -4,8 +4,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs index a76ebbd0..1bcbc2be 100644 --- a/Oqtane.Server/Repository/LogRepository.cs +++ b/Oqtane.Server/Repository/LogRepository.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Linq; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index a81a2363..db4a8339 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -5,8 +5,6 @@ using System.Reflection; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; using Oqtane.Modules; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index e6e6e44a..18d9df3b 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -7,8 +7,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Oqtane.Models; using Oqtane.Modules; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Module = Oqtane.Models.Module; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs index 172c7364..8f34ff50 100644 --- a/Oqtane.Server/Repository/NotificationRepository.cs +++ b/Oqtane.Server/Repository/NotificationRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 83524786..ee85270d 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 049c0090..9e106e74 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index cb84c4c1..fd9670d3 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -5,8 +5,6 @@ using System.Text; using System.Text.Json; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs index 542ec07e..8577ea78 100644 --- a/Oqtane.Server/Repository/ProfileRepository.cs +++ b/Oqtane.Server/Repository/ProfileRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index fb2c830f..2814d7e0 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs index e3744cfe..30b7f676 100644 --- a/Oqtane.Server/Repository/SettingRepository.cs +++ b/Oqtane.Server/Repository/SettingRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index adebe718..a2f7e33d 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -8,8 +8,6 @@ using Microsoft.Extensions.DependencyInjection; using Oqtane.Infrastructure.Interfaces; using Oqtane.Models; using Oqtane.Modules; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; using Module = Oqtane.Models.Module; diff --git a/Oqtane.Server/Repository/SiteTemplateRepository.cs b/Oqtane.Server/Repository/SiteTemplateRepository.cs index 93123a85..c88934fd 100644 --- a/Oqtane.Server/Repository/SiteTemplateRepository.cs +++ b/Oqtane.Server/Repository/SiteTemplateRepository.cs @@ -5,7 +5,6 @@ using System.Reflection; using Microsoft.Extensions.DependencyInjection; using Oqtane.Infrastructure.Interfaces; using Oqtane.Models; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/SqlRepository.cs b/Oqtane.Server/Repository/SqlRepository.cs index a7fef59c..c9bdf734 100644 --- a/Oqtane.Server/Repository/SqlRepository.cs +++ b/Oqtane.Server/Repository/SqlRepository.cs @@ -2,7 +2,6 @@ using System.Data; using System.Data.SqlClient; using Oqtane.Models; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs index 94813ab8..6c22ba75 100644 --- a/Oqtane.Server/Repository/TenantRepository.cs +++ b/Oqtane.Server/Repository/TenantRepository.cs @@ -4,8 +4,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs index 451c2b21..8a5b85c4 100644 --- a/Oqtane.Server/Repository/TenantResolver.cs +++ b/Oqtane.Server/Repository/TenantResolver.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http; using Oqtane.Models; -using Oqtane.Repository.Interfaces; using Oqtane.Shared; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index 0ec55b2e..3bb3f7e9 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Oqtane.Models; -using Oqtane.Repository.Interfaces; using Oqtane.Themes; namespace Oqtane.Repository diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs index cd1e3c77..a9e51afe 100644 --- a/Oqtane.Server/Repository/UserRepository.cs +++ b/Oqtane.Server/Repository/UserRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index 90c98ea7..79f8a629 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -2,8 +2,6 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; namespace Oqtane.Repository { diff --git a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs index c279b0b5..1e945938 100644 --- a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs +++ b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs @@ -7,7 +7,6 @@ using Oqtane.Shared; using System.Collections.Generic; using System.Linq; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Security { diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index 8e0e56af..72108b5d 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -3,7 +3,6 @@ using Oqtane.Models; using System.Linq; using System.Security.Claims; using Oqtane.Repository; -using Oqtane.Repository.Interfaces; namespace Oqtane.Security { diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index e1ce6d62..46b5e697 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -17,11 +17,8 @@ using Microsoft.OpenApi.Models; using Oqtane.Infrastructure; using Oqtane.Infrastructure.Interfaces; using Oqtane.Repository; -using Oqtane.Repository.Context; -using Oqtane.Repository.Interfaces; using Oqtane.Security; using Oqtane.Services; -using Oqtane.Services.Interfaces; using Oqtane.Shared; namespace Oqtane diff --git a/Oqtane.Shared/Enums/LogLevel.cs b/Oqtane.Shared/Enums/LogLevel.cs index ac02c377..f772157e 100644 --- a/Oqtane.Shared/Enums/LogLevel.cs +++ b/Oqtane.Shared/Enums/LogLevel.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Enums +namespace Oqtane.Shared { public enum LogLevel { diff --git a/Oqtane.Shared/Enums/SecurityAccessLevel.cs b/Oqtane.Shared/Enums/SecurityAccessLevel.cs index f82f2e42..7b993b60 100644 --- a/Oqtane.Shared/Enums/SecurityAccessLevel.cs +++ b/Oqtane.Shared/Enums/SecurityAccessLevel.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Enums +namespace Oqtane.Shared { public enum SecurityAccessLevel { diff --git a/Oqtane.Shared/Interfaces/IAuditable.cs b/Oqtane.Shared/Interfaces/IAuditable.cs index bb961087..83cd1c1f 100644 --- a/Oqtane.Shared/Interfaces/IAuditable.cs +++ b/Oqtane.Shared/Interfaces/IAuditable.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Interfaces +namespace Oqtane.Models { public interface IAuditable { diff --git a/Oqtane.Shared/Interfaces/IDeletable.cs b/Oqtane.Shared/Interfaces/IDeletable.cs index da854e61..7880f8ff 100644 --- a/Oqtane.Shared/Interfaces/IDeletable.cs +++ b/Oqtane.Shared/Interfaces/IDeletable.cs @@ -1,6 +1,6 @@ using System; -namespace Oqtane.Interfaces +namespace Oqtane.Models { public interface IDeletable { diff --git a/Oqtane.Shared/Interfaces/IService.cs b/Oqtane.Shared/Interfaces/IService.cs index 4fbd91d0..b7330d81 100644 --- a/Oqtane.Shared/Interfaces/IService.cs +++ b/Oqtane.Shared/Interfaces/IService.cs @@ -1,4 +1,4 @@ -namespace Oqtane.Interfaces +namespace Oqtane.Modules { public interface IService { diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs index a2d34872..5e54e382 100644 --- a/Oqtane.Shared/Models/Alias.cs +++ b/Oqtane.Shared/Models/Alias.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/File.cs b/Oqtane.Shared/Models/File.cs index e4aa47cf..ae20fa11 100644 --- a/Oqtane.Shared/Models/File.cs +++ b/Oqtane.Shared/Models/File.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Folder.cs b/Oqtane.Shared/Models/Folder.cs index 23acb72f..5f04f4bb 100644 --- a/Oqtane.Shared/Models/Folder.cs +++ b/Oqtane.Shared/Models/Folder.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Job.cs b/Oqtane.Shared/Models/Job.cs index 6a048bed..2d1f40fc 100644 --- a/Oqtane.Shared/Models/Job.cs +++ b/Oqtane.Shared/Models/Job.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Module.cs b/Oqtane.Shared/Models/Module.cs index e51ffc55..927377a0 100644 --- a/Oqtane.Shared/Models/Module.cs +++ b/Oqtane.Shared/Models/Module.cs @@ -1,8 +1,6 @@ using Oqtane.Shared; using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Enums; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/ModuleDefinition.cs b/Oqtane.Shared/Models/ModuleDefinition.cs index beafe72e..35a27840 100644 --- a/Oqtane.Shared/Models/ModuleDefinition.cs +++ b/Oqtane.Shared/Models/ModuleDefinition.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Notification.cs b/Oqtane.Shared/Models/Notification.cs index f7b192f9..0d804e41 100644 --- a/Oqtane.Shared/Models/Notification.cs +++ b/Oqtane.Shared/Models/Notification.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs index ec1a6d1c..f1268875 100644 --- a/Oqtane.Shared/Models/Page.cs +++ b/Oqtane.Shared/Models/Page.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/PageModule.cs b/Oqtane.Shared/Models/PageModule.cs index 3e9d1f2a..7812861a 100644 --- a/Oqtane.Shared/Models/PageModule.cs +++ b/Oqtane.Shared/Models/PageModule.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Permission.cs b/Oqtane.Shared/Models/Permission.cs index 30ed4bbd..aff910f4 100644 --- a/Oqtane.Shared/Models/Permission.cs +++ b/Oqtane.Shared/Models/Permission.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Profile.cs b/Oqtane.Shared/Models/Profile.cs index e6835f6d..11ecec07 100644 --- a/Oqtane.Shared/Models/Profile.cs +++ b/Oqtane.Shared/Models/Profile.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Role.cs b/Oqtane.Shared/Models/Role.cs index f0c560bd..c9a316b5 100644 --- a/Oqtane.Shared/Models/Role.cs +++ b/Oqtane.Shared/Models/Role.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Setting.cs b/Oqtane.Shared/Models/Setting.cs index a030915c..d7742c84 100644 --- a/Oqtane.Shared/Models/Setting.cs +++ b/Oqtane.Shared/Models/Setting.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs index e785fe17..4b6b7f86 100644 --- a/Oqtane.Shared/Models/Site.cs +++ b/Oqtane.Shared/Models/Site.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/Tenant.cs b/Oqtane.Shared/Models/Tenant.cs index 40135ce6..3f0a518a 100644 --- a/Oqtane.Shared/Models/Tenant.cs +++ b/Oqtane.Shared/Models/Tenant.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/User.cs b/Oqtane.Shared/Models/User.cs index 0c8db2eb..e74deef2 100644 --- a/Oqtane.Shared/Models/User.cs +++ b/Oqtane.Shared/Models/User.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Models/UserRole.cs b/Oqtane.Shared/Models/UserRole.cs index b3771125..556a31a8 100644 --- a/Oqtane.Shared/Models/UserRole.cs +++ b/Oqtane.Shared/Models/UserRole.cs @@ -1,5 +1,4 @@ using System; -using Oqtane.Interfaces; namespace Oqtane.Models { diff --git a/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs b/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs index 8876b097..e51a41fd 100644 --- a/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs +++ b/Oqtane.Shared/Modules/Models/HtmlText/HtmlTextInfo.cs @@ -1,10 +1,9 @@ using System; +using Oqtane.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using Oqtane.Interfaces; -using Oqtane.Models; -namespace Oqtane.Modules.Models.HtmlText +namespace Oqtane.Modules.HtmlText.Models { [Table("HtmlText")] public class HtmlTextInfo : IAuditable diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs index 517a6072..8aa70d3b 100644 --- a/Oqtane.Upgrade/Program.cs +++ b/Oqtane.Upgrade/Program.cs @@ -4,7 +4,7 @@ using System.IO.Compression; using System.Reflection; using System.Threading; -namespace Oqtane +namespace Oqtane.Upgrade { class Program {