From 1e657d7d337b29c96e54be69425a917d6b90680a Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:05:48 +0700 Subject: [PATCH 1/6] Unite projects SN-779 --- .../Saritasa.NetForge.Demo.csproj | 1 - .../Domain}/AdminOptionsBuilder.cs | 0 .../Attributes/MultilineTextAttribute.cs | 0 .../Attributes/NetForgeEntityAttribute.cs | 0 .../Attributes/NetForgePropertyAttribute.cs | 0 .../Domain}/Comparers/ObjectComparer.cs | 0 .../Domain}/Dtos/PropertySearchDto.cs | 0 .../Entities/Metadata/EntityMetadata.cs | 0 .../Entities/Metadata/NavigationMetadata.cs | 0 .../Entities/Metadata/PropertyMetadata.cs | 0 .../Entities/Metadata/PropertyMetadataBase.cs | 0 .../Domain}/Entities/Options/AdminOptions.cs | 0 .../Domain}/Entities/Options/EntityGroup.cs | 0 .../Domain}/Entities/Options/EntityOptions.cs | 0 .../Entities/Options/NavigationOptions.cs | 0 .../Entities/Options/PropertyOptions.cs | 0 .../Domain}/EntityOptionsBuilder.cs | 0 .../Domain}/Enums/SearchType.cs | 0 .../Domain}/Exceptions/DomainException.cs | 0 .../Domain}/Exceptions/NotFoundException.cs | 0 .../Domain}/Extensions/CloneExtensions.cs | 0 .../Extensions/EntityGroupExtensions.cs | 0 .../EntityMetadataAttributesExtensions.cs | 0 .../EntityMetadataOptionsExtensions.cs | 0 .../Extensions/EnumerableExtensions.cs | 0 .../Extensions/ExpressionExtensions.cs | 0 .../Extensions/ReflectionExtensions.cs | 0 .../Domain}/Extensions/StringExtensions.cs | 0 .../Domain}/IUploadFileStrategy.cs | 0 .../Interfaces/IEntityAdminConfiguration.cs | 0 .../Domain}/NavigationOptionsBuilder.cs | 0 .../Domain}/PropertyOptionsBuilder.cs | 0 .../Domain/UseCases}/Common/OrderByDto.cs | 0 .../Domain/UseCases}/Common/SearchOptions.cs | 0 .../Constants/DefaultValueConstants.cs | 0 .../UseCases}/Interfaces/IEntityService.cs | 0 .../Metadata/DTOs/EntityMetadataDto.cs | 0 .../Metadata/GetEntityById/GetEntityDto.cs | 0 .../GetEntityById/NavigationMetadataDto.cs | 0 .../GetEntityById/PropertyMetadataDto.cs | 0 .../Metadata/Services/AdminMetadataService.cs | 0 .../UseCases}/Services/EntityService.cs | 0 .../Interfaces/IAdminOrmServiceProvider.cs | 0 .../Interfaces/IBlobStorageService.cs | 0 .../Interfaces/ICloudBlobStorageService.cs | 0 .../Abstractions}/Interfaces/IFileService.cs | 0 .../Interfaces/IOrmDataService.cs | 0 .../Interfaces/IOrmMetadataService.cs | 0 .../EfCore}/EfCoreAdminServiceProvider.cs | 0 .../Infrastructure/EfCore}/EfCoreOptions.cs | 0 .../EfCore}/EfCoreOptionsBuilder.cs | 0 .../EfCore}/Extensions/AdminExtensions.cs | 0 .../EfCore}/Extensions/DbContextExtensions.cs | 0 .../EfCore}/Services/EfCoreDataService.cs | 0 .../EfCore}/Services/EfCoreMetadataService.cs | 2 +- .../MVVM}/Navigation/INavigationService.cs | 0 .../MVVM}/Utils/DataFormatUtils.cs | 0 .../MVVM}/Utils/ErrorMappingUtil.cs | 0 .../MVVM}/ViewModels/BaseViewModel.cs | 0 .../CreateEntity/CreateEntityModel.cs | 0 .../CreateEntity/CreateEntityViewModel.cs | 0 .../ViewModels/EditEntity/EditEntityModel.cs | 0 .../EditEntity/EditEntityViewModel.cs | 0 .../MVVM}/ViewModels/EntitiesViewModel.cs | 0 .../EntityDetails/EntityDetailsModel.cs | 0 .../EntityDetails/EntityDetailsViewModel.cs | 0 .../MVVM}/ViewModels/FieldErrorModel.cs | 0 .../ViewModels/ValidationEntityViewModel.cs | 0 .../MVVM}/ViewModels/ViewModelFactory.cs | 0 .../Saritasa.NetForge.Blazor.csproj | 25 ++++++-- .../Saritasa.NetForge.Domain.csproj | 44 -------------- .../Saritasa.NetForge.DomainServices.csproj | 36 ------------ ...etForge.Infrastructure.Abstractions.csproj | 50 ---------------- ...tasa.NetForge.Infrastructure.EfCore.csproj | 58 ------------------- .../Saritasa.NetForge.Mvvm.csproj | 48 --------------- .../Saritasa.NetForge.Tests.csproj | 1 - .../Saritasa.NetForge.UseCases.csproj | 55 ------------------ src/Saritasa.NetForge.sln | 46 --------------- 78 files changed, 21 insertions(+), 345 deletions(-) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/AdminOptionsBuilder.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Attributes/MultilineTextAttribute.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Attributes/NetForgeEntityAttribute.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Attributes/NetForgePropertyAttribute.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Comparers/ObjectComparer.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Dtos/PropertySearchDto.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Metadata/EntityMetadata.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Metadata/NavigationMetadata.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Metadata/PropertyMetadata.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Metadata/PropertyMetadataBase.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Options/AdminOptions.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Options/EntityGroup.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Options/EntityOptions.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Options/NavigationOptions.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Entities/Options/PropertyOptions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/EntityOptionsBuilder.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Enums/SearchType.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Exceptions/DomainException.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/Exceptions/NotFoundException.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/CloneExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/EntityGroupExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/EntityMetadataAttributesExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/EntityMetadataOptionsExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/EnumerableExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/ExpressionExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/ReflectionExtensions.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Extensions/StringExtensions.cs (100%) rename src/{Saritasa.NetForge.Domain => Saritasa.NetForge.Blazor/Domain}/IUploadFileStrategy.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/Interfaces/IEntityAdminConfiguration.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/NavigationOptionsBuilder.cs (100%) rename src/{Saritasa.NetForge.DomainServices => Saritasa.NetForge.Blazor/Domain}/PropertyOptionsBuilder.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Common/OrderByDto.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Common/SearchOptions.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Constants/DefaultValueConstants.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Interfaces/IEntityService.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Metadata/DTOs/EntityMetadataDto.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Metadata/GetEntityById/GetEntityDto.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Metadata/GetEntityById/NavigationMetadataDto.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Metadata/GetEntityById/PropertyMetadataDto.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Metadata/Services/AdminMetadataService.cs (100%) rename src/{Saritasa.NetForge.UseCases => Saritasa.NetForge.Blazor/Domain/UseCases}/Services/EntityService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/IAdminOrmServiceProvider.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/IBlobStorageService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/ICloudBlobStorageService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/IFileService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/IOrmDataService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.Abstractions => Saritasa.NetForge.Blazor/Infrastructure/Abstractions}/Interfaces/IOrmMetadataService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/EfCoreAdminServiceProvider.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/EfCoreOptions.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/EfCoreOptionsBuilder.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/Extensions/AdminExtensions.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/Extensions/DbContextExtensions.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/Services/EfCoreDataService.cs (100%) rename src/{Saritasa.NetForge.Infrastructure.EfCore => Saritasa.NetForge.Blazor/Infrastructure/EfCore}/Services/EfCoreMetadataService.cs (98%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/Navigation/INavigationService.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/Utils/DataFormatUtils.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/Utils/ErrorMappingUtil.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/BaseViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/CreateEntity/CreateEntityModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/CreateEntity/CreateEntityViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/EditEntity/EditEntityModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/EditEntity/EditEntityViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/EntitiesViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/EntityDetails/EntityDetailsModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/EntityDetails/EntityDetailsViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/FieldErrorModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/ValidationEntityViewModel.cs (100%) rename src/{Saritasa.NetForge.Mvvm => Saritasa.NetForge.Blazor/MVVM}/ViewModels/ViewModelFactory.cs (100%) delete mode 100644 src/Saritasa.NetForge.Domain/Saritasa.NetForge.Domain.csproj delete mode 100644 src/Saritasa.NetForge.DomainServices/Saritasa.NetForge.DomainServices.csproj delete mode 100644 src/Saritasa.NetForge.Infrastructure.Abstractions/Saritasa.NetForge.Infrastructure.Abstractions.csproj delete mode 100644 src/Saritasa.NetForge.Infrastructure.EfCore/Saritasa.NetForge.Infrastructure.EfCore.csproj delete mode 100644 src/Saritasa.NetForge.Mvvm/Saritasa.NetForge.Mvvm.csproj delete mode 100644 src/Saritasa.NetForge.UseCases/Saritasa.NetForge.UseCases.csproj diff --git a/demo/Saritasa.NetForge.Demo/Saritasa.NetForge.Demo.csproj b/demo/Saritasa.NetForge.Demo/Saritasa.NetForge.Demo.csproj index b8e09466..d90cc6e0 100644 --- a/demo/Saritasa.NetForge.Demo/Saritasa.NetForge.Demo.csproj +++ b/demo/Saritasa.NetForge.Demo/Saritasa.NetForge.Demo.csproj @@ -37,7 +37,6 @@ - diff --git a/src/Saritasa.NetForge.DomainServices/AdminOptionsBuilder.cs b/src/Saritasa.NetForge.Blazor/Domain/AdminOptionsBuilder.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/AdminOptionsBuilder.cs rename to src/Saritasa.NetForge.Blazor/Domain/AdminOptionsBuilder.cs diff --git a/src/Saritasa.NetForge.Domain/Attributes/MultilineTextAttribute.cs b/src/Saritasa.NetForge.Blazor/Domain/Attributes/MultilineTextAttribute.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Attributes/MultilineTextAttribute.cs rename to src/Saritasa.NetForge.Blazor/Domain/Attributes/MultilineTextAttribute.cs diff --git a/src/Saritasa.NetForge.Domain/Attributes/NetForgeEntityAttribute.cs b/src/Saritasa.NetForge.Blazor/Domain/Attributes/NetForgeEntityAttribute.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Attributes/NetForgeEntityAttribute.cs rename to src/Saritasa.NetForge.Blazor/Domain/Attributes/NetForgeEntityAttribute.cs diff --git a/src/Saritasa.NetForge.Domain/Attributes/NetForgePropertyAttribute.cs b/src/Saritasa.NetForge.Blazor/Domain/Attributes/NetForgePropertyAttribute.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Attributes/NetForgePropertyAttribute.cs rename to src/Saritasa.NetForge.Blazor/Domain/Attributes/NetForgePropertyAttribute.cs diff --git a/src/Saritasa.NetForge.DomainServices/Comparers/ObjectComparer.cs b/src/Saritasa.NetForge.Blazor/Domain/Comparers/ObjectComparer.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Comparers/ObjectComparer.cs rename to src/Saritasa.NetForge.Blazor/Domain/Comparers/ObjectComparer.cs diff --git a/src/Saritasa.NetForge.Domain/Dtos/PropertySearchDto.cs b/src/Saritasa.NetForge.Blazor/Domain/Dtos/PropertySearchDto.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Dtos/PropertySearchDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/Dtos/PropertySearchDto.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Metadata/EntityMetadata.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/EntityMetadata.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Metadata/EntityMetadata.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/EntityMetadata.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Metadata/NavigationMetadata.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/NavigationMetadata.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Metadata/NavigationMetadata.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/NavigationMetadata.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Metadata/PropertyMetadata.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/PropertyMetadata.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Metadata/PropertyMetadata.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/PropertyMetadata.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Metadata/PropertyMetadataBase.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/PropertyMetadataBase.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Metadata/PropertyMetadataBase.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Metadata/PropertyMetadataBase.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Options/AdminOptions.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Options/AdminOptions.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Options/AdminOptions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Options/AdminOptions.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Options/EntityGroup.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Options/EntityGroup.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Options/EntityGroup.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Options/EntityGroup.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Options/EntityOptions.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Options/EntityOptions.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Options/EntityOptions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Options/EntityOptions.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Options/NavigationOptions.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Options/NavigationOptions.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Options/NavigationOptions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Options/NavigationOptions.cs diff --git a/src/Saritasa.NetForge.Domain/Entities/Options/PropertyOptions.cs b/src/Saritasa.NetForge.Blazor/Domain/Entities/Options/PropertyOptions.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Entities/Options/PropertyOptions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Entities/Options/PropertyOptions.cs diff --git a/src/Saritasa.NetForge.DomainServices/EntityOptionsBuilder.cs b/src/Saritasa.NetForge.Blazor/Domain/EntityOptionsBuilder.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/EntityOptionsBuilder.cs rename to src/Saritasa.NetForge.Blazor/Domain/EntityOptionsBuilder.cs diff --git a/src/Saritasa.NetForge.Domain/Enums/SearchType.cs b/src/Saritasa.NetForge.Blazor/Domain/Enums/SearchType.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Enums/SearchType.cs rename to src/Saritasa.NetForge.Blazor/Domain/Enums/SearchType.cs diff --git a/src/Saritasa.NetForge.Domain/Exceptions/DomainException.cs b/src/Saritasa.NetForge.Blazor/Domain/Exceptions/DomainException.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Exceptions/DomainException.cs rename to src/Saritasa.NetForge.Blazor/Domain/Exceptions/DomainException.cs diff --git a/src/Saritasa.NetForge.Domain/Exceptions/NotFoundException.cs b/src/Saritasa.NetForge.Blazor/Domain/Exceptions/NotFoundException.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/Exceptions/NotFoundException.cs rename to src/Saritasa.NetForge.Blazor/Domain/Exceptions/NotFoundException.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/CloneExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/CloneExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/EntityGroupExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityGroupExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/EntityGroupExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityGroupExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/EntityMetadataAttributesExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityMetadataAttributesExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/EntityMetadataAttributesExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityMetadataAttributesExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/EntityMetadataOptionsExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityMetadataOptionsExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/EntityMetadataOptionsExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/EntityMetadataOptionsExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/EnumerableExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/EnumerableExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/EnumerableExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/EnumerableExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/ExpressionExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/ExpressionExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/ExpressionExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/ExpressionExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/ReflectionExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/ReflectionExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/ReflectionExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/ReflectionExtensions.cs diff --git a/src/Saritasa.NetForge.DomainServices/Extensions/StringExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/StringExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Extensions/StringExtensions.cs rename to src/Saritasa.NetForge.Blazor/Domain/Extensions/StringExtensions.cs diff --git a/src/Saritasa.NetForge.Domain/IUploadFileStrategy.cs b/src/Saritasa.NetForge.Blazor/Domain/IUploadFileStrategy.cs similarity index 100% rename from src/Saritasa.NetForge.Domain/IUploadFileStrategy.cs rename to src/Saritasa.NetForge.Blazor/Domain/IUploadFileStrategy.cs diff --git a/src/Saritasa.NetForge.DomainServices/Interfaces/IEntityAdminConfiguration.cs b/src/Saritasa.NetForge.Blazor/Domain/Interfaces/IEntityAdminConfiguration.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/Interfaces/IEntityAdminConfiguration.cs rename to src/Saritasa.NetForge.Blazor/Domain/Interfaces/IEntityAdminConfiguration.cs diff --git a/src/Saritasa.NetForge.DomainServices/NavigationOptionsBuilder.cs b/src/Saritasa.NetForge.Blazor/Domain/NavigationOptionsBuilder.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/NavigationOptionsBuilder.cs rename to src/Saritasa.NetForge.Blazor/Domain/NavigationOptionsBuilder.cs diff --git a/src/Saritasa.NetForge.DomainServices/PropertyOptionsBuilder.cs b/src/Saritasa.NetForge.Blazor/Domain/PropertyOptionsBuilder.cs similarity index 100% rename from src/Saritasa.NetForge.DomainServices/PropertyOptionsBuilder.cs rename to src/Saritasa.NetForge.Blazor/Domain/PropertyOptionsBuilder.cs diff --git a/src/Saritasa.NetForge.UseCases/Common/OrderByDto.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Common/OrderByDto.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Common/OrderByDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Common/OrderByDto.cs diff --git a/src/Saritasa.NetForge.UseCases/Common/SearchOptions.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Common/SearchOptions.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Common/SearchOptions.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Common/SearchOptions.cs diff --git a/src/Saritasa.NetForge.UseCases/Constants/DefaultValueConstants.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Constants/DefaultValueConstants.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Constants/DefaultValueConstants.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Constants/DefaultValueConstants.cs diff --git a/src/Saritasa.NetForge.UseCases/Interfaces/IEntityService.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Interfaces/IEntityService.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Interfaces/IEntityService.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Interfaces/IEntityService.cs diff --git a/src/Saritasa.NetForge.UseCases/Metadata/DTOs/EntityMetadataDto.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/DTOs/EntityMetadataDto.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Metadata/DTOs/EntityMetadataDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/DTOs/EntityMetadataDto.cs diff --git a/src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/GetEntityDto.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/GetEntityDto.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/GetEntityDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/GetEntityDto.cs diff --git a/src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/NavigationMetadataDto.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/NavigationMetadataDto.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/NavigationMetadataDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/NavigationMetadataDto.cs diff --git a/src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/PropertyMetadataDto.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/PropertyMetadataDto.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Metadata/GetEntityById/PropertyMetadataDto.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/GetEntityById/PropertyMetadataDto.cs diff --git a/src/Saritasa.NetForge.UseCases/Metadata/Services/AdminMetadataService.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/Services/AdminMetadataService.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Metadata/Services/AdminMetadataService.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Metadata/Services/AdminMetadataService.cs diff --git a/src/Saritasa.NetForge.UseCases/Services/EntityService.cs b/src/Saritasa.NetForge.Blazor/Domain/UseCases/Services/EntityService.cs similarity index 100% rename from src/Saritasa.NetForge.UseCases/Services/EntityService.cs rename to src/Saritasa.NetForge.Blazor/Domain/UseCases/Services/EntityService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IAdminOrmServiceProvider.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IAdminOrmServiceProvider.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IAdminOrmServiceProvider.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IAdminOrmServiceProvider.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IBlobStorageService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IBlobStorageService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IBlobStorageService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IBlobStorageService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/ICloudBlobStorageService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/ICloudBlobStorageService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/ICloudBlobStorageService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/ICloudBlobStorageService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IFileService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IFileService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IFileService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IFileService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IOrmDataService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IOrmDataService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IOrmDataService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IOrmDataService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IOrmMetadataService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IOrmMetadataService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.Abstractions/Interfaces/IOrmMetadataService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/Abstractions/Interfaces/IOrmMetadataService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreAdminServiceProvider.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreAdminServiceProvider.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreAdminServiceProvider.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreAdminServiceProvider.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreOptions.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreOptions.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreOptions.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreOptions.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreOptionsBuilder.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreOptionsBuilder.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/EfCoreOptionsBuilder.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/EfCoreOptionsBuilder.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/Extensions/AdminExtensions.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Extensions/AdminExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/Extensions/AdminExtensions.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Extensions/AdminExtensions.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/Extensions/DbContextExtensions.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Extensions/DbContextExtensions.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/Extensions/DbContextExtensions.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Extensions/DbContextExtensions.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreDataService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Services/EfCoreDataService.cs similarity index 100% rename from src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreDataService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Services/EfCoreDataService.cs diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreMetadataService.cs b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Services/EfCoreMetadataService.cs similarity index 98% rename from src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreMetadataService.cs rename to src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Services/EfCoreMetadataService.cs index 301f08ab..46e44f98 100644 --- a/src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreMetadataService.cs +++ b/src/Saritasa.NetForge.Blazor/Infrastructure/EfCore/Services/EfCoreMetadataService.cs @@ -7,7 +7,7 @@ namespace Saritasa.NetForge.Infrastructure.EfCore.Services; /// -internal class EfCoreMetadataService : IOrmMetadataService +public class EfCoreMetadataService : IOrmMetadataService { private readonly EfCoreOptions efCoreOptions; private readonly IServiceProvider serviceProvider; diff --git a/src/Saritasa.NetForge.Mvvm/Navigation/INavigationService.cs b/src/Saritasa.NetForge.Blazor/MVVM/Navigation/INavigationService.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/Navigation/INavigationService.cs rename to src/Saritasa.NetForge.Blazor/MVVM/Navigation/INavigationService.cs diff --git a/src/Saritasa.NetForge.Mvvm/Utils/DataFormatUtils.cs b/src/Saritasa.NetForge.Blazor/MVVM/Utils/DataFormatUtils.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/Utils/DataFormatUtils.cs rename to src/Saritasa.NetForge.Blazor/MVVM/Utils/DataFormatUtils.cs diff --git a/src/Saritasa.NetForge.Mvvm/Utils/ErrorMappingUtil.cs b/src/Saritasa.NetForge.Blazor/MVVM/Utils/ErrorMappingUtil.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/Utils/ErrorMappingUtil.cs rename to src/Saritasa.NetForge.Blazor/MVVM/Utils/ErrorMappingUtil.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/BaseViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/BaseViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/BaseViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/BaseViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/CreateEntity/CreateEntityModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/CreateEntity/CreateEntityModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/CreateEntity/CreateEntityModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/CreateEntity/CreateEntityModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/CreateEntity/CreateEntityViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/CreateEntity/CreateEntityViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/CreateEntity/CreateEntityViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/CreateEntity/CreateEntityViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/EditEntity/EditEntityModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EditEntity/EditEntityModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/EditEntity/EditEntityModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EditEntity/EditEntityModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/EditEntity/EditEntityViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EditEntity/EditEntityViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/EditEntity/EditEntityViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EditEntity/EditEntityViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/EntitiesViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntitiesViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/EntitiesViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntitiesViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/EntityDetails/EntityDetailsModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntityDetails/EntityDetailsModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/EntityDetails/EntityDetailsModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntityDetails/EntityDetailsModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/EntityDetails/EntityDetailsViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntityDetails/EntityDetailsViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/EntityDetails/EntityDetailsViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/EntityDetails/EntityDetailsViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/FieldErrorModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/FieldErrorModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/FieldErrorModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/FieldErrorModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/ValidationEntityViewModel.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/ValidationEntityViewModel.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/ValidationEntityViewModel.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/ValidationEntityViewModel.cs diff --git a/src/Saritasa.NetForge.Mvvm/ViewModels/ViewModelFactory.cs b/src/Saritasa.NetForge.Blazor/MVVM/ViewModels/ViewModelFactory.cs similarity index 100% rename from src/Saritasa.NetForge.Mvvm/ViewModels/ViewModelFactory.cs rename to src/Saritasa.NetForge.Blazor/MVVM/ViewModels/ViewModelFactory.cs diff --git a/src/Saritasa.NetForge.Blazor/Saritasa.NetForge.Blazor.csproj b/src/Saritasa.NetForge.Blazor/Saritasa.NetForge.Blazor.csproj index fef8fd48..705084d6 100644 --- a/src/Saritasa.NetForge.Blazor/Saritasa.NetForge.Blazor.csproj +++ b/src/Saritasa.NetForge.Blazor/Saritasa.NetForge.Blazor.csproj @@ -47,12 +47,24 @@ + + + + + + + + + + + + @@ -70,11 +82,14 @@ - - - - - + + + + + + + + diff --git a/src/Saritasa.NetForge.Domain/Saritasa.NetForge.Domain.csproj b/src/Saritasa.NetForge.Domain/Saritasa.NetForge.Domain.csproj deleted file mode 100644 index 663ee409..00000000 --- a/src/Saritasa.NetForge.Domain/Saritasa.NetForge.Domain.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - enable - enable - net6.0;net7.0;net8.0 - false - 0.1.0 - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - - - - - - - - - diff --git a/src/Saritasa.NetForge.DomainServices/Saritasa.NetForge.DomainServices.csproj b/src/Saritasa.NetForge.DomainServices/Saritasa.NetForge.DomainServices.csproj deleted file mode 100644 index 02ad6ee7..00000000 --- a/src/Saritasa.NetForge.DomainServices/Saritasa.NetForge.DomainServices.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - net6.0;net7.0;net8.0 - enable - enable - Library - false - 0.1.0 - - - embedded - - - embedded - - - embedded - - - embedded - - - embedded - - - embedded - - - - - - - - - - diff --git a/src/Saritasa.NetForge.Infrastructure.Abstractions/Saritasa.NetForge.Infrastructure.Abstractions.csproj b/src/Saritasa.NetForge.Infrastructure.Abstractions/Saritasa.NetForge.Infrastructure.Abstractions.csproj deleted file mode 100644 index 5d49b527..00000000 --- a/src/Saritasa.NetForge.Infrastructure.Abstractions/Saritasa.NetForge.Infrastructure.Abstractions.csproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - enable - enable - net6.0;net7.0;net8.0 - Saritasa.NetForge.Infrastructure.Abstractions - false - 0.1.0 - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - - - - - - - - - - - - - - diff --git a/src/Saritasa.NetForge.Infrastructure.EfCore/Saritasa.NetForge.Infrastructure.EfCore.csproj b/src/Saritasa.NetForge.Infrastructure.EfCore/Saritasa.NetForge.Infrastructure.EfCore.csproj deleted file mode 100644 index 511864af..00000000 --- a/src/Saritasa.NetForge.Infrastructure.EfCore/Saritasa.NetForge.Infrastructure.EfCore.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - enable - enable - net6.0;net7.0;net8.0 - false - 0.1.0 - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - - - - - - - - - - - - - - - - - - - - <_Parameter1>Saritasa.NetForge.Tests - - - diff --git a/src/Saritasa.NetForge.Mvvm/Saritasa.NetForge.Mvvm.csproj b/src/Saritasa.NetForge.Mvvm/Saritasa.NetForge.Mvvm.csproj deleted file mode 100644 index 6ceb8295..00000000 --- a/src/Saritasa.NetForge.Mvvm/Saritasa.NetForge.Mvvm.csproj +++ /dev/null @@ -1,48 +0,0 @@ - - - net6.0;net7.0;net8.0 - enable - enable - Library - false - 0.1.0 - - - embedded - - - embedded - - - embedded - - - embedded - - - embedded - - - embedded - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Saritasa.NetForge.Tests/Saritasa.NetForge.Tests.csproj b/src/Saritasa.NetForge.Tests/Saritasa.NetForge.Tests.csproj index a494d8a0..3ec2d921 100644 --- a/src/Saritasa.NetForge.Tests/Saritasa.NetForge.Tests.csproj +++ b/src/Saritasa.NetForge.Tests/Saritasa.NetForge.Tests.csproj @@ -30,7 +30,6 @@ - diff --git a/src/Saritasa.NetForge.UseCases/Saritasa.NetForge.UseCases.csproj b/src/Saritasa.NetForge.UseCases/Saritasa.NetForge.UseCases.csproj deleted file mode 100644 index ae654714..00000000 --- a/src/Saritasa.NetForge.UseCases/Saritasa.NetForge.UseCases.csproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - net6.0;net7.0;net8.0 - enable - false - 0.1.0 - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - embedded - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Saritasa.NetForge.sln b/src/Saritasa.NetForge.sln index d64a334a..6b9a27f3 100644 --- a/src/Saritasa.NetForge.sln +++ b/src/Saritasa.NetForge.sln @@ -3,30 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Domain", "Saritasa.NetForge.Domain\Saritasa.NetForge.Domain.csproj", "{2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Infrastructure.Abstractions", "Saritasa.NetForge.Infrastructure.Abstractions\Saritasa.NetForge.Infrastructure.Abstractions.csproj", "{811B15E4-19A0-49B0-AD2E-98787190D50B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Infrastructure.EfCore", "Saritasa.NetForge.Infrastructure.EfCore\Saritasa.NetForge.Infrastructure.EfCore.csproj", "{DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Demo", "..\demo\Saritasa.NetForge.Demo\Saritasa.NetForge.Demo.csproj", "{E7273DBF-A83A-4D0C-A1AF-A63D3069B685}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.UseCases", "Saritasa.NetForge.UseCases\Saritasa.NetForge.UseCases.csproj", "{41C5E508-3FE1-4359-9A4B-AD0F6237B4E9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{51D6022E-3DD7-4345-891C-711FA4B57FCA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{7D2CAD10-C8CC-48F2-992B-E2E52D9D8379}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{448B6392-162C-44AB-9E79-96666A994B84}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{6CF8C46F-4181-4D7C-929A-526F3D3B6845}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Blazor", "Saritasa.NetForge.Blazor\Saritasa.NetForge.Blazor.csproj", "{DC095BA1-A950-4432-A328-5FA75DBF03F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Mvvm", "Saritasa.NetForge.Mvvm\Saritasa.NetForge.Mvvm.csproj", "{354621B9-E572-4303-B58B-976F16918342}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.DomainServices", "Saritasa.NetForge.DomainServices\Saritasa.NetForge.DomainServices.csproj", "{45931B67-08DD-4192-B4D6-098452304DFD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5D2DF5E1-DF2A-491E-833B-F63D0E156F2C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saritasa.NetForge.Tests", "Saritasa.NetForge.Tests\Saritasa.NetForge.Tests.csproj", "{26BBDB9F-643A-487C-BAD5-2DD5748D276C}" @@ -51,38 +35,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7}.Release|Any CPU.Build.0 = Release|Any CPU - {811B15E4-19A0-49B0-AD2E-98787190D50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {811B15E4-19A0-49B0-AD2E-98787190D50B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {811B15E4-19A0-49B0-AD2E-98787190D50B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {811B15E4-19A0-49B0-AD2E-98787190D50B}.Release|Any CPU.Build.0 = Release|Any CPU - {DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE}.Release|Any CPU.Build.0 = Release|Any CPU {E7273DBF-A83A-4D0C-A1AF-A63D3069B685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E7273DBF-A83A-4D0C-A1AF-A63D3069B685}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7273DBF-A83A-4D0C-A1AF-A63D3069B685}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7273DBF-A83A-4D0C-A1AF-A63D3069B685}.Release|Any CPU.Build.0 = Release|Any CPU - {41C5E508-3FE1-4359-9A4B-AD0F6237B4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41C5E508-3FE1-4359-9A4B-AD0F6237B4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41C5E508-3FE1-4359-9A4B-AD0F6237B4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41C5E508-3FE1-4359-9A4B-AD0F6237B4E9}.Release|Any CPU.Build.0 = Release|Any CPU {DC095BA1-A950-4432-A328-5FA75DBF03F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DC095BA1-A950-4432-A328-5FA75DBF03F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {DC095BA1-A950-4432-A328-5FA75DBF03F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {DC095BA1-A950-4432-A328-5FA75DBF03F3}.Release|Any CPU.Build.0 = Release|Any CPU - {354621B9-E572-4303-B58B-976F16918342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {354621B9-E572-4303-B58B-976F16918342}.Debug|Any CPU.Build.0 = Debug|Any CPU - {354621B9-E572-4303-B58B-976F16918342}.Release|Any CPU.ActiveCfg = Release|Any CPU - {354621B9-E572-4303-B58B-976F16918342}.Release|Any CPU.Build.0 = Release|Any CPU - {45931B67-08DD-4192-B4D6-098452304DFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45931B67-08DD-4192-B4D6-098452304DFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45931B67-08DD-4192-B4D6-098452304DFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45931B67-08DD-4192-B4D6-098452304DFD}.Release|Any CPU.Build.0 = Release|Any CPU {26BBDB9F-643A-487C-BAD5-2DD5748D276C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {26BBDB9F-643A-487C-BAD5-2DD5748D276C}.Debug|Any CPU.Build.0 = Debug|Any CPU {26BBDB9F-643A-487C-BAD5-2DD5748D276C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -92,14 +52,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {2F6AA3E8-C95D-4463-9AE3-41C1C293CAD7} = {7D2CAD10-C8CC-48F2-992B-E2E52D9D8379} - {811B15E4-19A0-49B0-AD2E-98787190D50B} = {6CF8C46F-4181-4D7C-929A-526F3D3B6845} - {DF212AD9-94C1-48BA-9C70-4F5E08BC5EFE} = {6CF8C46F-4181-4D7C-929A-526F3D3B6845} {E7273DBF-A83A-4D0C-A1AF-A63D3069B685} = {51D6022E-3DD7-4345-891C-711FA4B57FCA} - {41C5E508-3FE1-4359-9A4B-AD0F6237B4E9} = {7D2CAD10-C8CC-48F2-992B-E2E52D9D8379} {DC095BA1-A950-4432-A328-5FA75DBF03F3} = {448B6392-162C-44AB-9E79-96666A994B84} - {354621B9-E572-4303-B58B-976F16918342} = {448B6392-162C-44AB-9E79-96666A994B84} - {45931B67-08DD-4192-B4D6-098452304DFD} = {7D2CAD10-C8CC-48F2-992B-E2E52D9D8379} {26BBDB9F-643A-487C-BAD5-2DD5748D276C} = {5D2DF5E1-DF2A-491E-833B-F63D0E156F2C} {A1EF2098-C576-488D-BABF-8C76685CAFBD} = {FFB9A65A-051F-4B09-9EA6-50DD7C1C462E} EndGlobalSection From 4533c6e7da2ea5cbc04a4c32ff25f25c88e274ff Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:00:02 +0700 Subject: [PATCH 2/6] Delete custom .nuspec SN-779 --- src/Saritasa.NetForge.Blazor/NetForge.nuspec | 74 -------------------- 1 file changed, 74 deletions(-) delete mode 100644 src/Saritasa.NetForge.Blazor/NetForge.nuspec diff --git a/src/Saritasa.NetForge.Blazor/NetForge.nuspec b/src/Saritasa.NetForge.Blazor/NetForge.nuspec deleted file mode 100644 index 5b3df30a..00000000 --- a/src/Saritasa.NetForge.Blazor/NetForge.nuspec +++ /dev/null @@ -1,74 +0,0 @@ - - - - Saritasa.NetForge - Saritasa.NetForge - NetForge - Admin Panel for ASP.NET Core 6,7,8 - 0.1.0 - The NetForge is a library that provides a user-friendly and intuitive user interface for performing CRUD operations on your database entities within your .NET applications. - Saritasa - Saritasa - LICENSE.txt - https://github.com/saritasa-nest/saritasa-forge-admin - false - (c) Saritasa, 2024 - admin autogenerated crud - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - icon.png - README.md - You can find changelog at https://github.com/saritasa-nest/saritasa-forge-admin/blob/develop/CHANGELOG.txt - - - - - - - - - - - - - - From a1738e019345c9e86305ed92e67c2a27ae2c0fb8 Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Sat, 2 Nov 2024 17:29:32 +0700 Subject: [PATCH 3/6] Update the path SN-779 --- .../Controls/CustomFields/CkEditorField.razor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Saritasa.NetForge.Blazor/Controls/CustomFields/CkEditorField.razor.js b/src/Saritasa.NetForge.Blazor/Controls/CustomFields/CkEditorField.razor.js index e89f7def..5efef045 100644 --- a/src/Saritasa.NetForge.Blazor/Controls/CustomFields/CkEditorField.razor.js +++ b/src/Saritasa.NetForge.Blazor/Controls/CustomFields/CkEditorField.razor.js @@ -1,4 +1,4 @@ -import "/_content/Saritasa.NetForge/ckeditor.js"; +import "../../ckeditor.js"; const timeouts = []; const editorConfig = { From c4bf3f7805e841e9e1a94d3a9c52a51e7780e24a Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Sat, 2 Nov 2024 18:08:03 +0700 Subject: [PATCH 4/6] Fix the culture in tests SN-779 --- .../Domain/Extensions/CloneExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs b/src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs index 6b09136f..a05f199b 100644 --- a/src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs +++ b/src/Saritasa.NetForge.Blazor/Domain/Extensions/CloneExtensions.cs @@ -67,6 +67,6 @@ public override decimal ReadJson( /// public override void WriteJson(JsonWriter writer, decimal value, JsonSerializer serializer) { - writer.WriteRawValue(value.ToString()); + writer.WriteValue(value.ToString(System.Globalization.CultureInfo.InvariantCulture)); } } From d4666a893b0c49515798dca739296724818a8953 Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Sat, 2 Nov 2024 18:10:33 +0700 Subject: [PATCH 5/6] Do not use custom .nuspec in CI SN-779 --- .github/workflows/pack-library.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/pack-library.yml b/.github/workflows/pack-library.yml index 01677266..23ad9507 100644 --- a/.github/workflows/pack-library.yml +++ b/.github/workflows/pack-library.yml @@ -44,12 +44,6 @@ jobs: file: "src/**/*.csproj" version: ${{ steps.getversion.outputs.version }} - - name: Update .nuspec version - uses: vers-one/dotnet-project-version-updater@v1.6 - with: - file: "src/Saritasa.NetForge.Blazor/NetForge.nuspec" - version: ${{ steps.getversion.outputs.version }} - - name: Restore Packages run: dotnet restore src/Saritasa.NetForge.sln @@ -57,7 +51,7 @@ jobs: run: dotnet build src/Saritasa.NetForge.sln - name: Pack NetForge - run: dotnet pack /p:NuspecFile=NetForge.nuspec --output ../artifacts + run: dotnet pack --output ../artifacts working-directory: src - name: Upload Release From 11c002c8b6e0a571388ef2250385335097d90e74 Mon Sep 17 00:00:00 2001 From: Vasily Chefonov <81791194+vasiliy-chefonov@users.noreply.github.com> Date: Sat, 2 Nov 2024 18:12:25 +0700 Subject: [PATCH 6/6] Bump version SN-779 --- CHANGELOG.txt | 5 ++++- VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 606a94fe..5e3210da 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -21,4 +21,7 @@ [*] Change way of displaying navigation details on List View page. 0.4.3-alpha [2024-10-17] -[*] Fix problem with displaying not included navigation's properties. \ No newline at end of file +[*] Fix problem with displaying not included navigation's properties. + +0.4.4-alpha [2024-11-02] +[*] Fix importing static files. \ No newline at end of file diff --git a/VERSION.txt b/VERSION.txt index 395ecced..5eccd698 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.4.3-alpha \ No newline at end of file +0.4.4-alpha \ No newline at end of file