diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0458738..c9f5704 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -3,11 +3,15 @@ true - - - - - + + + + + + + + + @@ -17,7 +21,7 @@ - + @@ -25,6 +29,6 @@ - + \ No newline at end of file diff --git a/src/SecuritySystem.Abstractions/SecurityRule/DomainSecurityRule.cs b/src/SecuritySystem.Abstractions/SecurityRule/DomainSecurityRule.cs index 41adc54..b135b00 100644 --- a/src/SecuritySystem.Abstractions/SecurityRule/DomainSecurityRule.cs +++ b/src/SecuritySystem.Abstractions/SecurityRule/DomainSecurityRule.cs @@ -130,6 +130,10 @@ public NonExpandedRoleGroupSecurityRule(IEnumerable this.Children.Count == 1 + ? this.Children.Single().ToString() + : $"[{this.Children.Join(", ", sr => sr.ToString())}]"; } public record ExpandedRoleGroupSecurityRule(DeepEqualsCollection Children) : RoleBaseSecurityRule @@ -141,6 +145,10 @@ public ExpandedRoleGroupSecurityRule(IEnumerable chil public IEnumerable GetActualChildren() => this.HasDefaultCustoms() ? this.Children : this.Children.Select(c => c.ApplyCustoms(this)); + + public override string ToString() => this.Children.Count == 1 + ? this.Children.Single().ToString() + : $"[{this.Children.Join(", ", sr => sr.ToString())}]"; } public record OperationSecurityRule(SecurityOperation SecurityOperation) : RoleBaseSecurityRule diff --git a/src/SecuritySystem.Abstractions/SecuritySystem.Abstractions.csproj b/src/SecuritySystem.Abstractions/SecuritySystem.Abstractions.csproj index 84f6924..7e22b1e 100644 --- a/src/SecuritySystem.Abstractions/SecuritySystem.Abstractions.csproj +++ b/src/SecuritySystem.Abstractions/SecuritySystem.Abstractions.csproj @@ -7,7 +7,12 @@ + + + + + diff --git a/src/SecuritySystem.Abstractions/ISecurityContext.cs b/src/SecuritySystem.Domain/ISecurityContext.cs similarity index 100% rename from src/SecuritySystem.Abstractions/ISecurityContext.cs rename to src/SecuritySystem.Domain/ISecurityContext.cs diff --git a/src/SecuritySystem.Domain/SecuritySystem.Domain.csproj b/src/SecuritySystem.Domain/SecuritySystem.Domain.csproj new file mode 100644 index 0000000..990b3c1 --- /dev/null +++ b/src/SecuritySystem.Domain/SecuritySystem.Domain.csproj @@ -0,0 +1,8 @@ + + + + IvAt.SecuritySystem.Domain + SecuritySystem + + + diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionBindingInfo.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionBindingInfo.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionBindingInfo.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionBindingInfo.cs diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionBindingInfoSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionBindingInfoSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionBindingInfoSource.cs diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionBindingInfo.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionBindingInfo.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionBindingInfo.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionBindingInfo.cs diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionBindingInfoSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionBindingInfoSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionBindingInfoSource.cs diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionSource.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionSource.cs index 08dd369..428790e 100644 --- a/src/SecuritySystem.GeneralPermission/GeneralPermissionRestrictionSource.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionRestrictionSource.cs @@ -3,7 +3,7 @@ using System.Linq.Expressions; -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.ExpressionEvaluate; using CommonFramework.GenericRepository; diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSource.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSource.cs index f175311..dcb4e8e 100644 --- a/src/SecuritySystem.GeneralPermission/GeneralPermissionSource.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSource.cs @@ -2,7 +2,6 @@ using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; -using CommonFramework.DependencyInjection; using SecuritySystem.ExternalSystem; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionSystem.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystem.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionSystem.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystem.cs index 5a3b77e..7faba4b 100644 --- a/src/SecuritySystem.GeneralPermission/GeneralPermissionSystem.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystem.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; using GenericQueryable; diff --git a/src/SecuritySystem.GeneralPermission/GeneralPermissionSystemFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystemFactory.cs similarity index 92% rename from src/SecuritySystem.GeneralPermission/GeneralPermissionSystemFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystemFactory.cs index 9354220..2a5faae 100644 --- a/src/SecuritySystem.GeneralPermission/GeneralPermissionSystemFactory.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPermissionSystemFactory.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using SecuritySystem.ExternalSystem; diff --git a/src/SecuritySystem.GeneralPermission/GeneralPrincipalManagementService.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPrincipalManagementService.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/GeneralPrincipalManagementService.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPrincipalManagementService.cs index db1920b..37ba20c 100644 --- a/src/SecuritySystem.GeneralPermission/GeneralPrincipalManagementService.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPrincipalManagementService.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using CommonFramework.VisualIdentitySource; diff --git a/src/SecuritySystem.GeneralPermission/GeneralPrincipalSourceService.cs b/src/SecuritySystem.GeneralPermission.Runtime/GeneralPrincipalSourceService.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/GeneralPrincipalSourceService.cs rename to src/SecuritySystem.GeneralPermission.Runtime/GeneralPrincipalSourceService.cs diff --git a/src/SecuritySystem.GeneralPermission/IGeneralPermissionBindingInfoSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/IGeneralPermissionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IGeneralPermissionBindingInfoSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IGeneralPermissionBindingInfoSource.cs diff --git a/src/SecuritySystem.GeneralPermission/IGeneralPermissionRestrictionBindingInfoSource.cs b/src/SecuritySystem.GeneralPermission.Runtime/IGeneralPermissionRestrictionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IGeneralPermissionRestrictionBindingInfoSource.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IGeneralPermissionRestrictionBindingInfoSource.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionLoader.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionLoader.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionRestrictionFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionFilterFactory.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionRestrictionFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionFilterFactory.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionRestrictionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionLoader.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionRestrictionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionLoader.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionRestrictionRawConverter.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionRawConverter.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionRestrictionRawConverter.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionRawConverter.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionRestrictionSecurityContextTypeResolver.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionSecurityContextTypeResolver.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionRestrictionSecurityContextTypeResolver.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionSecurityContextTypeResolver.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionRestrictionTypeFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionTypeFilterFactory.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionRestrictionTypeFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionRestrictionTypeFilterFactory.cs diff --git a/src/SecuritySystem.GeneralPermission/IPermissionSecurityRoleResolver.cs b/src/SecuritySystem.GeneralPermission.Runtime/IPermissionSecurityRoleResolver.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IPermissionSecurityRoleResolver.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IPermissionSecurityRoleResolver.cs diff --git a/src/SecuritySystem.GeneralPermission/IRawPermissionConverter.cs b/src/SecuritySystem.GeneralPermission.Runtime/IRawPermissionConverter.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IRawPermissionConverter.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IRawPermissionConverter.cs diff --git a/src/SecuritySystem.GeneralPermission/IRawPermissionRestrictionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/IRawPermissionRestrictionLoader.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/IRawPermissionRestrictionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/IRawPermissionRestrictionLoader.cs diff --git a/src/SecuritySystem.GeneralPermission/ISecurityContextTypeTypeResolver.cs b/src/SecuritySystem.GeneralPermission.Runtime/ISecurityContextTypeTypeResolver.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/ISecurityContextTypeTypeResolver.cs rename to src/SecuritySystem.GeneralPermission.Runtime/ISecurityContextTypeTypeResolver.cs diff --git a/src/SecuritySystem.GeneralPermission/Initialize/ISecurityContextInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Initialize/ISecurityContextInitializer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityContextInitializer.cs diff --git a/src/SecuritySystem.GeneralPermission/Initialize/ISecurityInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityInitializer.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Initialize/ISecurityInitializer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityInitializer.cs diff --git a/src/SecuritySystem.GeneralPermission/Initialize/ISecurityRoleInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Initialize/ISecurityRoleInitializer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/ISecurityRoleInitializer.cs diff --git a/src/SecuritySystem.GeneralPermission/Initialize/InitializerSettings.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/InitializerSettings.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Initialize/InitializerSettings.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/InitializerSettings.cs diff --git a/src/SecuritySystem.GeneralPermission/Initialize/SecurityContextInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/Initialize/SecurityContextInitializer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs index 9189512..ae34fdf 100644 --- a/src/SecuritySystem.GeneralPermission/Initialize/SecurityContextInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityContextInitializer.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; diff --git a/src/SecuritySystem.GeneralPermission/Initialize/SecurityRoleInitializer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/Initialize/SecurityRoleInitializer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs index ec817bf..ebf3eba 100644 --- a/src/SecuritySystem.GeneralPermission/Initialize/SecurityRoleInitializer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/SecurityRoleInitializer.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; diff --git a/src/SecuritySystem.GeneralPermission/Initialize/UnexpectedSecurityElementMode.cs b/src/SecuritySystem.GeneralPermission.Runtime/Initialize/UnexpectedSecurityElementMode.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Initialize/UnexpectedSecurityElementMode.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Initialize/UnexpectedSecurityElementMode.cs diff --git a/src/SecuritySystem.GeneralPermission/ManagedPrincipalConverter.cs b/src/SecuritySystem.GeneralPermission.Runtime/ManagedPrincipalConverter.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/ManagedPrincipalConverter.cs rename to src/SecuritySystem.GeneralPermission.Runtime/ManagedPrincipalConverter.cs index bd4139e..1c4fe8f 100644 --- a/src/SecuritySystem.GeneralPermission/ManagedPrincipalConverter.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/ManagedPrincipalConverter.cs @@ -1,5 +1,5 @@ using CommonFramework; -using CommonFramework.DependencyInjection; + using SecuritySystem.ExternalSystem.Management; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/PermissionFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionFilterFactory.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/PermissionFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionFilterFactory.cs index 7f4bdbe..1711f26 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionFilterFactory.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionFilterFactory.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/PermissionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionLoader.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/PermissionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionLoader.cs diff --git a/src/SecuritySystem.GeneralPermission/PermissionRestrictionFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionFilterFactory.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/PermissionRestrictionFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionFilterFactory.cs index c372217..9117c3c 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionRestrictionFilterFactory.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionFilterFactory.cs @@ -1,6 +1,5 @@ using CommonFramework; using CommonFramework.IdentitySource; -using CommonFramework.DependencyInjection; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/PermissionRestrictionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionLoader.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/PermissionRestrictionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionLoader.cs index db92fcb..2bb32c7 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionRestrictionLoader.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionLoader.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using GenericQueryable; diff --git a/src/SecuritySystem.GeneralPermission/PermissionRestrictionRawConverter.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionRawConverter.cs similarity index 97% rename from src/SecuritySystem.GeneralPermission/PermissionRestrictionRawConverter.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionRawConverter.cs index a79d53f..d3e43e2 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionRestrictionRawConverter.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionRawConverter.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission/PermissionRestrictionSecurityContextTypeResolver.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionSecurityContextTypeResolver.cs similarity index 97% rename from src/SecuritySystem.GeneralPermission/PermissionRestrictionSecurityContextTypeResolver.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionSecurityContextTypeResolver.cs index d6169c2..6c69f9e 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionRestrictionSecurityContextTypeResolver.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionSecurityContextTypeResolver.cs @@ -1,5 +1,5 @@ using CommonFramework; -using CommonFramework.DependencyInjection; + using SecuritySystem.Services; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission/PermissionRestrictionTypeFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionTypeFilterFactory.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/PermissionRestrictionTypeFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionTypeFilterFactory.cs index 00c0763..2af83fa 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionRestrictionTypeFilterFactory.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionRestrictionTypeFilterFactory.cs @@ -2,8 +2,8 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; + using SecuritySystem.Services; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission/PermissionSecurityRoleFilterFactory.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleFilterFactory.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/PermissionSecurityRoleFilterFactory.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleFilterFactory.cs index f974358..4f42ca9 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionSecurityRoleFilterFactory.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleFilterFactory.cs @@ -1,6 +1,5 @@ using CommonFramework; using CommonFramework.IdentitySource; -using CommonFramework.DependencyInjection; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/PermissionSecurityRoleResolver.cs b/src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleResolver.cs similarity index 97% rename from src/SecuritySystem.GeneralPermission/PermissionSecurityRoleResolver.cs rename to src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleResolver.cs index ff8b353..342ee9e 100644 --- a/src/SecuritySystem.GeneralPermission/PermissionSecurityRoleResolver.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/PermissionSecurityRoleResolver.cs @@ -1,4 +1,5 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; + using SecuritySystem.Services; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission/RawPermissionConverter.cs b/src/SecuritySystem.GeneralPermission.Runtime/RawPermissionConverter.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/RawPermissionConverter.cs rename to src/SecuritySystem.GeneralPermission.Runtime/RawPermissionConverter.cs index 8a44c02..e1ab73c 100644 --- a/src/SecuritySystem.GeneralPermission/RawPermissionConverter.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/RawPermissionConverter.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission/RawPermissionRestrictionLoader.cs b/src/SecuritySystem.GeneralPermission.Runtime/RawPermissionRestrictionLoader.cs similarity index 97% rename from src/SecuritySystem.GeneralPermission/RawPermissionRestrictionLoader.cs rename to src/SecuritySystem.GeneralPermission.Runtime/RawPermissionRestrictionLoader.cs index b097527..abea5a8 100644 --- a/src/SecuritySystem.GeneralPermission/RawPermissionRestrictionLoader.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/RawPermissionRestrictionLoader.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; namespace SecuritySystem.GeneralPermission; diff --git a/src/SecuritySystem.GeneralPermission.Runtime/SecuritySystem.GeneralPermission.Runtime.csproj b/src/SecuritySystem.GeneralPermission.Runtime/SecuritySystem.GeneralPermission.Runtime.csproj new file mode 100644 index 0000000..9513a71 --- /dev/null +++ b/src/SecuritySystem.GeneralPermission.Runtime/SecuritySystem.GeneralPermission.Runtime.csproj @@ -0,0 +1,16 @@ + + + + IvAt.SecuritySystem.GeneralPermission.Runtime + SecuritySystem.GeneralPermission + + + + + + + + + + + diff --git a/src/SecuritySystem.GeneralPermission/Validation/DisplayPermissionService.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/DisplayPermissionService.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/Validation/DisplayPermissionService.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/DisplayPermissionService.cs index b529ab4..2512d24 100644 --- a/src/SecuritySystem.GeneralPermission/Validation/DisplayPermissionService.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Validation/DisplayPermissionService.cs @@ -1,6 +1,6 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.VisualIdentitySource; + using SecuritySystem.ExternalSystem.Management; using SecuritySystem.ExternalSystem.SecurityContextStorage; using SecuritySystem.Services; diff --git a/src/SecuritySystem.GeneralPermission/Validation/IDisplayPermissionService.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/IDisplayPermissionService.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/IDisplayPermissionService.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/IDisplayPermissionService.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/IPermissionEqualityComparer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/IPermissionEqualityComparer.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/IPermissionEqualityComparer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/IPermissionEqualityComparer.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Permission/IPermissionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/IPermissionValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Permission/IPermissionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/IPermissionValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Permission/PermissionRequiredContextValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/PermissionRequiredContextValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Permission/PermissionRequiredContextValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/PermissionRequiredContextValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Permission/PermissionRootValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/PermissionRootValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Permission/PermissionRootValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Permission/PermissionRootValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionDataComparer.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionDataComparer.cs similarity index 99% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionDataComparer.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionDataComparer.cs index 8fc18a5..416499f 100644 --- a/src/SecuritySystem.GeneralPermission/Validation/PermissionDataComparer.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionDataComparer.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; using SecuritySystem.ExternalSystem.Management; diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs index d6ea09e..9bbd277 100644 --- a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedFilterPermissionRestrictionValidator.cs @@ -1,6 +1,6 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; + using SecuritySystem.Validation; namespace SecuritySystem.GeneralPermission.Validation.PermissionRestriction; diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs index 7362b38..41e5d14 100644 --- a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/AllowedTypePermissionRestrictionValidator.cs @@ -1,4 +1,5 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; + using SecuritySystem.Validation; namespace SecuritySystem.GeneralPermission.Validation.PermissionRestriction; diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs similarity index 98% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs index 2fbb261..c4b33b7 100644 --- a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs +++ b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/ExistsPermissionRestrictionValidator.cs @@ -1,4 +1,5 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; + using SecuritySystem.ExternalSystem.SecurityContextStorage; using SecuritySystem.Validation; diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/IPermissionRestrictionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/IPermissionRestrictionValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/IPermissionRestrictionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/IPermissionRestrictionValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/PermissionRestrictionRootValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/PermissionRestrictionRootValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/PermissionRestriction/PermissionRestrictionRootValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/PermissionRestriction/PermissionRestrictionRootValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Principal/IPrincipalValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/IPrincipalValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Principal/IPrincipalValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/IPrincipalValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Principal/PrincipalRootValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/PrincipalRootValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Principal/PrincipalRootValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/PrincipalRootValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/Validation/Principal/PrincipalUniquePermissionValidator.cs b/src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/PrincipalUniquePermissionValidator.cs similarity index 100% rename from src/SecuritySystem.GeneralPermission/Validation/Principal/PrincipalUniquePermissionValidator.cs rename to src/SecuritySystem.GeneralPermission.Runtime/Validation/Principal/PrincipalUniquePermissionValidator.cs diff --git a/src/SecuritySystem.GeneralPermission/SecuritySystem.GeneralPermission.csproj b/src/SecuritySystem.GeneralPermission/SecuritySystem.GeneralPermission.csproj index 8580cc1..d466d36 100644 --- a/src/SecuritySystem.GeneralPermission/SecuritySystem.GeneralPermission.csproj +++ b/src/SecuritySystem.GeneralPermission/SecuritySystem.GeneralPermission.csproj @@ -5,10 +5,7 @@ - - - - + diff --git a/src/SecuritySystem/AccessDenied/AccessDeniedExceptionService.cs b/src/SecuritySystem.Runtime/AccessDenied/AccessDeniedExceptionService.cs similarity index 100% rename from src/SecuritySystem/AccessDenied/AccessDeniedExceptionService.cs rename to src/SecuritySystem.Runtime/AccessDenied/AccessDeniedExceptionService.cs diff --git a/src/SecuritySystem/AvailableSecurity/AvailableClientSecurityRuleSource.cs b/src/SecuritySystem.Runtime/AvailableSecurity/AvailableClientSecurityRuleSource.cs similarity index 100% rename from src/SecuritySystem/AvailableSecurity/AvailableClientSecurityRuleSource.cs rename to src/SecuritySystem.Runtime/AvailableSecurity/AvailableClientSecurityRuleSource.cs diff --git a/src/SecuritySystem/AvailableSecurity/AvailableSecurityOperationSource.cs b/src/SecuritySystem.Runtime/AvailableSecurity/AvailableSecurityOperationSource.cs similarity index 100% rename from src/SecuritySystem/AvailableSecurity/AvailableSecurityOperationSource.cs rename to src/SecuritySystem.Runtime/AvailableSecurity/AvailableSecurityOperationSource.cs diff --git a/src/SecuritySystem/AvailableSecurity/AvailableSecurityRoleSource.cs b/src/SecuritySystem.Runtime/AvailableSecurity/AvailableSecurityRoleSource.cs similarity index 100% rename from src/SecuritySystem/AvailableSecurity/AvailableSecurityRoleSource.cs rename to src/SecuritySystem.Runtime/AvailableSecurity/AvailableSecurityRoleSource.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/AccessorsFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AccessorsFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/AccessorsFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AccessorsFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs similarity index 99% rename from src/SecuritySystem/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs index fd3f306..3f7b13f 100644 --- a/src/SecuritySystem/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs +++ b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AccessorsFilterBuilderFactory.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.ExpressionEvaluate; using CommonFramework.IdentitySource; diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/AndFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AndFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/AndFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/AndFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/BinaryFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/BinaryFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/BinaryFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/BinaryFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/ByIdentsFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ByIdentsFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/ByIdentsFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ByIdentsFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/ConditionFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ConditionFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/ConditionFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ConditionFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/ManyContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ManyContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/ManyContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/ManyContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/NestedManyFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/NestedManyFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/NestedManyFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/NestedManyFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/OrFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/OrFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/OrFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/OrFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/AccessorsBuilder/SingleContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/AccessorsBuilder/SingleContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/AccessorsBuilder/SingleContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/AccessorsBuilder/SingleContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/CacheContainsCallVisitor.cs b/src/SecuritySystem.Runtime/Builders/CacheContainsCallVisitor.cs similarity index 100% rename from src/SecuritySystem/Builders/CacheContainsCallVisitor.cs rename to src/SecuritySystem.Runtime/Builders/CacheContainsCallVisitor.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/AndFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/AndFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/AndFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/AndFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/BinaryFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/BinaryFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/BinaryFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/BinaryFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/ByIdentsFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ByIdentsFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/ByIdentsFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ByIdentsFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/ConditionFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ConditionFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/ConditionFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ConditionFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/ManyContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ManyContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/ManyContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/ManyContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/NestedManyFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/NestedManyFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/NestedManyFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/NestedManyFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/OrFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/OrFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/OrFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/OrFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/SecurityFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SecurityFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/SecurityFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SecurityFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/SecurityFilterBuilderFactory.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SecurityFilterBuilderFactory.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/SecurityFilterBuilderFactory.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SecurityFilterBuilderFactory.cs diff --git a/src/SecuritySystem/Builders/MaterializedBuilder/SingleContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SingleContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/MaterializedBuilder/SingleContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/MaterializedBuilder/SingleContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/MixedBuilder/SecurityExpressionBuilderFactory.cs b/src/SecuritySystem.Runtime/Builders/MixedBuilder/SecurityExpressionBuilderFactory.cs similarity index 100% rename from src/SecuritySystem/Builders/MixedBuilder/SecurityExpressionBuilderFactory.cs rename to src/SecuritySystem.Runtime/Builders/MixedBuilder/SecurityExpressionBuilderFactory.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/AndFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/AndFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/AndFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/AndFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/BinaryFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/BinaryFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/BinaryFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/BinaryFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/ConditionFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/ConditionFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/ConditionFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/ConditionFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/ManyContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/ManyContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/ManyContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/ManyContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/NestedManyFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/NestedManyFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/NestedManyFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/NestedManyFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/OrFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/OrFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/OrFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/OrFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/SecurityFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/SecurityFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/SecurityFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/SecurityFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs similarity index 99% rename from src/SecuritySystem/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs index d05e406..800bbf5 100644 --- a/src/SecuritySystem/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs +++ b/src/SecuritySystem.Runtime/Builders/QueryBuilder/SecurityFilterBuilderFactory.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.ExpressionEvaluate; using CommonFramework.IdentitySource; diff --git a/src/SecuritySystem/Builders/QueryBuilder/SingleContextFilterBuilder.cs b/src/SecuritySystem.Runtime/Builders/QueryBuilder/SingleContextFilterBuilder.cs similarity index 100% rename from src/SecuritySystem/Builders/QueryBuilder/SingleContextFilterBuilder.cs rename to src/SecuritySystem.Runtime/Builders/QueryBuilder/SingleContextFilterBuilder.cs diff --git a/src/SecuritySystem/Builders/_Factory/FilterBuilderFactoryBase.cs b/src/SecuritySystem.Runtime/Builders/_Factory/FilterBuilderFactoryBase.cs similarity index 100% rename from src/SecuritySystem/Builders/_Factory/FilterBuilderFactoryBase.cs rename to src/SecuritySystem.Runtime/Builders/_Factory/FilterBuilderFactoryBase.cs diff --git a/src/SecuritySystem/Builders/_Factory/IAccessorsFilterFactory.cs b/src/SecuritySystem.Runtime/Builders/_Factory/IAccessorsFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Builders/_Factory/IAccessorsFilterFactory.cs rename to src/SecuritySystem.Runtime/Builders/_Factory/IAccessorsFilterFactory.cs diff --git a/src/SecuritySystem/Builders/_Factory/IFilterFactory.cs b/src/SecuritySystem.Runtime/Builders/_Factory/IFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Builders/_Factory/IFilterFactory.cs rename to src/SecuritySystem.Runtime/Builders/_Factory/IFilterFactory.cs diff --git a/src/SecuritySystem/Builders/_Factory/ISecurityFilterFactory.cs b/src/SecuritySystem.Runtime/Builders/_Factory/ISecurityFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Builders/_Factory/ISecurityFilterFactory.cs rename to src/SecuritySystem.Runtime/Builders/_Factory/ISecurityFilterFactory.cs diff --git a/src/SecuritySystem/Builders/_Filter/AccessorsFilterInfo.cs b/src/SecuritySystem.Runtime/Builders/_Filter/AccessorsFilterInfo.cs similarity index 100% rename from src/SecuritySystem/Builders/_Filter/AccessorsFilterInfo.cs rename to src/SecuritySystem.Runtime/Builders/_Filter/AccessorsFilterInfo.cs diff --git a/src/SecuritySystem/Builders/_Filter/SecurityFilterInfo.cs b/src/SecuritySystem.Runtime/Builders/_Filter/SecurityFilterInfo.cs similarity index 100% rename from src/SecuritySystem/Builders/_Filter/SecurityFilterInfo.cs rename to src/SecuritySystem.Runtime/Builders/_Filter/SecurityFilterInfo.cs diff --git a/src/SecuritySystem/Credential/UserNameResolver.cs b/src/SecuritySystem.Runtime/Credential/UserNameResolver.cs similarity index 100% rename from src/SecuritySystem/Credential/UserNameResolver.cs rename to src/SecuritySystem.Runtime/Credential/UserNameResolver.cs diff --git a/src/SecuritySystem/CurrentUser.cs b/src/SecuritySystem.Runtime/CurrentUser.cs similarity index 100% rename from src/SecuritySystem/CurrentUser.cs rename to src/SecuritySystem.Runtime/CurrentUser.cs diff --git a/src/SecuritySystem/DomainServices/ContextDomainSecurityService.cs b/src/SecuritySystem.Runtime/DomainServices/ContextDomainSecurityService.cs similarity index 100% rename from src/SecuritySystem/DomainServices/ContextDomainSecurityService.cs rename to src/SecuritySystem.Runtime/DomainServices/ContextDomainSecurityService.cs diff --git a/src/SecuritySystem/DomainServices/DependencySecurity/DependencyDomainSecurityService.cs b/src/SecuritySystem.Runtime/DomainServices/DependencySecurity/DependencyDomainSecurityService.cs similarity index 100% rename from src/SecuritySystem/DomainServices/DependencySecurity/DependencyDomainSecurityService.cs rename to src/SecuritySystem.Runtime/DomainServices/DependencySecurity/DependencyDomainSecurityService.cs diff --git a/src/SecuritySystem/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs b/src/SecuritySystem.Runtime/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs similarity index 96% rename from src/SecuritySystem/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs rename to src/SecuritySystem.Runtime/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs index 80b2a1f..46c58ae 100644 --- a/src/SecuritySystem/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs +++ b/src/SecuritySystem.Runtime/DomainServices/DependencySecurity/UntypedDependencyDomainSecurityService.cs @@ -1,5 +1,6 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.IdentitySource; + using SecuritySystem.DomainServices.DependencySecurity._Base; using SecuritySystem.Expanders; diff --git a/src/SecuritySystem/DomainServices/DependencySecurity/_Base/DependencyDomainSecurityServiceBase.cs b/src/SecuritySystem.Runtime/DomainServices/DependencySecurity/_Base/DependencyDomainSecurityServiceBase.cs similarity index 100% rename from src/SecuritySystem/DomainServices/DependencySecurity/_Base/DependencyDomainSecurityServiceBase.cs rename to src/SecuritySystem.Runtime/DomainServices/DependencySecurity/_Base/DependencyDomainSecurityServiceBase.cs diff --git a/src/SecuritySystem/DomainServices/DomainSecurityService.cs b/src/SecuritySystem.Runtime/DomainServices/DomainSecurityService.cs similarity index 100% rename from src/SecuritySystem/DomainServices/DomainSecurityService.cs rename to src/SecuritySystem.Runtime/DomainServices/DomainSecurityService.cs diff --git a/src/SecuritySystem/DomainServices/DomainSecurityServiceBase.cs b/src/SecuritySystem.Runtime/DomainServices/DomainSecurityServiceBase.cs similarity index 100% rename from src/SecuritySystem/DomainServices/DomainSecurityServiceBase.cs rename to src/SecuritySystem.Runtime/DomainServices/DomainSecurityServiceBase.cs diff --git a/src/SecuritySystem/Expanders/ClientSecurityRuleExpander.cs b/src/SecuritySystem.Runtime/Expanders/ClientSecurityRuleExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/ClientSecurityRuleExpander.cs rename to src/SecuritySystem.Runtime/Expanders/ClientSecurityRuleExpander.cs diff --git a/src/SecuritySystem/Expanders/ExpandedRoleGroupSecurityRuleSetOptimizer.cs b/src/SecuritySystem.Runtime/Expanders/ExpandedRoleGroupSecurityRuleSetOptimizer.cs similarity index 100% rename from src/SecuritySystem/Expanders/ExpandedRoleGroupSecurityRuleSetOptimizer.cs rename to src/SecuritySystem.Runtime/Expanders/ExpandedRoleGroupSecurityRuleSetOptimizer.cs diff --git a/src/SecuritySystem/Expanders/IExpandedRoleGroupSecurityRuleSetOptimizer.cs b/src/SecuritySystem.Runtime/Expanders/IExpandedRoleGroupSecurityRuleSetOptimizer.cs similarity index 100% rename from src/SecuritySystem/Expanders/IExpandedRoleGroupSecurityRuleSetOptimizer.cs rename to src/SecuritySystem.Runtime/Expanders/IExpandedRoleGroupSecurityRuleSetOptimizer.cs diff --git a/src/SecuritySystem/Expanders/RoleFactorySecurityRuleExpander.cs b/src/SecuritySystem.Runtime/Expanders/RoleFactorySecurityRuleExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/RoleFactorySecurityRuleExpander.cs rename to src/SecuritySystem.Runtime/Expanders/RoleFactorySecurityRuleExpander.cs diff --git a/src/SecuritySystem/Expanders/RootSecurityRuleExpande.cs b/src/SecuritySystem.Runtime/Expanders/RootSecurityRuleExpande.cs similarity index 100% rename from src/SecuritySystem/Expanders/RootSecurityRuleExpande.cs rename to src/SecuritySystem.Runtime/Expanders/RootSecurityRuleExpande.cs diff --git a/src/SecuritySystem/Expanders/SecurityModeExpander.cs b/src/SecuritySystem.Runtime/Expanders/SecurityModeExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/SecurityModeExpander.cs rename to src/SecuritySystem.Runtime/Expanders/SecurityModeExpander.cs diff --git a/src/SecuritySystem/Expanders/SecurityOperationExpander.cs b/src/SecuritySystem.Runtime/Expanders/SecurityOperationExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/SecurityOperationExpander.cs rename to src/SecuritySystem.Runtime/Expanders/SecurityOperationExpander.cs diff --git a/src/SecuritySystem/Expanders/SecurityRoleExpander.cs b/src/SecuritySystem.Runtime/Expanders/SecurityRoleExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/SecurityRoleExpander.cs rename to src/SecuritySystem.Runtime/Expanders/SecurityRoleExpander.cs diff --git a/src/SecuritySystem/Expanders/SecurityRuleHeaderExpander.cs b/src/SecuritySystem.Runtime/Expanders/SecurityRuleHeaderExpander.cs similarity index 100% rename from src/SecuritySystem/Expanders/SecurityRuleHeaderExpander.cs rename to src/SecuritySystem.Runtime/Expanders/SecurityRuleHeaderExpander.cs diff --git a/src/SecuritySystem/ExternalSystem/EmptyPermissionSource.cs b/src/SecuritySystem.Runtime/ExternalSystem/EmptyPermissionSource.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/EmptyPermissionSource.cs rename to src/SecuritySystem.Runtime/ExternalSystem/EmptyPermissionSource.cs diff --git a/src/SecuritySystem/ExternalSystem/IPermissionRestrictionSource.cs b/src/SecuritySystem.Runtime/ExternalSystem/IPermissionRestrictionSource.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/IPermissionRestrictionSource.cs rename to src/SecuritySystem.Runtime/ExternalSystem/IPermissionRestrictionSource.cs diff --git a/src/SecuritySystem/ExternalSystem/IPermissionSource.cs b/src/SecuritySystem.Runtime/ExternalSystem/IPermissionSource.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/IPermissionSource.cs rename to src/SecuritySystem.Runtime/ExternalSystem/IPermissionSource.cs diff --git a/src/SecuritySystem/ExternalSystem/IPermissionSystem.cs b/src/SecuritySystem.Runtime/ExternalSystem/IPermissionSystem.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/IPermissionSystem.cs rename to src/SecuritySystem.Runtime/ExternalSystem/IPermissionSystem.cs diff --git a/src/SecuritySystem/ExternalSystem/IPermissionSystemFactory.cs b/src/SecuritySystem.Runtime/ExternalSystem/IPermissionSystemFactory.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/IPermissionSystemFactory.cs rename to src/SecuritySystem.Runtime/ExternalSystem/IPermissionSystemFactory.cs diff --git a/src/SecuritySystem/ExternalSystem/Management/RootPrincipalSourceService.cs b/src/SecuritySystem.Runtime/ExternalSystem/Management/RootPrincipalSourceService.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/Management/RootPrincipalSourceService.cs rename to src/SecuritySystem.Runtime/ExternalSystem/Management/RootPrincipalSourceService.cs diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/HierarchicalTypedSecurityContextStorage.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/HierarchicalTypedSecurityContextStorage.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/HierarchicalTypedSecurityContextStorage.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/HierarchicalTypedSecurityContextStorage.cs diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/LocalStorage.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/LocalStorage.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/LocalStorage.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/LocalStorage.cs diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/PlainTypedSecurityContextStorage.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/PlainTypedSecurityContextStorage.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/PlainTypedSecurityContextStorage.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/PlainTypedSecurityContextStorage.cs diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs similarity index 98% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs index 3b8761f..a32bf74 100644 --- a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs +++ b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/SecurityContextStorage.cs @@ -1,5 +1,4 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.DictionaryCache; using CommonFramework.IdentitySource; diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageBase.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageBase.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageBase.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageBase.cs diff --git a/src/SecuritySystem/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageExtensions.cs b/src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageExtensions.cs similarity index 100% rename from src/SecuritySystem/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageExtensions.cs rename to src/SecuritySystem.Runtime/ExternalSystem/SecurityContextStorage/TypedSecurityContextStorageExtensions.cs diff --git a/src/SecuritySystem/PermissionBindingInfo.cs b/src/SecuritySystem.Runtime/PermissionBindingInfo.cs similarity index 100% rename from src/SecuritySystem/PermissionBindingInfo.cs rename to src/SecuritySystem.Runtime/PermissionBindingInfo.cs diff --git a/src/SecuritySystem/PermissionOptimization/IRuntimePermissionOptimizationService.cs b/src/SecuritySystem.Runtime/PermissionOptimization/IRuntimePermissionOptimizationService.cs similarity index 100% rename from src/SecuritySystem/PermissionOptimization/IRuntimePermissionOptimizationService.cs rename to src/SecuritySystem.Runtime/PermissionOptimization/IRuntimePermissionOptimizationService.cs diff --git a/src/SecuritySystem/PermissionOptimization/LegacyRuntimePermissionOptimizationService.cs b/src/SecuritySystem.Runtime/PermissionOptimization/LegacyRuntimePermissionOptimizationService.cs similarity index 100% rename from src/SecuritySystem/PermissionOptimization/LegacyRuntimePermissionOptimizationService.cs rename to src/SecuritySystem.Runtime/PermissionOptimization/LegacyRuntimePermissionOptimizationService.cs diff --git a/src/SecuritySystem/PermissionOptimization/RuntimePermissionOptimizationService.cs b/src/SecuritySystem.Runtime/PermissionOptimization/RuntimePermissionOptimizationService.cs similarity index 100% rename from src/SecuritySystem/PermissionOptimization/RuntimePermissionOptimizationService.cs rename to src/SecuritySystem.Runtime/PermissionOptimization/RuntimePermissionOptimizationService.cs diff --git a/src/SecuritySystem/Providers/DependencySecurity/DependencySecurityProvider.cs b/src/SecuritySystem.Runtime/Providers/DependencySecurity/DependencySecurityProvider.cs similarity index 100% rename from src/SecuritySystem/Providers/DependencySecurity/DependencySecurityProvider.cs rename to src/SecuritySystem.Runtime/Providers/DependencySecurity/DependencySecurityProvider.cs diff --git a/src/SecuritySystem/Providers/DependencySecurity/UntypedDependencySecurityProvider.cs b/src/SecuritySystem.Runtime/Providers/DependencySecurity/UntypedDependencySecurityProvider.cs similarity index 100% rename from src/SecuritySystem/Providers/DependencySecurity/UntypedDependencySecurityProvider.cs rename to src/SecuritySystem.Runtime/Providers/DependencySecurity/UntypedDependencySecurityProvider.cs diff --git a/src/SecuritySystem/Providers/RoleBaseSecurityPathProvider.cs b/src/SecuritySystem.Runtime/Providers/RoleBaseSecurityPathProvider.cs similarity index 100% rename from src/SecuritySystem/Providers/RoleBaseSecurityPathProvider.cs rename to src/SecuritySystem.Runtime/Providers/RoleBaseSecurityPathProvider.cs diff --git a/src/SecuritySystem/Providers/SecurityProvider.cs b/src/SecuritySystem.Runtime/Providers/SecurityProvider.cs similarity index 100% rename from src/SecuritySystem/Providers/SecurityProvider.cs rename to src/SecuritySystem.Runtime/Providers/SecurityProvider.cs diff --git a/src/SecuritySystem/RawCurrentUser.cs b/src/SecuritySystem.Runtime/RawCurrentUser.cs similarity index 100% rename from src/SecuritySystem/RawCurrentUser.cs rename to src/SecuritySystem.Runtime/RawCurrentUser.cs diff --git a/src/SecuritySystem/SecurityAccessor/FakeSecurityAccessorInfinityStorage.cs b/src/SecuritySystem.Runtime/SecurityAccessor/FakeSecurityAccessorInfinityStorage.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/FakeSecurityAccessorInfinityStorage.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/FakeSecurityAccessorInfinityStorage.cs diff --git a/src/SecuritySystem/SecurityAccessor/ISecurityAccessorDataOptimizer.cs b/src/SecuritySystem.Runtime/SecurityAccessor/ISecurityAccessorDataOptimizer.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/ISecurityAccessorDataOptimizer.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/ISecurityAccessorDataOptimizer.cs diff --git a/src/SecuritySystem/SecurityAccessor/ISecurityAccessorInfinityStorage.cs b/src/SecuritySystem.Runtime/SecurityAccessor/ISecurityAccessorInfinityStorage.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/ISecurityAccessorInfinityStorage.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/ISecurityAccessorInfinityStorage.cs diff --git a/src/SecuritySystem/SecurityAccessor/RawSecurityAccessorResolver.cs b/src/SecuritySystem.Runtime/SecurityAccessor/RawSecurityAccessorResolver.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/RawSecurityAccessorResolver.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/RawSecurityAccessorResolver.cs diff --git a/src/SecuritySystem/SecurityAccessor/RootSecurityAccessorResolver.cs b/src/SecuritySystem.Runtime/SecurityAccessor/RootSecurityAccessorResolver.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/RootSecurityAccessorResolver.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/RootSecurityAccessorResolver.cs diff --git a/src/SecuritySystem/SecurityAccessor/SecurityAccessorDataOptimizer.cs b/src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorDataOptimizer.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/SecurityAccessorDataOptimizer.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorDataOptimizer.cs diff --git a/src/SecuritySystem/SecurityAccessor/SecurityAccessorDataVisitor.cs b/src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorDataVisitor.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/SecurityAccessorDataVisitor.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorDataVisitor.cs diff --git a/src/SecuritySystem/SecurityAccessor/SecurityAccessorInfinityStorage.cs b/src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorInfinityStorage.cs similarity index 100% rename from src/SecuritySystem/SecurityAccessor/SecurityAccessorInfinityStorage.cs rename to src/SecuritySystem.Runtime/SecurityAccessor/SecurityAccessorInfinityStorage.cs diff --git a/src/SecuritySystem/SecurityContextInfo/SecurityContextInfoSource.cs b/src/SecuritySystem.Runtime/SecurityContextInfo/SecurityContextInfoSource.cs similarity index 98% rename from src/SecuritySystem/SecurityContextInfo/SecurityContextInfoSource.cs rename to src/SecuritySystem.Runtime/SecurityContextInfo/SecurityContextInfoSource.cs index 46b4d84..f93b384 100644 --- a/src/SecuritySystem/SecurityContextInfo/SecurityContextInfoSource.cs +++ b/src/SecuritySystem.Runtime/SecurityContextInfo/SecurityContextInfoSource.cs @@ -1,8 +1,7 @@ using SecuritySystem.Services; using System.Collections.Concurrent; - -using CommonFramework.DependencyInjection; +using CommonFramework; // ReSharper disable once CheckNamespace namespace SecuritySystem; diff --git a/src/SecuritySystem/SecurityContextInfo/SecurityContextSource.cs b/src/SecuritySystem.Runtime/SecurityContextInfo/SecurityContextSource.cs similarity index 100% rename from src/SecuritySystem/SecurityContextInfo/SecurityContextSource.cs rename to src/SecuritySystem.Runtime/SecurityContextInfo/SecurityContextSource.cs diff --git a/src/SecuritySystem/SecurityOperation/SecurityOperationInfoSource.cs b/src/SecuritySystem.Runtime/SecurityOperation/SecurityOperationInfoSource.cs similarity index 100% rename from src/SecuritySystem/SecurityOperation/SecurityOperationInfoSource.cs rename to src/SecuritySystem.Runtime/SecurityOperation/SecurityOperationInfoSource.cs diff --git a/src/SecuritySystem/SecurityPath/IContextSecurityPath.cs b/src/SecuritySystem.Runtime/SecurityPath/IContextSecurityPath.cs similarity index 100% rename from src/SecuritySystem/SecurityPath/IContextSecurityPath.cs rename to src/SecuritySystem.Runtime/SecurityPath/IContextSecurityPath.cs diff --git a/src/SecuritySystem/SecurityPath/ISecurityPathRestrictionService.cs b/src/SecuritySystem.Runtime/SecurityPath/ISecurityPathRestrictionService.cs similarity index 100% rename from src/SecuritySystem/SecurityPath/ISecurityPathRestrictionService.cs rename to src/SecuritySystem.Runtime/SecurityPath/ISecurityPathRestrictionService.cs diff --git a/src/SecuritySystem/SecurityPath/RelativeConditionFactory.cs b/src/SecuritySystem.Runtime/SecurityPath/RelativeConditionFactory.cs similarity index 100% rename from src/SecuritySystem/SecurityPath/RelativeConditionFactory.cs rename to src/SecuritySystem.Runtime/SecurityPath/RelativeConditionFactory.cs diff --git a/src/SecuritySystem/SecurityPath/SecurityPath.cs b/src/SecuritySystem.Runtime/SecurityPath/SecurityPath.cs similarity index 100% rename from src/SecuritySystem/SecurityPath/SecurityPath.cs rename to src/SecuritySystem.Runtime/SecurityPath/SecurityPath.cs diff --git a/src/SecuritySystem/SecurityPath/SecurityPathRestrictionService.cs b/src/SecuritySystem.Runtime/SecurityPath/SecurityPathRestrictionService.cs similarity index 99% rename from src/SecuritySystem/SecurityPath/SecurityPathRestrictionService.cs rename to src/SecuritySystem.Runtime/SecurityPath/SecurityPathRestrictionService.cs index 1c927fc..da432bf 100644 --- a/src/SecuritySystem/SecurityPath/SecurityPathRestrictionService.cs +++ b/src/SecuritySystem.Runtime/SecurityPath/SecurityPathRestrictionService.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; // ReSharper disable once CheckNamespace namespace SecuritySystem; diff --git a/src/SecuritySystem/SecurityRole/SecurityRoleSource.cs b/src/SecuritySystem.Runtime/SecurityRole/SecurityRoleSource.cs similarity index 97% rename from src/SecuritySystem/SecurityRole/SecurityRoleSource.cs rename to src/SecuritySystem.Runtime/SecurityRole/SecurityRoleSource.cs index d55cdf0..7c7b96b 100644 --- a/src/SecuritySystem/SecurityRole/SecurityRoleSource.cs +++ b/src/SecuritySystem.Runtime/SecurityRole/SecurityRoleSource.cs @@ -1,9 +1,8 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using SecuritySystem.Services; using System.Collections.Concurrent; - // ReSharper disable once CheckNamespace namespace SecuritySystem; diff --git a/src/SecuritySystem/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs similarity index 90% rename from src/SecuritySystem/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs index 26810b6..9375a0b 100644 --- a/src/SecuritySystem/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs +++ b/src/SecuritySystem.Runtime/SecurityRuleInfo/ClientDomainModeSecurityRuleSource.cs @@ -1,6 +1,4 @@ - - -namespace SecuritySystem.SecurityRuleInfo; +namespace SecuritySystem.SecurityRuleInfo; public class ClientDomainModeSecurityRuleSource(IEnumerable domainModeSecurityRuleInfoList) : IClientDomainModeSecurityRuleSource diff --git a/src/SecuritySystem/SecurityRuleInfo/ClientSecurityRuleNameExtractor.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/ClientSecurityRuleNameExtractor.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/ClientSecurityRuleNameExtractor.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/ClientSecurityRuleNameExtractor.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/ClientSecurityRuleResolver.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/ClientSecurityRuleResolver.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/ClientSecurityRuleResolver.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/ClientSecurityRuleResolver.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/DomainModeClientSecurityRuleInfoSource.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/DomainModeClientSecurityRuleInfoSource.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/DomainModeClientSecurityRuleInfoSource.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/DomainModeClientSecurityRuleInfoSource.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/DomainModeSecurityRuleResolver.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/DomainModeSecurityRuleResolver.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/DomainModeSecurityRuleResolver.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/DomainModeSecurityRuleResolver.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/DomainSecurityRoleExtractor.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/DomainSecurityRoleExtractor.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/DomainSecurityRoleExtractor.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/DomainSecurityRoleExtractor.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/RootClientSecurityRuleInfoSource.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/RootClientSecurityRuleInfoSource.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/RootClientSecurityRuleInfoSource.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/RootClientSecurityRuleInfoSource.cs diff --git a/src/SecuritySystem/SecurityRuleInfo/SourceTypeClientSecurityRuleInfoSource.cs b/src/SecuritySystem.Runtime/SecurityRuleInfo/SourceTypeClientSecurityRuleInfoSource.cs similarity index 100% rename from src/SecuritySystem/SecurityRuleInfo/SourceTypeClientSecurityRuleInfoSource.cs rename to src/SecuritySystem.Runtime/SecurityRuleInfo/SourceTypeClientSecurityRuleInfoSource.cs diff --git a/src/SecuritySystem.Runtime/SecuritySystem.Runtime.csproj b/src/SecuritySystem.Runtime/SecuritySystem.Runtime.csproj new file mode 100644 index 0000000..7945d54 --- /dev/null +++ b/src/SecuritySystem.Runtime/SecuritySystem.Runtime.csproj @@ -0,0 +1,21 @@ + + + + IvAt.SecuritySystem.Runtime + SecuritySystem + + + + + + + + + + + + + + + + diff --git a/src/SecuritySystem/SecuritySystem/SecuritySystem.cs b/src/SecuritySystem.Runtime/SecuritySystem/SecuritySystem.cs similarity index 100% rename from src/SecuritySystem/SecuritySystem/SecuritySystem.cs rename to src/SecuritySystem.Runtime/SecuritySystem/SecuritySystem.cs diff --git a/src/SecuritySystem/SecuritySystem/SecuritySystemFactory.cs b/src/SecuritySystem.Runtime/SecuritySystem/SecuritySystemFactory.cs similarity index 100% rename from src/SecuritySystem/SecuritySystem/SecuritySystemFactory.cs rename to src/SecuritySystem.Runtime/SecuritySystem/SecuritySystemFactory.cs diff --git a/src/SecuritySystem/Services/AvailablePermissionFilterFactory.cs b/src/SecuritySystem.Runtime/Services/AvailablePermissionFilterFactory.cs similarity index 98% rename from src/SecuritySystem/Services/AvailablePermissionFilterFactory.cs rename to src/SecuritySystem.Runtime/Services/AvailablePermissionFilterFactory.cs index 8c89761..aa32c11 100644 --- a/src/SecuritySystem/Services/AvailablePermissionFilterFactory.cs +++ b/src/SecuritySystem.Runtime/Services/AvailablePermissionFilterFactory.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.VisualIdentitySource; using SecuritySystem.Credential; diff --git a/src/SecuritySystem/Services/AvailablePermissionSource.cs b/src/SecuritySystem.Runtime/Services/AvailablePermissionSource.cs similarity index 100% rename from src/SecuritySystem/Services/AvailablePermissionSource.cs rename to src/SecuritySystem.Runtime/Services/AvailablePermissionSource.cs diff --git a/src/SecuritySystem/Services/AvailablePrincipalSource.cs b/src/SecuritySystem.Runtime/Services/AvailablePrincipalSource.cs similarity index 96% rename from src/SecuritySystem/Services/AvailablePrincipalSource.cs rename to src/SecuritySystem.Runtime/Services/AvailablePrincipalSource.cs index 7fff0f3..ad798e4 100644 --- a/src/SecuritySystem/Services/AvailablePrincipalSource.cs +++ b/src/SecuritySystem.Runtime/Services/AvailablePrincipalSource.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/DefaultUserConverter.cs b/src/SecuritySystem.Runtime/Services/DefaultUserConverter.cs similarity index 98% rename from src/SecuritySystem/Services/DefaultUserConverter.cs rename to src/SecuritySystem.Runtime/Services/DefaultUserConverter.cs index 65d7886..dd83a31 100644 --- a/src/SecuritySystem/Services/DefaultUserConverter.cs +++ b/src/SecuritySystem.Runtime/Services/DefaultUserConverter.cs @@ -3,7 +3,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.ExpressionEvaluate; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; diff --git a/src/SecuritySystem/Services/DomainObjectIdentsParser.cs b/src/SecuritySystem.Runtime/Services/DomainObjectIdentsParser.cs similarity index 100% rename from src/SecuritySystem/Services/DomainObjectIdentsParser.cs rename to src/SecuritySystem.Runtime/Services/DomainObjectIdentsParser.cs diff --git a/src/SecuritySystem/Services/DomainSecurityProviderFactory.cs b/src/SecuritySystem.Runtime/Services/DomainSecurityProviderFactory.cs similarity index 99% rename from src/SecuritySystem/Services/DomainSecurityProviderFactory.cs rename to src/SecuritySystem.Runtime/Services/DomainSecurityProviderFactory.cs index 535bfc9..c34cbe8 100644 --- a/src/SecuritySystem/Services/DomainSecurityProviderFactory.cs +++ b/src/SecuritySystem.Runtime/Services/DomainSecurityProviderFactory.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.ExpressionEvaluate; using Microsoft.Extensions.DependencyInjection; diff --git a/src/SecuritySystem/Services/FormatProviderSource.cs b/src/SecuritySystem.Runtime/Services/FormatProviderSource.cs similarity index 100% rename from src/SecuritySystem/Services/FormatProviderSource.cs rename to src/SecuritySystem.Runtime/Services/FormatProviderSource.cs diff --git a/src/SecuritySystem/Services/IDefaultUserConverter.cs b/src/SecuritySystem.Runtime/Services/IDefaultUserConverter.cs similarity index 100% rename from src/SecuritySystem/Services/IDefaultUserConverter.cs rename to src/SecuritySystem.Runtime/Services/IDefaultUserConverter.cs diff --git a/src/SecuritySystem/Services/IDomainSecurityProviderFactory.cs b/src/SecuritySystem.Runtime/Services/IDomainSecurityProviderFactory.cs similarity index 100% rename from src/SecuritySystem/Services/IDomainSecurityProviderFactory.cs rename to src/SecuritySystem.Runtime/Services/IDomainSecurityProviderFactory.cs diff --git a/src/SecuritySystem/Services/IFormatProviderSource.cs b/src/SecuritySystem.Runtime/Services/IFormatProviderSource.cs similarity index 100% rename from src/SecuritySystem/Services/IFormatProviderSource.cs rename to src/SecuritySystem.Runtime/Services/IFormatProviderSource.cs diff --git a/src/SecuritySystem/Services/IIdentsParser.cs b/src/SecuritySystem.Runtime/Services/IIdentsParser.cs similarity index 100% rename from src/SecuritySystem/Services/IIdentsParser.cs rename to src/SecuritySystem.Runtime/Services/IIdentsParser.cs diff --git a/src/SecuritySystem/Services/IManagedPrincipalConverter.cs b/src/SecuritySystem.Runtime/Services/IManagedPrincipalConverter.cs similarity index 100% rename from src/SecuritySystem/Services/IManagedPrincipalConverter.cs rename to src/SecuritySystem.Runtime/Services/IManagedPrincipalConverter.cs diff --git a/src/SecuritySystem/Services/IManagedPrincipalHeaderConverter.cs b/src/SecuritySystem.Runtime/Services/IManagedPrincipalHeaderConverter.cs similarity index 100% rename from src/SecuritySystem/Services/IManagedPrincipalHeaderConverter.cs rename to src/SecuritySystem.Runtime/Services/IManagedPrincipalHeaderConverter.cs diff --git a/src/SecuritySystem/Services/IManagedPrincipalHeaderConverterFactory.cs b/src/SecuritySystem.Runtime/Services/IManagedPrincipalHeaderConverterFactory.cs similarity index 100% rename from src/SecuritySystem/Services/IManagedPrincipalHeaderConverterFactory.cs rename to src/SecuritySystem.Runtime/Services/IManagedPrincipalHeaderConverterFactory.cs diff --git a/src/SecuritySystem/Services/IPermissionBindingInfoSource.cs b/src/SecuritySystem.Runtime/Services/IPermissionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem/Services/IPermissionBindingInfoSource.cs rename to src/SecuritySystem.Runtime/Services/IPermissionBindingInfoSource.cs diff --git a/src/SecuritySystem/Services/IPermissionFilterFactory.cs b/src/SecuritySystem.Runtime/Services/IPermissionFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Services/IPermissionFilterFactory.cs rename to src/SecuritySystem.Runtime/Services/IPermissionFilterFactory.cs diff --git a/src/SecuritySystem/Services/IPermissionSecurityRoleFilterFactory.cs b/src/SecuritySystem.Runtime/Services/IPermissionSecurityRoleFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Services/IPermissionSecurityRoleFilterFactory.cs rename to src/SecuritySystem.Runtime/Services/IPermissionSecurityRoleFilterFactory.cs diff --git a/src/SecuritySystem/Services/IRoleBaseSecurityProviderFactory.cs b/src/SecuritySystem.Runtime/Services/IRoleBaseSecurityProviderFactory.cs similarity index 100% rename from src/SecuritySystem/Services/IRoleBaseSecurityProviderFactory.cs rename to src/SecuritySystem.Runtime/Services/IRoleBaseSecurityProviderFactory.cs diff --git a/src/SecuritySystem/Services/ISecurityIdentityFilterFactory.cs b/src/SecuritySystem.Runtime/Services/ISecurityIdentityFilterFactory.cs similarity index 100% rename from src/SecuritySystem/Services/ISecurityIdentityFilterFactory.cs rename to src/SecuritySystem.Runtime/Services/ISecurityIdentityFilterFactory.cs diff --git a/src/SecuritySystem/Services/ISecurityRuleBasicOptimizer.cs b/src/SecuritySystem.Runtime/Services/ISecurityRuleBasicOptimizer.cs similarity index 100% rename from src/SecuritySystem/Services/ISecurityRuleBasicOptimizer.cs rename to src/SecuritySystem.Runtime/Services/ISecurityRuleBasicOptimizer.cs diff --git a/src/SecuritySystem/Services/ISecurityRuleDeepOptimizer.cs b/src/SecuritySystem.Runtime/Services/ISecurityRuleDeepOptimizer.cs similarity index 100% rename from src/SecuritySystem/Services/ISecurityRuleDeepOptimizer.cs rename to src/SecuritySystem.Runtime/Services/ISecurityRuleDeepOptimizer.cs diff --git a/src/SecuritySystem/Services/IUserCredentialMatcher.cs b/src/SecuritySystem.Runtime/Services/IUserCredentialMatcher.cs similarity index 100% rename from src/SecuritySystem/Services/IUserCredentialMatcher.cs rename to src/SecuritySystem.Runtime/Services/IUserCredentialMatcher.cs diff --git a/src/SecuritySystem/Services/IdentsParser.cs b/src/SecuritySystem.Runtime/Services/IdentsParser.cs similarity index 100% rename from src/SecuritySystem/Services/IdentsParser.cs rename to src/SecuritySystem.Runtime/Services/IdentsParser.cs diff --git a/src/SecuritySystem/Services/ImpersonateUserAuthenticationService.cs b/src/SecuritySystem.Runtime/Services/ImpersonateUserAuthenticationService.cs similarity index 100% rename from src/SecuritySystem/Services/ImpersonateUserAuthenticationService.cs rename to src/SecuritySystem.Runtime/Services/ImpersonateUserAuthenticationService.cs diff --git a/src/SecuritySystem/Services/ManagedPrincipalHeaderConverter.cs b/src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverter.cs similarity index 97% rename from src/SecuritySystem/Services/ManagedPrincipalHeaderConverter.cs rename to src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverter.cs index 8ee5f8e..4071e16 100644 --- a/src/SecuritySystem/Services/ManagedPrincipalHeaderConverter.cs +++ b/src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverter.cs @@ -1,10 +1,12 @@ -using System.Linq.Expressions; -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.ExpressionEvaluate; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; + using SecuritySystem.ExternalSystem.Management; +using System.Linq.Expressions; + namespace SecuritySystem.Services; public class ManagedPrincipalHeaderConverter( diff --git a/src/SecuritySystem/Services/ManagedPrincipalHeaderConverterFactory.cs b/src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverterFactory.cs similarity index 91% rename from src/SecuritySystem/Services/ManagedPrincipalHeaderConverterFactory.cs rename to src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverterFactory.cs index f38a4ed..490eacc 100644 --- a/src/SecuritySystem/Services/ManagedPrincipalHeaderConverterFactory.cs +++ b/src/SecuritySystem.Runtime/Services/ManagedPrincipalHeaderConverterFactory.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/PermissionBindingInfoSource.cs b/src/SecuritySystem.Runtime/Services/PermissionBindingInfoSource.cs similarity index 100% rename from src/SecuritySystem/Services/PermissionBindingInfoSource.cs rename to src/SecuritySystem.Runtime/Services/PermissionBindingInfoSource.cs diff --git a/src/SecuritySystem/Services/PrincipalDataSecurityIdentityExtractor.cs b/src/SecuritySystem.Runtime/Services/PrincipalDataSecurityIdentityExtractor.cs similarity index 96% rename from src/SecuritySystem/Services/PrincipalDataSecurityIdentityExtractor.cs rename to src/SecuritySystem.Runtime/Services/PrincipalDataSecurityIdentityExtractor.cs index 4a5d65f..be288b6 100644 --- a/src/SecuritySystem/Services/PrincipalDataSecurityIdentityExtractor.cs +++ b/src/SecuritySystem.Runtime/Services/PrincipalDataSecurityIdentityExtractor.cs @@ -1,5 +1,7 @@ using System.Collections.Concurrent; -using CommonFramework.DependencyInjection; + +using CommonFramework; + using SecuritySystem.ExternalSystem.Management; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/PrincipalDomainService.cs b/src/SecuritySystem.Runtime/Services/PrincipalDomainService.cs similarity index 98% rename from src/SecuritySystem/Services/PrincipalDomainService.cs rename to src/SecuritySystem.Runtime/Services/PrincipalDomainService.cs index f543fca..4363e78 100644 --- a/src/SecuritySystem/Services/PrincipalDomainService.cs +++ b/src/SecuritySystem.Runtime/Services/PrincipalDomainService.cs @@ -1,10 +1,10 @@ using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; using GenericQueryable; + using SecuritySystem.UserSource; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/RoleBaseSecurityProviderFactory.cs b/src/SecuritySystem.Runtime/Services/RoleBaseSecurityProviderFactory.cs similarity index 100% rename from src/SecuritySystem/Services/RoleBaseSecurityProviderFactory.cs rename to src/SecuritySystem.Runtime/Services/RoleBaseSecurityProviderFactory.cs diff --git a/src/SecuritySystem/Services/RunAsManger.cs b/src/SecuritySystem.Runtime/Services/RunAsManger.cs similarity index 100% rename from src/SecuritySystem/Services/RunAsManger.cs rename to src/SecuritySystem.Runtime/Services/RunAsManger.cs diff --git a/src/SecuritySystem/Services/SecurityIdentityConverter.cs b/src/SecuritySystem.Runtime/Services/SecurityIdentityConverter.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityIdentityConverter.cs rename to src/SecuritySystem.Runtime/Services/SecurityIdentityConverter.cs diff --git a/src/SecuritySystem/Services/SecurityIdentityExtractor.cs b/src/SecuritySystem.Runtime/Services/SecurityIdentityExtractor.cs similarity index 96% rename from src/SecuritySystem/Services/SecurityIdentityExtractor.cs rename to src/SecuritySystem.Runtime/Services/SecurityIdentityExtractor.cs index 782e88d..59628a5 100644 --- a/src/SecuritySystem/Services/SecurityIdentityExtractor.cs +++ b/src/SecuritySystem.Runtime/Services/SecurityIdentityExtractor.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.IdentitySource; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/SecurityIdentityExtractorFactory.cs b/src/SecuritySystem.Runtime/Services/SecurityIdentityExtractorFactory.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityIdentityExtractorFactory.cs rename to src/SecuritySystem.Runtime/Services/SecurityIdentityExtractorFactory.cs diff --git a/src/SecuritySystem/Services/SecurityIdentityFilterFactory.cs b/src/SecuritySystem.Runtime/Services/SecurityIdentityFilterFactory.cs similarity index 97% rename from src/SecuritySystem/Services/SecurityIdentityFilterFactory.cs rename to src/SecuritySystem.Runtime/Services/SecurityIdentityFilterFactory.cs index bd1d621..7b7125c 100644 --- a/src/SecuritySystem/Services/SecurityIdentityFilterFactory.cs +++ b/src/SecuritySystem.Runtime/Services/SecurityIdentityFilterFactory.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.IdentitySource; namespace SecuritySystem.Services; diff --git a/src/SecuritySystem/Services/SecurityRepository.cs b/src/SecuritySystem.Runtime/Services/SecurityRepository.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityRepository.cs rename to src/SecuritySystem.Runtime/Services/SecurityRepository.cs diff --git a/src/SecuritySystem/Services/SecurityRolesIdentsResolver.cs b/src/SecuritySystem.Runtime/Services/SecurityRolesIdentsResolver.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityRolesIdentsResolver.cs rename to src/SecuritySystem.Runtime/Services/SecurityRolesIdentsResolver.cs diff --git a/src/SecuritySystem/Services/SecurityRuleBasicOptimizer.cs b/src/SecuritySystem.Runtime/Services/SecurityRuleBasicOptimizer.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityRuleBasicOptimizer.cs rename to src/SecuritySystem.Runtime/Services/SecurityRuleBasicOptimizer.cs diff --git a/src/SecuritySystem/Services/SecurityRuleDeepOptimizer.cs b/src/SecuritySystem.Runtime/Services/SecurityRuleDeepOptimizer.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityRuleDeepOptimizer.cs rename to src/SecuritySystem.Runtime/Services/SecurityRuleDeepOptimizer.cs diff --git a/src/SecuritySystem/Services/SecurityRuleVisitor.cs b/src/SecuritySystem.Runtime/Services/SecurityRuleVisitor.cs similarity index 100% rename from src/SecuritySystem/Services/SecurityRuleVisitor.cs rename to src/SecuritySystem.Runtime/Services/SecurityRuleVisitor.cs diff --git a/src/SecuritySystem/Services/UserCredentialMatcher.cs b/src/SecuritySystem.Runtime/Services/UserCredentialMatcher.cs similarity index 97% rename from src/SecuritySystem/Services/UserCredentialMatcher.cs rename to src/SecuritySystem.Runtime/Services/UserCredentialMatcher.cs index 20b24c6..4207072 100644 --- a/src/SecuritySystem/Services/UserCredentialMatcher.cs +++ b/src/SecuritySystem.Runtime/Services/UserCredentialMatcher.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; diff --git a/src/SecuritySystem/Services/UserCredentialNameResolver.cs b/src/SecuritySystem.Runtime/Services/UserCredentialNameResolver.cs similarity index 100% rename from src/SecuritySystem/Services/UserCredentialNameResolver.cs rename to src/SecuritySystem.Runtime/Services/UserCredentialNameResolver.cs diff --git a/src/SecuritySystem/UserSource/CreateVirtualMissedUserService.cs b/src/SecuritySystem.Runtime/UserSource/CreateVirtualMissedUserService.cs similarity index 100% rename from src/SecuritySystem/UserSource/CreateVirtualMissedUserService.cs rename to src/SecuritySystem.Runtime/UserSource/CreateVirtualMissedUserService.cs diff --git a/src/SecuritySystem/UserSource/CurrentUserSecurityProvider.cs b/src/SecuritySystem.Runtime/UserSource/CurrentUserSecurityProvider.cs similarity index 99% rename from src/SecuritySystem/UserSource/CurrentUserSecurityProvider.cs rename to src/SecuritySystem.Runtime/UserSource/CurrentUserSecurityProvider.cs index fabc47f..ed5b5d1 100644 --- a/src/SecuritySystem/UserSource/CurrentUserSecurityProvider.cs +++ b/src/SecuritySystem.Runtime/UserSource/CurrentUserSecurityProvider.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using CommonFramework; -using CommonFramework.DependencyInjection; using CommonFramework.ExpressionEvaluate; using CommonFramework.IdentitySource; using CommonFramework.RelativePath; diff --git a/src/SecuritySystem/UserSource/CurrentUserSecurityProviderRelativeKey.cs b/src/SecuritySystem.Runtime/UserSource/CurrentUserSecurityProviderRelativeKey.cs similarity index 100% rename from src/SecuritySystem/UserSource/CurrentUserSecurityProviderRelativeKey.cs rename to src/SecuritySystem.Runtime/UserSource/CurrentUserSecurityProviderRelativeKey.cs diff --git a/src/SecuritySystem/UserSource/CurrentUserSource.cs b/src/SecuritySystem.Runtime/UserSource/CurrentUserSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/CurrentUserSource.cs rename to src/SecuritySystem.Runtime/UserSource/CurrentUserSource.cs diff --git a/src/SecuritySystem/UserSource/ErrorMissedUserService.cs b/src/SecuritySystem.Runtime/UserSource/ErrorMissedUserService.cs similarity index 100% rename from src/SecuritySystem/UserSource/ErrorMissedUserService.cs rename to src/SecuritySystem.Runtime/UserSource/ErrorMissedUserService.cs diff --git a/src/SecuritySystem/UserSource/ExistsOtherwiseUsersRunAsValidator.cs b/src/SecuritySystem.Runtime/UserSource/ExistsOtherwiseUsersRunAsValidator.cs similarity index 100% rename from src/SecuritySystem/UserSource/ExistsOtherwiseUsersRunAsValidator.cs rename to src/SecuritySystem.Runtime/UserSource/ExistsOtherwiseUsersRunAsValidator.cs diff --git a/src/SecuritySystem/UserSource/IMissedUserErrorSource.cs b/src/SecuritySystem.Runtime/UserSource/IMissedUserErrorSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/IMissedUserErrorSource.cs rename to src/SecuritySystem.Runtime/UserSource/IMissedUserErrorSource.cs diff --git a/src/SecuritySystem/UserSource/IRunAsValidator.cs b/src/SecuritySystem.Runtime/UserSource/IRunAsValidator.cs similarity index 100% rename from src/SecuritySystem/UserSource/IRunAsValidator.cs rename to src/SecuritySystem.Runtime/UserSource/IRunAsValidator.cs diff --git a/src/SecuritySystem/UserSource/IUserFilterFactory.cs b/src/SecuritySystem.Runtime/UserSource/IUserFilterFactory.cs similarity index 100% rename from src/SecuritySystem/UserSource/IUserFilterFactory.cs rename to src/SecuritySystem.Runtime/UserSource/IUserFilterFactory.cs diff --git a/src/SecuritySystem/UserSource/MissedUserErrorSource.cs b/src/SecuritySystem.Runtime/UserSource/MissedUserErrorSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/MissedUserErrorSource.cs rename to src/SecuritySystem.Runtime/UserSource/MissedUserErrorSource.cs diff --git a/src/SecuritySystem/UserSource/RawCurrentUserSource.cs b/src/SecuritySystem.Runtime/UserSource/RawCurrentUserSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/RawCurrentUserSource.cs rename to src/SecuritySystem.Runtime/UserSource/RawCurrentUserSource.cs diff --git a/src/SecuritySystem/UserSource/UserFilterFactory.cs b/src/SecuritySystem.Runtime/UserSource/UserFilterFactory.cs similarity index 98% rename from src/SecuritySystem/UserSource/UserFilterFactory.cs rename to src/SecuritySystem.Runtime/UserSource/UserFilterFactory.cs index d7039f9..1a2121c 100644 --- a/src/SecuritySystem/UserSource/UserFilterFactory.cs +++ b/src/SecuritySystem.Runtime/UserSource/UserFilterFactory.cs @@ -1,12 +1,11 @@ using CommonFramework; +using CommonFramework.IdentitySource; +using CommonFramework.VisualIdentitySource; using SecuritySystem.Credential; using SecuritySystem.Services; using System.Linq.Expressions; -using CommonFramework.DependencyInjection; -using CommonFramework.IdentitySource; -using CommonFramework.VisualIdentitySource; namespace SecuritySystem.UserSource; diff --git a/src/SecuritySystem/UserSource/UserQueryableSource.cs b/src/SecuritySystem.Runtime/UserSource/UserQueryableSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/UserQueryableSource.cs rename to src/SecuritySystem.Runtime/UserSource/UserQueryableSource.cs diff --git a/src/SecuritySystem/UserSource/UserSource.cs b/src/SecuritySystem.Runtime/UserSource/UserSource.cs similarity index 100% rename from src/SecuritySystem/UserSource/UserSource.cs rename to src/SecuritySystem.Runtime/UserSource/UserSource.cs diff --git a/src/SecuritySystem/UserSource/UserSourceInfo.cs b/src/SecuritySystem.Runtime/UserSource/UserSourceInfo.cs similarity index 100% rename from src/SecuritySystem/UserSource/UserSourceInfo.cs rename to src/SecuritySystem.Runtime/UserSource/UserSourceInfo.cs diff --git a/src/SecuritySystem/UserSource/UserSourceRunAsAccessor.cs b/src/SecuritySystem.Runtime/UserSource/UserSourceRunAsAccessor.cs similarity index 100% rename from src/SecuritySystem/UserSource/UserSourceRunAsAccessor.cs rename to src/SecuritySystem.Runtime/UserSource/UserSourceRunAsAccessor.cs diff --git a/src/SecuritySystem/UserSource/UserSourceRunAsValidator.cs b/src/SecuritySystem.Runtime/UserSource/UserSourceRunAsValidator.cs similarity index 100% rename from src/SecuritySystem/UserSource/UserSourceRunAsValidator.cs rename to src/SecuritySystem.Runtime/UserSource/UserSourceRunAsValidator.cs diff --git a/src/SecuritySystem.VirtualPermission/IVirtualPermissionBindingInfoValidator.cs b/src/SecuritySystem.VirtualPermission.Runtime/IVirtualPermissionBindingInfoValidator.cs similarity index 100% rename from src/SecuritySystem.VirtualPermission/IVirtualPermissionBindingInfoValidator.cs rename to src/SecuritySystem.VirtualPermission.Runtime/IVirtualPermissionBindingInfoValidator.cs diff --git a/src/SecuritySystem.VirtualPermission.Runtime/SecuritySystem.VirtualPermission.Runtime.csproj b/src/SecuritySystem.VirtualPermission.Runtime/SecuritySystem.VirtualPermission.Runtime.csproj new file mode 100644 index 0000000..7dc399e --- /dev/null +++ b/src/SecuritySystem.VirtualPermission.Runtime/SecuritySystem.VirtualPermission.Runtime.csproj @@ -0,0 +1,12 @@ + + + + IvAt.SecuritySystem.VirtualPermission.Runtime + SecuritySystem.VirtualPermission + + + + + + + diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionBindingInfo.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionBindingInfo.cs similarity index 100% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionBindingInfo.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionBindingInfo.cs diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionBindingInfoValidator.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionBindingInfoValidator.cs similarity index 100% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionBindingInfoValidator.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionBindingInfoValidator.cs diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionRestrictionSource.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionRestrictionSource.cs similarity index 100% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionRestrictionSource.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionRestrictionSource.cs diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionSource.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSource.cs similarity index 99% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionSource.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSource.cs index 93222b3..553106d 100644 --- a/src/SecuritySystem.VirtualPermission/VirtualPermissionSource.cs +++ b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSource.cs @@ -3,7 +3,6 @@ using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; -using CommonFramework.DependencyInjection; using SecuritySystem.Credential; using SecuritySystem.ExternalSystem; diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionSystem.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystem.cs similarity index 98% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionSystem.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystem.cs index cb392e9..f6f6476 100644 --- a/src/SecuritySystem.VirtualPermission/VirtualPermissionSystem.cs +++ b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystem.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using GenericQueryable; diff --git a/src/SecuritySystem.VirtualPermission/VirtualPermissionSystemFactory.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystemFactory.cs similarity index 95% rename from src/SecuritySystem.VirtualPermission/VirtualPermissionSystemFactory.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystemFactory.cs index d77b51b..1b42fd1 100644 --- a/src/SecuritySystem.VirtualPermission/VirtualPermissionSystemFactory.cs +++ b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPermissionSystemFactory.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using SecuritySystem.ExternalSystem; diff --git a/src/SecuritySystem.VirtualPermission/VirtualPrincipalSourceService.cs b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPrincipalSourceService.cs similarity index 99% rename from src/SecuritySystem.VirtualPermission/VirtualPrincipalSourceService.cs rename to src/SecuritySystem.VirtualPermission.Runtime/VirtualPrincipalSourceService.cs index edd0720..79ff168 100644 --- a/src/SecuritySystem.VirtualPermission/VirtualPrincipalSourceService.cs +++ b/src/SecuritySystem.VirtualPermission.Runtime/VirtualPrincipalSourceService.cs @@ -3,7 +3,6 @@ using CommonFramework.GenericRepository; using CommonFramework.IdentitySource; using CommonFramework.VisualIdentitySource; -using CommonFramework.DependencyInjection; using GenericQueryable; diff --git a/src/SecuritySystem.VirtualPermission/DependencyInjection/SecuritySystemSettingsExtensions.cs b/src/SecuritySystem.VirtualPermission/DependencyInjection/SecuritySystemSettingsExtensions.cs index bedec4f..088a0b9 100644 --- a/src/SecuritySystem.VirtualPermission/DependencyInjection/SecuritySystemSettingsExtensions.cs +++ b/src/SecuritySystem.VirtualPermission/DependencyInjection/SecuritySystemSettingsExtensions.cs @@ -42,12 +42,12 @@ public ISecuritySystemSettings AddVirtualPermission( } public ISecuritySystemSettings AddVirtualPermission( - Expression> principalPath, + PropertyAccessors principalAccessors, Action> initAction) where TPrincipal : class where TPermission : class { - var bindingInfo = new PermissionBindingInfo { IsReadonly = true, Principal = principalPath.ToPropertyAccessors() }; + var bindingInfo = new PermissionBindingInfo { IsReadonly = true, Principal = principalAccessors }; var builder = new VirtualBindingInfoRootSettingsBuilder(); @@ -55,5 +55,12 @@ public ISecuritySystemSettings AddVirtualPermission( return securitySystemSettings.AddVirtualPermission(bindingInfo, builder.VirtualPermissionBindingInfoList.ToArray()); } + + public ISecuritySystemSettings AddVirtualPermission( + Expression> principalPath, + Action> initAction) + where TPrincipal : class + where TPermission : class => + securitySystemSettings.AddVirtualPermission(principalPath.ToPropertyAccessors(), initAction); } } \ No newline at end of file diff --git a/src/SecuritySystem.VirtualPermission/SecuritySystem.VirtualPermission.csproj b/src/SecuritySystem.VirtualPermission/SecuritySystem.VirtualPermission.csproj index c496864..87f17fd 100644 --- a/src/SecuritySystem.VirtualPermission/SecuritySystem.VirtualPermission.csproj +++ b/src/SecuritySystem.VirtualPermission/SecuritySystem.VirtualPermission.csproj @@ -5,6 +5,7 @@ + diff --git a/src/SecuritySystem.slnx b/src/SecuritySystem.slnx index 0de5e4c..5e03eee 100644 --- a/src/SecuritySystem.slnx +++ b/src/SecuritySystem.slnx @@ -20,9 +20,13 @@ + + + + diff --git a/src/SecuritySystem/DependencyInjection/ISecuritySystemSettings.cs b/src/SecuritySystem/DependencyInjection/ISecuritySystemSettings.cs index 0d902d4..9cc7bcc 100644 --- a/src/SecuritySystem/DependencyInjection/ISecuritySystemSettings.cs +++ b/src/SecuritySystem/DependencyInjection/ISecuritySystemSettings.cs @@ -1,4 +1,4 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; using CommonFramework.GenericRepository; using Microsoft.Extensions.DependencyInjection; diff --git a/src/SecuritySystem/SecuritySystem.csproj b/src/SecuritySystem/SecuritySystem.csproj index 0c817f2..95f9534 100644 --- a/src/SecuritySystem/SecuritySystem.csproj +++ b/src/SecuritySystem/SecuritySystem.csproj @@ -5,13 +5,13 @@ - + - + diff --git a/src/_Example/ExampleApp.Api/Controllers/InitController.cs b/src/_Example/ExampleApp.Api/Controllers/InitController.cs index ddec7da..4471182 100644 --- a/src/_Example/ExampleApp.Api/Controllers/InitController.cs +++ b/src/_Example/ExampleApp.Api/Controllers/InitController.cs @@ -6,6 +6,7 @@ using HierarchicalExpand.AncestorDenormalization; using Microsoft.AspNetCore.Mvc; + using SecuritySystem.GeneralPermission.Initialize; using SecuritySystem.Services; diff --git a/src/_Example/ExampleApp.Api/Controllers/TestController.cs b/src/_Example/ExampleApp.Api/Controllers/TestController.cs index ac08c23..27e03d9 100644 --- a/src/_Example/ExampleApp.Api/Controllers/TestController.cs +++ b/src/_Example/ExampleApp.Api/Controllers/TestController.cs @@ -1,5 +1,6 @@ using ExampleApp.Application; using ExampleApp.Domain; + using GenericQueryable; using Microsoft.AspNetCore.Mvc; diff --git a/src/_Example/ExampleApp.Application/ExampleApp.Application.csproj b/src/_Example/ExampleApp.Application/ExampleApp.Application.csproj index c9b88fb..12b7d80 100644 --- a/src/_Example/ExampleApp.Application/ExampleApp.Application.csproj +++ b/src/_Example/ExampleApp.Application/ExampleApp.Application.csproj @@ -5,6 +5,7 @@ + diff --git a/src/_Example/ExampleApp.Domain/ExampleApp.Domain.csproj b/src/_Example/ExampleApp.Domain/ExampleApp.Domain.csproj index f567068..6ee336e 100644 --- a/src/_Example/ExampleApp.Domain/ExampleApp.Domain.csproj +++ b/src/_Example/ExampleApp.Domain/ExampleApp.Domain.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/_Example/ExampleApp.Infrastructure/ExampleApp.Infrastructure.csproj b/src/_Example/ExampleApp.Infrastructure/ExampleApp.Infrastructure.csproj index ecea351..c06517a 100644 --- a/src/_Example/ExampleApp.Infrastructure/ExampleApp.Infrastructure.csproj +++ b/src/_Example/ExampleApp.Infrastructure/ExampleApp.Infrastructure.csproj @@ -6,6 +6,7 @@ + diff --git a/src/_Example/ExampleApp.Infrastructure/Services/EfGenericRepository.cs b/src/_Example/ExampleApp.Infrastructure/Services/EfGenericRepository.cs index e5da76c..d525457 100644 --- a/src/_Example/ExampleApp.Infrastructure/Services/EfGenericRepository.cs +++ b/src/_Example/ExampleApp.Infrastructure/Services/EfGenericRepository.cs @@ -1,4 +1,5 @@ using CommonFramework.GenericRepository; + using Microsoft.EntityFrameworkCore; namespace ExampleApp.Infrastructure.Services; diff --git a/src/_Example/ExampleApp.Infrastructure/Services/EfRepositoryFactory.cs b/src/_Example/ExampleApp.Infrastructure/Services/EfRepositoryFactory.cs index f68165b..7ec45c0 100644 --- a/src/_Example/ExampleApp.Infrastructure/Services/EfRepositoryFactory.cs +++ b/src/_Example/ExampleApp.Infrastructure/Services/EfRepositoryFactory.cs @@ -1,4 +1,5 @@ -using CommonFramework.DependencyInjection; +using CommonFramework; + using ExampleApp.Application; using SecuritySystem; diff --git a/src/_Example/__SolutionItems/CommonAssemblyInfo.cs b/src/_Example/__SolutionItems/CommonAssemblyInfo.cs index 37843aa..d9359ea 100644 --- a/src/_Example/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/_Example/__SolutionItems/CommonAssemblyInfo.cs @@ -3,7 +3,6 @@ [assembly: AssemblyProduct("ExampleApp")] [assembly: AssemblyCompany("IvAt")] -[assembly: AssemblyVersion("1.2.0.0")] [assembly: AssemblyInformationalVersion("changes at build")] #if DEBUG diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs index 56ff642..6a83c82 100644 --- a/src/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/__SolutionItems/CommonAssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyProduct("SecuritySystem")] [assembly: AssemblyCompany("IvAt")] -[assembly: AssemblyVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.6.0")] [assembly: AssemblyInformationalVersion("changes at build")] #if DEBUG