Skip to content

Commit 5e97e78

Browse files
committed
Updated to .NET 9
1 parent 17d03f1 commit 5e97e78

File tree

9 files changed

+53
-97
lines changed

9 files changed

+53
-97
lines changed
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
65
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
76
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
87
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
@@ -12,9 +11,7 @@
1211
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1312
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1413
</PropertyGroup>
15-
1614
<ItemGroup>
1715
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
1816
</ItemGroup>
19-
20-
</Project>
17+
</Project>
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
65
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
76
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
87
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@@ -12,15 +11,12 @@
1211
<UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
1312
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1413
</PropertyGroup>
15-
1614
<ItemGroup>
1715
<EmbeddedResource Include="Localization\SourceFiles\*.xml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1816
</ItemGroup>
19-
2017
<ItemGroup>
2118
<PackageReference Include="Abp.AutoMapper" Version="9.4.1" />
2219
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="9.4.1" />
2320
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
2421
</ItemGroup>
25-
26-
</Project>
22+
</Project>
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
65
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
76
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
87
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
98
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
109
</PropertyGroup>
11-
1210
<ItemGroup>
1311
<Compile Remove="Migrations\20180726102624_Upgrade_ABP_380.cs" />
1412
<Compile Remove="Migrations\20180927062408_test.cs" />
1513
<Compile Remove="Migrations\20190111071724_Upgraded_To_Abp_v4_1_0.cs" />
1614
</ItemGroup>
17-
1815
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
2118
<PrivateAssets>all</PrivateAssets>
2219
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2320
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
2522
<PrivateAssets>all</PrivateAssets>
2623
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2724
</PackageReference>
2825
</ItemGroup>
29-
3026
<ItemGroup>
3127
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
3228
</ItemGroup>
33-
34-
</Project>
29+
</Project>
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
65
<AssemblyName>AbpCompanyName.AbpProjectName.Migrator</AssemblyName>
76
<OutputType>Exe</OutputType>
@@ -10,20 +9,16 @@
109
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1110
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1211
</PropertyGroup>
13-
1412
<ItemGroup>
1513
<None Update="appsettings.json;log4net.config">
1614
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1715
</None>
1816
</ItemGroup>
19-
2017
<ItemGroup>
2118
<PackageReference Include="Abp.Castle.Log4Net" Version="9.4.1" />
2219
</ItemGroup>
23-
2420
<ItemGroup>
2521
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
2622
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
2723
</ItemGroup>
28-
29-
</Project>
24+
</Project>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
65
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
76
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Core</AssemblyName>
87
<PackageId>AbpCompanyName.AbpProjectName.Web.Core</PackageId>
@@ -19,18 +18,15 @@
1918
<LangVersion>7.2</LangVersion>
2019
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2120
</PropertyGroup>
22-
2321
<ItemGroup>
2422
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
2523
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
2624
</ItemGroup>
27-
2825
<ItemGroup>
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
26+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
3027
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
3128
<PackageReference Include="Abp.AspNetCore" Version="9.4.1" />
3229
<PackageReference Include="Abp.ZeroCore" Version="9.4.1" />
3330
<PackageReference Include="Abp.AspNetCore.SignalR" Version="9.4.1" />
3431
</ItemGroup>
35-
36-
</Project>
32+
</Project>
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
65
<PreserveCompilationContext>true</PreserveCompilationContext>
76
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Host</AssemblyName>
@@ -13,11 +12,9 @@
1312
<LangVersion>7.2</LangVersion>
1413
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1514
</PropertyGroup>
16-
1715
<ItemGroup>
1816
<Content Remove="wwwroot\swagger\ui\index.html" />
1917
</ItemGroup>
20-
2118
<ItemGroup>
2219
<None Update="Dockerfile">
2320
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -30,23 +27,19 @@
3027
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
3128
</None>
3229
</ItemGroup>
33-
3430
<ItemGroup>
3531
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Web.Core\AbpCompanyName.AbpProjectName.Web.Core.csproj" />
3632
</ItemGroup>
37-
3833
<ItemGroup>
3934
<PackageReference Include="Abp.Castle.Log4Net" Version="9.4.1" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
4136
<PrivateAssets>all</PrivateAssets>
4237
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4338
</PackageReference>
4439
</ItemGroup>
45-
4640
<ItemGroup>
4741
<EmbeddedResource Include="wwwroot\swagger\ui\index.html">
4842
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4943
</EmbeddedResource>
5044
</ItemGroup>
51-
52-
</Project>
45+
</Project>
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
43
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Mvc</AssemblyName>
54
<OutputType>Exe</OutputType>
65
<PackageId>AbpCompanyName.AbpProjectName.Web.Mvc</PackageId>
76
<UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
87
<RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
9-
<TargetFramework>net8.0</TargetFramework>
8+
<TargetFramework>net9.0</TargetFramework>
109
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
1110
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1211
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -15,7 +14,6 @@
1514
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
1615
<PreserveCompilationReferences>true</PreserveCompilationReferences>
1716
</PropertyGroup>
18-
1917
<ItemGroup>
2018
<None Update="Dockerfile">
2119
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -28,15 +26,13 @@
2826
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
2927
</None>
3028
</ItemGroup>
31-
3229
<ItemGroup>
3330
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Web.Core\AbpCompanyName.AbpProjectName.Web.Core.csproj" />
3431
</ItemGroup>
35-
3632
<ItemGroup>
3733
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.8" />
39-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
34+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
4036
<PrivateAssets>all</PrivateAssets>
4137
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4238
</PackageReference>
@@ -45,10 +41,8 @@
4541
<PackageReference Include="Abp.RedisCache" Version="9.4.1" />
4642
<PackageReference Include="Abp.Castle.Log4Net" Version="9.4.1" />
4743
</ItemGroup>
48-
4944
<ItemGroup>
5045
<Folder Include="wwwroot\libs\" />
5146
<Folder Include="wwwroot\view-resources\Views\_Bundles\" />
5247
</ItemGroup>
53-
54-
</Project>
48+
</Project>
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
65
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
76
<AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
87
<PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
@@ -11,12 +10,10 @@
1110
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1211
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1312
</PropertyGroup>
14-
1513
<ItemGroup>
1614
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
1715
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
1816
</ItemGroup>
19-
2017
<ItemGroup>
2118
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2219
<PackageReference Include="NSubstitute" Version="5.1.0" />
@@ -28,18 +25,15 @@
2825
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2926
</PackageReference>
3027
<PackageReference Include="Abp.TestBase" Version="9.4.1" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
3229
<PackageReference Include="Castle.Core" Version="5.1.1" />
3330
</ItemGroup>
34-
3531
<ItemGroup>
3632
<None Update="appsettings.json">
3733
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3834
</None>
3935
</ItemGroup>
40-
4136
<ItemGroup>
4237
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
4338
</ItemGroup>
44-
45-
</Project>
39+
</Project>
Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
7-
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
8-
<PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
9-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
</PropertyGroup>
14-
15-
<ItemGroup>
16-
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Web.Mvc\AbpCompanyName.AbpProjectName.Web.Mvc.csproj" />
17-
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Tests\AbpCompanyName.AbpProjectName.Tests.csproj" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
22-
<PackageReference Include="NSubstitute" Version="5.1.0" />
23-
<PackageReference Include="Shouldly" Version="4.2.1" />
24-
<PackageReference Include="xunit" Version="2.9.0" />
25-
<PackageReference Include="xunit.extensibility.execution" Version="2.9.0" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
29-
</PackageReference>
30-
<PackageReference Include="AngleSharp" Version="1.1.2" />
31-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="9.4.1" />
32-
</ItemGroup>
33-
34-
</Project>
2+
<PropertyGroup>
3+
<VersionPrefix>1.0.0.0</VersionPrefix>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
6+
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
7+
<PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
8+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Web.Mvc\AbpCompanyName.AbpProjectName.Web.Mvc.csproj" />
15+
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Tests\AbpCompanyName.AbpProjectName.Tests.csproj" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
19+
<PackageReference Include="NSubstitute" Version="5.1.0" />
20+
<PackageReference Include="Shouldly" Version="4.2.1" />
21+
<PackageReference Include="xunit" Version="2.9.0" />
22+
<PackageReference Include="xunit.extensibility.execution" Version="2.9.0" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
26+
</PackageReference>
27+
<PackageReference Include="AngleSharp" Version="1.1.2" />
28+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="9.4.1" />
29+
</ItemGroup>
30+
</Project>

0 commit comments

Comments
 (0)