Skip to content

Upgrade to ABP 9.2.0. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 42 additions & 53 deletions src/CmsKitDemo/CmsKitDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,106 +1,98 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="9.0.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.0.4" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="9.0.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="9.0.4" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Autofac" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Account.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="9.0.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="9.0.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="9.0.4" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="9.0.4" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.0.4" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="9.0.4" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="9.0.4" />
<PackageReference Include="Volo.CmsKit.Application" Version="9.0.4" />
<PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="9.0.4" />
<PackageReference Include="Volo.CmsKit.HttpApi" Version="9.0.4" />
<PackageReference Include="Volo.CmsKit.Web" Version="9.0.4" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.CmsKit.Application" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.CmsKit.HttpApi" Version="9.2.0-rc.3" />
<PackageReference Include="Volo.CmsKit.Web" Version="9.2.0-rc.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Content Remove="Localization\CmsKitDemo\*.json" />
<EmbeddedResource Include="Localization\CmsKitDemo\*.json" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Logs\**" />
<Content Remove="Logs\**" />
Expand All @@ -110,7 +102,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<None Update="Pages\**\*.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -119,9 +110,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
</ItemGroup>

</Project>
Binary file modified src/CmsKitDemo/CmsKitDemoDb/CmsKitDemo.db
Binary file not shown.
12 changes: 8 additions & 4 deletions src/CmsKitDemo/Data/EfCoreBlogPostRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Volo.Abp.EntityFrameworkCore;
using Volo.CmsKit.Blogs;
using Volo.CmsKit.EntityFrameworkCore;
using Volo.CmsKit.MarkedItems;
using Volo.CmsKit.Tags;
using Volo.CmsKit.Users;

Expand All @@ -15,10 +16,12 @@ namespace CmsKitDemo.Data;
public class CmsKitDemoEfCoreBlogPostRepository : EfCoreBlogPostRepository
{
private readonly EntityTagManager _entityTagManager;

public CmsKitDemoEfCoreBlogPostRepository(
IDbContextProvider<ICmsKitDbContext> dbContextProvider,
EntityTagManager entityTagManager) : base(dbContextProvider, entityTagManager)
IDbContextProvider<ICmsKitDbContext> dbContextProvider,
MarkedItemManager markedItemManager,
EntityTagManager entityTagManager)
: base(dbContextProvider, markedItemManager, entityTagManager)
{
_entityTagManager = entityTagManager;
}
Expand All @@ -28,6 +31,7 @@ public override async Task<List<BlogPost>> GetListAsync(
Guid? blogId = null,
Guid? authorId = null,
Guid? tagId = null,
Guid? favoriteUserId = null,
BlogPostStatus? statusFilter = null,
int maxResultCount = int.MaxValue,
int skipCount = 0,
Expand Down Expand Up @@ -69,4 +73,4 @@ public override async Task<List<BlogPost>> GetListAsync(
return s.blogPost;
}).ToList();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using Volo.Abp.Identity.Settings;
using Volo.Abp.Settings;

namespace CmsKitDemo.Identity;

public class ChangeIdentityPasswordPolicySettingDefinitionProvider : SettingDefinitionProvider
{
public override void Define(ISettingDefinitionContext context)
{
var requireNonAlphanumeric = context.GetOrNull(IdentitySettingNames.Password.RequireNonAlphanumeric);
if (requireNonAlphanumeric != null)
{
requireNonAlphanumeric.DefaultValue = false.ToString();
}

var requireLowercase = context.GetOrNull(IdentitySettingNames.Password.RequireLowercase);
if (requireLowercase != null)
{
requireLowercase.DefaultValue = false.ToString();
}

var requireUppercase = context.GetOrNull(IdentitySettingNames.Password.RequireUppercase);
if (requireUppercase != null)
{
requireUppercase.DefaultValue = false.ToString();
}

var requireDigit = context.GetOrNull(IdentitySettingNames.Password.RequireDigit);
if (requireDigit != null)
{
requireDigit.DefaultValue = false.ToString();
}
}
}
Loading