Skip to content

Commit 3ee26f5

Browse files
MansurBesleneyMansurBesleney
committed
update back to .net10 and abp10 rc
1 parent d37573d commit 3ee26f5

File tree

26 files changed

+333
-318
lines changed

26 files changed

+333
-318
lines changed

‎BookStore-Blazor-EfCore/Acme.BookStore.abpmdl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@
22
"template": "app",
33
"imports": {
44
"Volo.Abp.LeptonXLiteTheme": {
5-
"version": "4.3.5",
5+
"version": "5.0.0-rc.1",
66
"isInstalled": true
77
},
88
"Volo.Abp.Account": {
9-
"version": "9.3.5",
9+
"version": "10.0.0-rc.1",
1010
"isInstalled": true,
1111
"creationTime": "10/13/2025 08:07:54 +00:00"
1212
},
1313
"Volo.Abp.OpenIddict": {
14-
"version": "9.3.5",
14+
"version": "10.0.0-rc.1",
1515
"isInstalled": true,
1616
"creationTime": "10/13/2025 08:07:54 +00:00"
1717
},
1818
"Volo.Abp.Identity": {
19-
"version": "9.3.5",
19+
"version": "10.0.0-rc.1",
2020
"isInstalled": true,
2121
"creationTime": "10/13/2025 08:07:54 +00:00"
2222
},
2323
"Volo.Abp.TenantManagement": {
24-
"version": "9.3.5",
24+
"version": "10.0.0-rc.1",
2525
"isInstalled": true,
2626
"creationTime": "10/13/2025 08:07:54 +00:00"
2727
},
2828
"Volo.Abp.SettingManagement": {
29-
"version": "9.3.5",
29+
"version": "10.0.0-rc.1",
3030
"isInstalled": true,
3131
"creationTime": "10/13/2025 08:07:54 +00:00"
3232
},
3333
"Volo.Abp.PermissionManagement": {
34-
"version": "9.3.5",
34+
"version": "10.0.0-rc.1",
3535
"isInstalled": true,
3636
"creationTime": "10/13/2025 08:07:54 +00:00"
3737
},
3838
"Volo.Abp.FeatureManagement": {
39-
"version": "9.3.5",
39+
"version": "10.0.0-rc.1",
4040
"isInstalled": true,
4141
"creationTime": "10/13/2025 08:07:54 +00:00"
4242
}

‎BookStore-Blazor-EfCore/global.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk" : {
3+
"version": "10.0.0",
4+
"rollForward": "latestMinor",
5+
"allowPrerelease": true
6+
}
7+
}

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<RootNamespace>Acme.BookStore</RootNamespace>
99
</PropertyGroup>
@@ -13,12 +13,12 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="9.3.5" />
17-
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="9.3.5" />
18-
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="9.3.5" />
19-
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="9.3.5" />
20-
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="9.3.5" />
21-
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="9.3.5" />
16+
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="10.0.0-rc.1" />
17+
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="10.0.0-rc.1" />
18+
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="10.0.0-rc.1" />
19+
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="10.0.0-rc.1" />
20+
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="10.0.0-rc.1" />
21+
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="10.0.0-rc.1" />
2222
</ItemGroup>
2323

2424
</Project>

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<RootNamespace>Acme.BookStore</RootNamespace>
99
</PropertyGroup>
@@ -14,12 +14,12 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="9.3.5" />
18-
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="9.3.5" />
19-
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.3.5" />
20-
<PackageReference Include="Volo.Abp.Account.Application" Version="9.3.5" />
21-
<PackageReference Include="Volo.Abp.Identity.Application" Version="9.3.5" />
22-
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="9.3.5" />
17+
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="10.0.0-rc.1" />
18+
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="10.0.0-rc.1" />
19+
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.0.0-rc.1" />
20+
<PackageReference Include="Volo.Abp.Account.Application" Version="10.0.0-rc.1" />
21+
<PackageReference Include="Volo.Abp.Identity.Application" Version="10.0.0-rc.1" />
22+
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="10.0.0-rc.1" />
2323
</ItemGroup>
2424

