Skip to content

Commit 4c746a3

Browse files
MansurBesleneyMansurBesleney
committed
Update to .net10 preview and replaced AutoMapper with Mapperly
1 parent 68770f9 commit 4c746a3

26 files changed

+300
-347
lines changed

‎ModularCRM/ModularCrm.abpmdl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
"template": "app-nolayers",
33
"imports": {
44
"Volo.Abp.LeptonXLiteTheme": {
5-
"version": "4.2.0",
5+
"version": "5.0.0-rc.1",
66
"isInstalled": true
77
},
88
"Volo.Abp.Account": {
9-
"version": "9.2.0",
9+
"version": "10.0.0-rc.1",
1010
"isInstalled": true
1111
},
1212
"Volo.Abp.OpenIddict": {
13-
"version": "9.2.0",
13+
"version": "10.0.0-rc.1",
1414
"isInstalled": true
1515
},
1616
"Volo.Abp.Identity": {
17-
"version": "9.2.0",
17+
"version": "10.0.0-rc.1",
1818
"isInstalled": true
1919
},
2020
"Volo.Abp.TenantManagement": {
21-
"version": "9.2.0",
21+
"version": "10.0.0-rc.1",
2222
"isInstalled": true
2323
},
2424
"Volo.Abp.SettingManagement": {
25-
"version": "9.2.0",
25+
"version": "10.0.0-rc.1",
2626
"isInstalled": true
2727
},
2828
"Volo.Abp.PermissionManagement": {
29-
"version": "9.2.0",
29+
"version": "10.0.0-rc.1",
3030
"isInstalled": true
3131
},
3232
"Volo.Abp.FeatureManagement": {
33-
"version": "9.2.0",
33+
"version": "10.0.0-rc.1",
3434
"isInstalled": true
3535
},
3636
"ModularCrm.Catalog": {

‎ModularCRM/ModularCrm/ModularCrm.csproj‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1212
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
13-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.4" />
13+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-rc.1.25451.107" />
1414
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
1515
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
1616
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
@@ -20,64 +20,64 @@
2020
<ProjectReference Include="../modules/modularcrm.ordering/ModularCrm.Ordering.UI/ModularCrm.Ordering.UI.csproj" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.2.0" />
24-
<PackageReference Include="Volo.Abp.Autofac" Version="9.2.0" />
25-
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.2.0" />
26-
<PackageReference Include="Volo.Abp.Swashbuckle" Version="9.2.0" />
27-
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="9.2.0" />
23+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.0.0-rc.1" />
24+
<PackageReference Include="Volo.Abp.Autofac" Version="10.0.0-rc.1" />
25+
<PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0-rc.1" />
26+
<PackageReference Include="Volo.Abp.Swashbuckle" Version="10.0.0-rc.1" />
27+
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="10.0.0-rc.1" />
2828
</ItemGroup>
2929
<ItemGroup>
30-
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="9.2.0" />
31-
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="9.2.0" />
32-
<PackageReference Include="Volo.Abp.Account.Application" Version="9.2.0" />
30+
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="10.0.0-rc.1" />
31+
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="10.0.0-rc.1" />
32+
<PackageReference Include="Volo.Abp.Account.Application" Version="10.0.0-rc.1" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.2.0" />
36-
<PackageReference Include="Volo.Abp.Identity.Web" Version="9.2.0" />
37-
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="9.2.0" />
38-
<PackageReference Include="Volo.Abp.Identity.Application" Version="9.2.0" />
35+
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="10.0.0-rc.1" />
36+
<PackageReference Include="Volo.Abp.Identity.Web" Version="10.0.0-rc.1" />
37+
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="10.0.0-rc.1" />
38+
<PackageReference Include="Volo.Abp.Identity.Application" Version="10.0.0-rc.1" />
3939
</ItemGroup>
4040
<ItemGroup>
41-
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="9.2.0" />
42-
<PackageReference Include="Volo.Abp.PermissionManagement.Web" Version="9.2.0" />
43-
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="9.2.0" />
44-
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="9.2.0" />
41+
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="10.0.0-rc.1" />
42+
<PackageReference Include="Volo.Abp.PermissionManagement.Web" Version="10.0.0-rc.1" />
43+
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="10.0.0-rc.1" />
44+
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="10.0.0-rc.1" />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="9.2.0" />
48-
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="9.2.0" />
49-
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="9.2.0" />
47+
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="10.0.0-rc.1" />
48+
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="10.0.0-rc.1" />
49+
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="10.0.0-rc.1" />
5050
</ItemGroup>
5151
<ItemGroup>
52-
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="9.2.0" />
53-
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="9.2.0" />
54-
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="9.2.0" />
52+
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="10.0.0-rc.1" />
53+
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="10.0.0-rc.1" />
54+
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="10.0.0-rc.1" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="9.2.0" />
58-
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="9.2.0" />
59-
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.2.0" />
57+
<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="10.0.0-rc.1" />
58+
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="10.0.0-rc.1" />
59+
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.0.0-rc.1" />
6060
</ItemGroup>
6161
<ItemGroup>
62-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.2.0" />
62+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.0.0-rc.1" />
6363
</ItemGroup>
6464
<ItemGroup>
65-
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.2.0" />
66-
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="9.2.0" />
67-
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="9.2.0" />
68-
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.2.0" />
69-
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="9.2.0" />
70-
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="9.2.0" />
71-
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.2.0" />
72-
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.2.0" />
73-
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.2.0" />
74-
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="9.2.0" />
65+
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="10.0.0-rc.1" />
66+
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="10.0.0-rc.1" />
67+
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="10.0.0-rc.1" />
68+
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="10.0.0-rc.1" />
69+
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="10.0.0-rc.1" />
70+
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="10.0.0-rc.1" />
71+
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="10.0.0-rc.1" />
72+
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="10.0.0-rc.1" />
73+
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="10.0.0-rc.1" />
74+
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1" />
7575
</ItemGroup>
7676
<ItemGroup>
77-
<PackageReference Include="Volo.Abp.Studio.Client.AspNetCore" Version="1.0.1" />
77+
<PackageReference Include="Volo.Abp.Studio.Client.AspNetCore" Version="1.3.3" />
7878
</ItemGroup>
7979
<ItemGroup>
80-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
80+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107">
8181
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
8282
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
8383
</PackageReference>

‎ModularCRM/ModularCrm/ModularCrmModule.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
2525
using Volo.Abp.AspNetCore.Serilog;
2626
using Volo.Abp.Autofac;
27-
using Volo.Abp.AutoMapper;
2827
using Volo.Abp.Caching;
2928
using Volo.Abp.FeatureManagement;
3029
using Volo.Abp.Identity;
@@ -64,14 +63,15 @@
6463
using Volo.Abp.FeatureManagement.EntityFrameworkCore;
6564
using Volo.Abp.EntityFrameworkCore.SqlServer;
6665
using Volo.Abp.Studio.Client.AspNetCore;
66+
using Volo.Abp.Mapperly;
6767

6868
namespace ModularCrm;
6969

7070
[DependsOn(
7171
// ABP Framework packages
7272
typeof(AbpAspNetCoreMvcModule),
7373
typeof(AbpAutofacModule),
74-
typeof(AbpAutoMapperModule),
74+
typeof(AbpMapperlyModule),
7575
typeof(AbpCachingModule),
7676
typeof(AbpSwashbuckleModule),
7777
typeof(AbpAspNetCoreSerilogModule),
@@ -190,7 +190,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
190190
ConfigureUrls(configuration);
191191
ConfigureBundles();
192192
ConfigureHealthChecks(context);
193-
ConfigureAutoMapper(context);
193+
ConfigureMapperly(context);
194194
ConfigureSwagger(context.Services);
195195
ConfigureAutoApiControllers();
196196
ConfigureVirtualFiles(hostingEnvironment);
@@ -330,17 +330,9 @@ private void ConfigureSwagger(IServiceCollection services)
330330
);
331331
}
332332

333-
private void ConfigureAutoMapper(ServiceConfigurationContext context)
333+
private void ConfigureMapperly(ServiceConfigurationContext context)
334334
{
335-
context.Services.AddAutoMapperObjectMapper<ModularCrmModule>();
336-
Configure<AbpAutoMapperOptions>(options =>
337-
{
338-
/* Uncomment `validate: true` if you want to enable the Configuration Validation feature.
339-
* See AutoMapper's documentation to learn what it is:
340-
* https://docs.automapper.org/en/stable/Configuration-validation.html
341-
*/
342-
options.AddMaps<ModularCrmModule>(/* validate: true */);
343-
});
335+
context.Services.AddMapperlyObjectMapper<ModularCrmModule>();
344336
}
345337

346338

‎ModularCRM/ModularCrm/ObjectMapping/ModularCrmAutoMapperProfile.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ModularCRM/ModularCrm/ObjectMapping/ModularCrmMappers.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
namespace ModularCrm.ObjectMapping;
2+
3+
/* Create your Mapperly object mappings here */

‎ModularCRM/ModularCrm/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"name": "my-app",
44
"private": true,
55
"dependencies": {
6-
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~4.2.0"
6+
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.0.0-rc.1"
77
}
8-
}
8+
}

0 commit comments

Comments
 (0)