Skip to content

Commit 05988b8

Browse files
EngincanVEngincanV
authored
Merge pull request #302 from abpframework/mansur-vs-internal-7270
Samples updated to .net10 and ABP 10.rc
2 parents 4e03c04 + dcdafed commit 05988b8

File tree

131 files changed

+5086
-2206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+5086
-2206
lines changed

‎BlazorWasmAspNetCoreHosted/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</ItemGroup>
1313

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

2424
</Project>

‎BlazorWasmAspNetCoreHosted/src/BookStore.Application/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>net8.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<RootNamespace>BookStore</RootNamespace>
88
</PropertyGroup>
99

@@ -13,12 +13,12 @@
1313
</ItemGroup>
1414

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

2424
</Project>

‎BlazorWasmAspNetCoreHosted/src/BookStore.Application/BookStoreApplicationAutoMapperProfile.cs‎

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

‎BlazorWasmAspNetCoreHosted/src/BookStore.Application/BookStoreApplicationMappers.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace BookStore;
6+
7+
/* You can configure your Mapperly mapping configuration here. */

‎BlazorWasmAspNetCoreHosted/src/BookStore.Application/BookStoreApplicationModule.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Volo.Abp.Account;
2-
using Volo.Abp.AutoMapper;
32
using Volo.Abp.FeatureManagement;
43
using Volo.Abp.Identity;
54
using Volo.Abp.Modularity;
@@ -23,9 +22,5 @@ public class BookStoreApplicationModule : AbpModule
2322
{
2423
public override void ConfigureServices(ServiceConfigurationContext context)
2524
{
26-
Configure<AbpAutoMapperOptions>(options =>
27-
{
28-
options.AddMaps<BookStoreApplicationModule>();
29-
});
3025
}
3126
}

‎BlazorWasmAspNetCoreHosted/src/BookStore.Blazor/BookStore.Blazor.csproj‎

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

55
<PropertyGroup>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Blazorise.Bootstrap5" Version="1.5.2" />
1212
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.2" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.1.25451.107" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.1.25451.107" />
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="3.3.0" />
18+
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="5.0.0-rc.1" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="8.3.0" />
22+
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="10.0.0-rc.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="8.3.0" />
27-
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="8.3.0" />
28-
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="8.3.0" />
26+
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="10.0.0-rc.1" />
27+
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="10.0.0-rc.1" />
28+
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="10.0.0-rc.1" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎BlazorWasmAspNetCoreHosted/src/BookStore.Blazor/BookStoreBlazorAutoMapperProfile.cs‎

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

‎BlazorWasmAspNetCoreHosted/src/BookStore.Blazor/BookStoreBlazorMappers.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace BookStore.Blazor;
6+
7+
/* You can configure your Mapperly mapping configuration here. */

‎BlazorWasmAspNetCoreHosted/src/BookStore.Blazor/BookStoreBlazorModule.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
1212
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
1313
using Volo.Abp.Autofac.WebAssembly;
14-
using Volo.Abp.AutoMapper;
1514
using Volo.Abp.Modularity;
1615
using Volo.Abp.UI.Navigation;
1716
using Volo.Abp.Identity.Blazor.WebAssembly;
@@ -41,7 +40,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
4140
ConfigureRouter(context);
4241
ConfigureUI(builder);
4342
ConfigureMenu(context);
44-
ConfigureAutoMapper(context);
4543
}
4644

4745
private void ConfigureRouter(ServiceConfigurationContext context)
@@ -95,12 +93,4 @@ private static void ConfigureHttpClient(ServiceConfigurationContext context, IWe
9593
BaseAddress = new Uri(environment.BaseAddress)
9694
});
9795
}
98-
99-
private void ConfigureAutoMapper(ServiceConfigurationContext context)
100-
{
101-
Configure<AbpAutoMapperOptions>(options =>
102-
{
103-
options.AddMaps<BookStoreBlazorModule>();
104-
});
105-
}
10696
}

‎BlazorWasmAspNetCoreHosted/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>
@@ -25,11 +25,11 @@
2525
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
2626
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2727
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.1.25451.107" />
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Volo.Abp.Autofac" Version="8.3.0" />
32+
<PackageReference Include="Volo.Abp.Autofac" Version="10.0.0-rc.1" />
3333
<ProjectReference Include="..\BookStore.Application.Contracts\BookStore.Application.Contracts.csproj" />
3434
<ProjectReference Include="..\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
3535
</ItemGroup>

0 commit comments

Comments
 (0)