Namespace Fix undo (#340)

2020-04-04 20:06:24 +02:00
parent a650f3847d
commit 5af6f7a52d
222 changed files with 150 additions and 335 deletions
--- 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
 {
--- 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<IdentityUser> 
    {
--- 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
--- 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
    {
--- 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
    {
--- 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
--- 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
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
    {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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
 {
--- 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
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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;

--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
--- 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
 {
--- 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
 {