From f8c9a8aec455a2e9af0286a673d51bcfdcc6c924 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 9 Aug 2023 11:15:11 +0300 Subject: [PATCH 1/7] Convert CmsKit Unified project to MongoDB --- .../CmsKitWebUnifiedModule.cs | 60 +++++-- .../EntityFrameworkCore/UnifiedDbContext.cs | 5 +- .../UnifiedDbContextFactory.cs | 4 +- .../MonbgoDB/UnifiedDbContext.cs | 33 ++++ .../Volo.CmsKit.Web.Unified.csproj | 146 ++++++++++-------- .../Volo.CmsKit.Web.Unified/appsettings.json | 3 +- 6 files changed, 167 insertions(+), 84 deletions(-) create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/MonbgoDB/UnifiedDbContext.cs diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index f4f746a61d..585a47c127 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -10,34 +10,24 @@ using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; -using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.Autofac; -using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.Data; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.FeatureManagement; -using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; -using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Identity.Web; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; -using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; -using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; -using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.Web; using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; using Volo.CmsKit.Admin.Web; using Volo.CmsKit.Comments; -using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.MediaDescriptors; using Volo.CmsKit.MultiTenancy; using Volo.CmsKit.Public.Web; @@ -47,39 +37,73 @@ using Volo.CmsKit.Tags; using Volo.CmsKit.Web; using Volo.CmsKit.Web.Contents; +#if EntityFrameworkCore +using Volo.Abp.SettingManagement.EntityFrameworkCore; +using Volo.Abp.TenantManagement.EntityFrameworkCore; +using Volo.Abp.Identity.EntityFrameworkCore; +using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.FeatureManagement.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.SqlServer; +using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; +using Volo.CmsKit.EntityFrameworkCore; +using Volo.Abp.AuditLogging.EntityFrameworkCore; +#elif MongoDB +using Volo.Abp.SettingManagement.MongoDB; +using Volo.Abp.TenantManagement.MongoDB; +using Volo.Abp.Identity.MongoDB; +using Volo.Abp.PermissionManagement.MongoDB; +using Volo.Abp.FeatureManagement.MongoDB; +using Volo.Abp.MongoDB; +using Volo.Abp.BlobStoring.Database.MongoDB; +using Volo.Abp.AuditLogging.MongoDB; +using Volo.CmsKit.MongoDB; +#endif + namespace Volo.CmsKit; [DependsOn( typeof(CmsKitWebModule), typeof(CmsKitApplicationModule), typeof(CmsKitHttpApiModule), +#if EntityFrameworkCore typeof(CmsKitEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), + typeof(AbpEntityFrameworkCoreSqlServerModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule), + typeof(AbpPermissionManagementEntityFrameworkCoreModule), + typeof(AbpIdentityEntityFrameworkCoreModule), + typeof(AbpFeatureManagementEntityFrameworkCoreModule), + typeof(AbpTenantManagementEntityFrameworkCoreModule), + typeof(BlobStoringDatabaseEntityFrameworkCoreModule), +#elif MongoDB + typeof(CmsKitMongoDbModule), + typeof(AbpAuditLoggingMongoDbModule), + typeof(AbpSettingManagementMongoDbModule), + typeof(AbpPermissionManagementMongoDbModule), + typeof(AbpIdentityMongoDbModule), + typeof(AbpFeatureManagementMongoDbModule), + typeof(AbpTenantManagementMongoDbModule), + typeof(BlobStoringDatabaseMongoDbModule), +#endif typeof(AbpAutofacModule), typeof(AbpAccountWebModule), typeof(AbpAccountApplicationModule), typeof(AbpAccountHttpApiModule), - typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(AbpSettingManagementEntityFrameworkCoreModule), - typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpPermissionManagementApplicationModule), typeof(AbpPermissionManagementHttpApiModule), typeof(AbpIdentityWebModule), typeof(AbpIdentityApplicationModule), typeof(AbpIdentityHttpApiModule), - typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpPermissionManagementDomainIdentityModule), typeof(AbpFeatureManagementApplicationModule), typeof(AbpFeatureManagementHttpApiModule), - typeof(AbpFeatureManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementWebModule), typeof(AbpTenantManagementWebModule), typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementHttpApiModule), - typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpAspNetCoreSerilogModule), - typeof(BlobStoringDatabaseEntityFrameworkCoreModule), typeof(AbpSwashbuckleModule) )] public class CmsKitWebUnifiedModule : AbpModule @@ -95,10 +119,12 @@ public class CmsKitWebUnifiedModule : AbpModule ConfigureCmsKit(); +#if EntityFrameworkCore Configure(options => { options.UseSqlServer(); }); +#endif if (hostingEnvironment.IsDevelopment()) { diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs index 9109a772ed..cef51b6af3 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +#if EntityFrameworkCore +using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; @@ -10,6 +11,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore; namespace Volo.CmsKit.EntityFrameworkCore; +[ConnectionStringName("SqlServerDefault")] public class UnifiedDbContext : AbpDbContext { public UnifiedDbContext(DbContextOptions options) @@ -32,3 +34,4 @@ public class UnifiedDbContext : AbpDbContext modelBuilder.ConfigureBlobStoring(); } } +#endif diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs index 156a6f8ba9..481351e453 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs @@ -1,4 +1,5 @@ -using System.IO; +#if EntityFrameworkCore +using System.IO; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; @@ -28,3 +29,4 @@ public class UnifiedDbContextFactory : IDesignTimeDbContextFactory + - - net7.0 - Volo.CmsKit - true - Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 - + + net7.0 + Volo.CmsKit + true + Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 + $(DefineConstants);MongoDB + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - Public.cshtml - - + + + + + + + + + + + + - - - Always - - - Always - - + + + + + + + + + + + + + + + + + + + + + Public.cshtml + + + + + + Always + + + Always + + diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json index d351388ffd..beaba507ac 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json @@ -1,5 +1,6 @@ { "ConnectionStrings": { - "Default": "Server=(localdb)\\MSSQLLocalDB;Database=CmsKit_Unified;Trusted_Connection=True;TrustServerCertificate=True" + "SqlServerDefault": "Server=(localdb)\\MSSQLLocalDB;Database=CmsKit_Unified;Trusted_Connection=True;TrustServerCertificate=True", + "Default": "mongodb://localhost:27017/CmsKit_Unified" } } From d1ee37777d0117b163dc72c693ec85fbc11be775 Mon Sep 17 00:00:00 2001 From: Salih Date: Wed, 9 Aug 2023 12:08:10 +0300 Subject: [PATCH 2/7] Fix Tag Filter --- .../MongoDB/Blogs/MongoBlogPostRepository.cs | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index 785ce2ec73..51a9117258 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -53,14 +53,10 @@ public class MongoBlogPostRepository : MongoDbRepository entityIdFilters = null; - if (tagId.HasValue) - { - entityIdFilters = await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken); - } + var entityIdFilters = await GetEntityIdsByTagId(tagId, cancellationToken); return await (await GetMongoQueryableAsync(cancellationToken)) - .WhereIf>(entityIdFilters != null, x => entityIdFilters.Contains(x.Id.ToString())) + .WhereIf>(entityIdFilters.Any(), x => entityIdFilters.Contains(x.Id)) .WhereIf>(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)) .WhereIf>(blogId.HasValue, x => x.BlogId == blogId) .WhereIf>(authorId.HasValue, x => x.AuthorId == authorId) @@ -83,16 +79,12 @@ public class MongoBlogPostRepository : MongoDbRepository entityIdFilters = null; - if (tagId.HasValue) - { - entityIdFilters = await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken); - } - + var entityIdFilters = await GetEntityIdsByTagId(tagId, cancellationToken); + var usersQueryable = dbContext.Collection().AsQueryable(); var queryable = blogPostQueryable - .WhereIf(entityIdFilters != null, x => entityIdFilters.Contains(x.Id.ToString())) + .WhereIf(entityIdFilters.Any(), x => entityIdFilters.Contains(x.Id)) .WhereIf(blogId.HasValue, x => x.BlogId == blogId) .WhereIf(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)) .WhereIf(authorId.HasValue, x => x.AuthorId == authorId) @@ -118,6 +110,28 @@ public class MongoBlogPostRepository : MongoDbRepository> GetEntityIdsByTagId(Guid? tagId, CancellationToken cancellationToken) + { + var entityIdFilters = new List(); + if (!tagId.HasValue) + { + return entityIdFilters; + } + + var entityIds = + await _entityTagManager.GetEntityIdsFilteredByTagAsync(tagId.Value, CurrentTenant.Id, cancellationToken); + + foreach (var entityId in entityIds) + { + if (Guid.TryParse(entityId, out var guid)) + { + entityIdFilters.Add(guid); + } + } + + return entityIdFilters; + } + public virtual async Task SlugExistsAsync(Guid blogId, [NotNull] string slug, CancellationToken cancellationToken = default) { From b2ee716b8cf7f9406cf7040cf305b5262454fed2 Mon Sep 17 00:00:00 2001 From: Salih Date: Wed, 9 Aug 2023 13:21:55 +0300 Subject: [PATCH 3/7] Update UnifiedDbContext.cs --- .../{MonbgoDB => MongoDB}/UnifiedDbContext.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/{MonbgoDB => MongoDB}/UnifiedDbContext.cs (91%) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MonbgoDB/UnifiedDbContext.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs similarity index 91% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/MonbgoDB/UnifiedDbContext.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs index 78b1e09709..c998f103f5 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MonbgoDB/UnifiedDbContext.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs @@ -1,5 +1,4 @@ #if MongoDB -using System.Reflection.Emit; using Volo.Abp.AuditLogging.MongoDB; using Volo.Abp.BlobStoring.Database.MongoDB; using Volo.Abp.Data; @@ -9,9 +8,8 @@ using Volo.Abp.MongoDB; using Volo.Abp.PermissionManagement.MongoDB; using Volo.Abp.SettingManagement.MongoDB; using Volo.Abp.TenantManagement.MongoDB; -using Volo.CmsKit.MongoDB; -namespace Volo.CmsKit.MonbgoDB; +namespace Volo.CmsKit.MongoDB; [ConnectionStringName("MongoDBDefault")] public class UnifiedDbContext : AbpMongoDbContext From 3ca026ad0f290cac55ab7dd4840b12d8aa51a125 Mon Sep 17 00:00:00 2001 From: Salih Date: Wed, 9 Aug 2023 13:22:49 +0300 Subject: [PATCH 4/7] Update MongoBlogPostRepository.cs --- .../Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index 51a9117258..d3ae31926b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -123,9 +123,9 @@ public class MongoBlogPostRepository : MongoDbRepository Date: Wed, 9 Aug 2023 13:34:43 +0300 Subject: [PATCH 5/7] Update UnifiedDbContext.cs --- .../host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs index c998f103f5..45316705b4 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/MongoDB/UnifiedDbContext.cs @@ -1,7 +1,6 @@ #if MongoDB using Volo.Abp.AuditLogging.MongoDB; using Volo.Abp.BlobStoring.Database.MongoDB; -using Volo.Abp.Data; using Volo.Abp.FeatureManagement.MongoDB; using Volo.Abp.Identity.MongoDB; using Volo.Abp.MongoDB; @@ -11,7 +10,6 @@ using Volo.Abp.TenantManagement.MongoDB; namespace Volo.CmsKit.MongoDB; -[ConnectionStringName("MongoDBDefault")] public class UnifiedDbContext : AbpMongoDbContext { protected override void CreateModel(IMongoModelBuilder modelBuilder) From 7128033f9201c7cd9f3a8fcd290362a6bc427e13 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 9 Aug 2023 14:18:03 +0300 Subject: [PATCH 6/7] Use separate appsettings for MongoDb --- .../Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs | 1 + .../EntityFrameworkCore/UnifiedDbContext.cs | 2 +- modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs | 8 ++++++++ .../host/Volo.CmsKit.Web.Unified/appsettings.MongoDB.json | 5 +++++ .../cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json | 3 +-- 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.MongoDB.json diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 585a47c127..0ab0ae4d6d 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -120,6 +120,7 @@ public class CmsKitWebUnifiedModule : AbpModule ConfigureCmsKit(); #if EntityFrameworkCore + context.Services.AddDbContext(); Configure(options => { options.UseSqlServer(); diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs index cef51b6af3..9770d8ea1c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/EntityFrameworkCore/UnifiedDbContext.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; +using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore; @@ -11,7 +12,6 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore; namespace Volo.CmsKit.EntityFrameworkCore; -[ConnectionStringName("SqlServerDefault")] public class UnifiedDbContext : AbpDbContext { public UnifiedDbContext(DbContextOptions options) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs index 0c1ab52b43..22ea35327e 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -38,6 +39,13 @@ public class Program internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) + .AddAppSettingsSecretsJson() +#if MongoDB + .ConfigureAppConfiguration(options => + { + options.AddJsonFile("appsettings.MongoDB.json"); + }) +#endif .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.MongoDB.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.MongoDB.json new file mode 100644 index 0000000000..73fc167f65 --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.MongoDB.json @@ -0,0 +1,5 @@ +{ + "ConnectionStrings": { + "Default": "mongodb://localhost:27017/CmsKit_Unified" + } +} \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json index beaba507ac..d351388ffd 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/appsettings.json @@ -1,6 +1,5 @@ { "ConnectionStrings": { - "SqlServerDefault": "Server=(localdb)\\MSSQLLocalDB;Database=CmsKit_Unified;Trusted_Connection=True;TrustServerCertificate=True", - "Default": "mongodb://localhost:27017/CmsKit_Unified" + "Default": "Server=(localdb)\\MSSQLLocalDB;Database=CmsKit_Unified;Trusted_Connection=True;TrustServerCertificate=True" } } From d4967779d8cca000d9e0d6df86161ca29107e5ad Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 9 Aug 2023 14:19:10 +0300 Subject: [PATCH 7/7] Revert formatting on csproj --- .../Volo.CmsKit.Web.Unified.csproj | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj index 8c0f979e3e..8ad50d3b05 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj @@ -1,89 +1,89 @@  - - net7.0 - Volo.CmsKit - true - Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 - $(DefineConstants);MongoDB - + + net7.0 + Volo.CmsKit + true + Volo.CmsKit-c2d31439-b723-48e2-b061-5ebd7aeb6010 + $(DefineConstants);MongoDB + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - Public.cshtml - - + + + - - - Always - - - Always - - + + + + + + + Public.cshtml + + + + + + Always + + + Always + +