2525
</Project>

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Application/BookStoreApplicationAutoMapperProfile.cs‎

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

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Application/BookStoreApplicationMappers.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using Acme.BookStore.Authors;
2+
using Acme.BookStore.Books;
3+
using Riok.Mapperly.Abstractions;
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Text;
7+
using Volo.Abp.Mapperly;
8+
9+
namespace Acme.BookStore;
10+
11+
[Mapper]
12+
public partial class BookToBookDtoMapper : MapperBase<Book, BookDto>
13+
{
14+
public override partial BookDto Map(Book source);
15+
16+
public override partial void Map(Book source, BookDto destination);
17+
}
18+
19+
[Mapper]
20+
public partial class CreateUpdateBookDtoToBookMapper : MapperBase<CreateUpdateBookDto, Book>
21+
{
22+
public override partial Book Map(CreateUpdateBookDto source);
23+
public override partial void Map(CreateUpdateBookDto source, Book destination);
24+
}
25+
26+
[Mapper]
27+
public partial class AuthorToAuthorDtoMapper : MapperBase<Author, AuthorDto>
28+
{
29+
public override partial AuthorDto Map(Author source);
30+
public override partial void Map(Author source, AuthorDto destination);
31+
}
32+
33+
[Mapper]
34+
public partial class AuthorToAuthorLookupDtoMapper : MapperBase<Author, AuthorLookupDto>
35+
{
36+
public override partial AuthorLookupDto Map(Author source);
37+
public override partial void Map(Author source, AuthorLookupDto destination);
38+
}

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Volo.Abp.SettingManagement;
33
using Volo.Abp.Account;
44
using Volo.Abp.Identity;
5-
using Volo.Abp.AutoMapper;
65
using Volo.Abp.FeatureManagement;
76
using Volo.Abp.Modularity;
87
using Volo.Abp.TenantManagement;
@@ -23,9 +22,6 @@ public class BookStoreApplicationModule : AbpModule
2322
{
2423
public override void ConfigureServices(ServiceConfigurationContext context)
2524
{
26-
Configure<AbpAutoMapperOptions>(options =>
27-
{
28-
options.AddMaps<BookStoreApplicationModule>();
29-
});
25+
3026
}
3127
}

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Blazor.Client/Acme.BookStore.Blazor.Client.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.1" />
13-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.1" />
14-
<PackageReference Include="Blazorise.Components" Version="1.8.1" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" />
12+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
13+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
14+
<PackageReference Include="Blazorise.Components" Version="1.8.3" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.1.25451.107" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.1.25451.107" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="9.3.5" />
21-
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="9.3.5" />
22-
<PackageReference Include="Volo.Abp.FeatureManagement.Blazor.WebAssembly" Version="9.3.5" />
20+
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="10.0.0-rc.1" />
21+
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="10.0.0-rc.1" />
22+
<PackageReference Include="Volo.Abp.FeatureManagement.Blazor.WebAssembly" Version="10.0.0-rc.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="4.3.5" />
26+
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="5.0.0-rc.1" />
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="9.3.5" />
31-
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="9.3.5" />
30+
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="10.0.0-rc.1" />
31+
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="10.0.0-rc.1" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Blazor.Client/BookStoreBlazorAutoMapperProfile.cs‎

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

‎BookStore-Blazor-EfCore/src/Acme.BookStore.Blazor.Client/BookStoreBlazorClientModule.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using OpenIddict.Abstractions;
1414
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
1515
using Volo.Abp.Autofac.WebAssembly;
16-
using Volo.Abp.AutoMapper;
1716
using Volo.Abp.Modularity;
1817
using Volo.Abp.UI.Navigation;
1918
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
@@ -48,7 +47,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
4847
ConfigureBlazorise(context);
4948
ConfigureRouter(context);
5049
ConfigureMenu(context);
51-
ConfigureAutoMapper(context);
5250
}
5351

5452
private void ConfigureLocalization()
@@ -106,12 +104,4 @@ private static void ConfigureHttpClient(ServiceConfigurationContext context, IWe
106104
BaseAddress = new Uri(environment.BaseAddress)
107105
});
108106
}
109-
110-
private void ConfigureAutoMapper(ServiceConfigurationContext context)
111-
{
112-
Configure<AbpAutoMapperOptions>(options =>
113-
{
114-
options.AddMaps<BookStoreBlazorClientModule>();
115-
});
116-
}
117107
}

0 commit comments

Comments
 (0)