Skip to content

Commit 365d381

Browse files
committed
Update to .NET 9
1 parent 65a8652 commit 365d381

File tree

6 files changed

+24
-60
lines changed

6 files changed

+24
-60
lines changed
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -9,16 +8,13 @@
98
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
109
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1110
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
12-
<TargetFramework>net8.0</TargetFramework>
11+
<TargetFramework>net9.0</TargetFramework>
1312
</PropertyGroup>
14-
1513
<ItemGroup>
1614
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
1715
</ItemGroup>
18-
1916
<ItemGroup>
2017
<PackageReference Include="Abp.EntityFrameworkCore" Version="9.4.1" />
2118
<PackageReference Include="Abp.AutoMapper" Version="9.4.1" />
2219
</ItemGroup>
23-
24-
</Project>
20+
</Project>
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -9,17 +8,14 @@
98
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
109
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1110
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
12-
<TargetFramework>net8.0</TargetFramework>
11+
<TargetFramework>net9.0</TargetFramework>
1312
</PropertyGroup>
14-
1513
<ItemGroup>
1614
<EmbeddedResource Include="Localization\SourceFiles\*.json" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1715
</ItemGroup>
18-
1916
<ItemGroup>
2017
<PackageReference Include="Abp" Version="9.4.1" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
2320
</ItemGroup>
24-
25-
</Project>
21+
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -13,36 +12,31 @@
1312
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1413
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
1514
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
16-
<TargetFramework>net8.0</TargetFramework>
15+
<TargetFramework>net9.0</TargetFramework>
1716
</PropertyGroup>
18-
1917
<ItemGroup>
2018
<Compile Remove="Migrations\**" />
2119
<EmbeddedResource Remove="Migrations\**" />
2220
<None Remove="Migrations\**" />
2321
</ItemGroup>
24-
2522
<ItemGroup>
2623
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
2724
</ItemGroup>
28-
2925
<ItemGroup>
3026
<PackageReference Include="Abp.EntityFrameworkCore" Version="9.4.1" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.8" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="9.0.0" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
3329
<PrivateAssets>all</PrivateAssets>
3430
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3531
</PackageReference>
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
3733
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
3935
<PrivateAssets>all</PrivateAssets>
4036
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4137
</PackageReference>
4238
</ItemGroup>
43-
4439
<ItemGroup>
4540
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
4641
</ItemGroup>
47-
48-
</Project>
42+
</Project>
Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -13,9 +12,8 @@
1312
<LangVersion>7.2</LangVersion>
1413
<PreserveCompilationReferences>true</PreserveCompilationReferences>
1514
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
16-
<TargetFramework>net8.0</TargetFramework>
15+
<TargetFramework>net9.0</TargetFramework>
1716
</PropertyGroup>
18-
1917
<ItemGroup>
2018
<None Include="app.config" />
2119
<None Update="log4net.config">
@@ -26,27 +24,21 @@
2624
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
2725
</None>
2826
</ItemGroup>
29-
3027
<ItemGroup>
3128
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
3229
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
3330
</ItemGroup>
34-
3531
<ItemGroup>
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
37-
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
38-
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
3933
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
42-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
34+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
36+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
4337
<PackageReference Include="Castle.Core" Version="5.1.1" />
4438
<PackageReference Include="Abp.AspNetCore" Version="9.4.1" />
4539
<PackageReference Include="Abp.Castle.Log4Net" Version="9.4.1" />
4640
</ItemGroup>
47-
4841
<ItemGroup>
4942
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
5043
</ItemGroup>
51-
52-
</Project>
44+
</Project>

test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -11,14 +10,12 @@
1110
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1211
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1312
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
14-
<TargetFramework>net8.0</TargetFramework>
13+
<TargetFramework>net9.0</TargetFramework>
1514
</PropertyGroup>
16-
1715
<ItemGroup>
1816
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.csproj" />
1917
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
2018
</ItemGroup>
21-
2219
<ItemGroup>
2320
<PackageReference Include="Castle.Core" Version="5.1.1" />
2421
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
@@ -32,7 +29,7 @@
3229
<PackageReference Include="Abp.TestBase" Version="9.4.1" />
3330
<PackageReference Include="NSubstitute" Version="5.1.0" />
3431
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
3633
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3734
</ItemGroup>
38-
</Project>
35+
</Project>
Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Version>1.0.0.0</Version>
54
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -12,17 +11,15 @@
1211
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1312
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1413
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
15-
<TargetFramework>net8.0</TargetFramework>
14+
<TargetFramework>net9.0</TargetFramework>
1615
</PropertyGroup>
17-
1816
<ItemGroup>
1917
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Tests\AbpCompanyName.AbpProjectName.Tests.csproj" />
2018
<ProjectReference Include="..\..\src\AbpCompanyName.AbpProjectName.Web\AbpCompanyName.AbpProjectName.Web.csproj" />
2119
</ItemGroup>
22-
2320
<ItemGroup>
2421
<PackageReference Include="Castle.Core" Version="5.1.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
22+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
2623
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2724
<PackageReference Include="Shouldly" Version="4.2.1" />
2825
<PackageReference Include="xunit" Version="2.9.0" />
@@ -34,30 +31,22 @@
3431
<PackageReference Include="Abp.AspNetCore.TestBase" Version="9.4.1" />
3532
<PackageReference Include="AngleSharp" Version="1.1.2" />
3633
</ItemGroup>
37-
3834
<ItemGroup>
3935
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
4036
</ItemGroup>
41-
4237
<!-- Below ItemGroup and Target tags are added according to https://github.com/aspnet/Hosting/issues/959#issuecomment-286351703 -->
43-
4438
<!-- Solves Problem#2 (404 when executing service calls hosted in other assemblies) -->
4539
<!-- https://github.com/Microsoft/vstest/issues/196.-->
4640
<ItemGroup>
4741
<None Update="xunit.runner.json">
4842
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4943
</None>
5044
</ItemGroup>
51-
5245
<!-- https://github.com/NuGet/Home/issues/4412. -->
5346
<Target Name="CopyDepsFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
5447
<ItemGroup>
5548
<DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />
5649
</ItemGroup>
57-
5850
<Copy SourceFiles="%(DepsFilePaths.FullPath)" DestinationFolder="$(OutputPath)" Condition="Exists('%(DepsFilePaths.FullPath)')" />
5951
</Target>
60-
61-
62-
63-
</Project>
52+
</Project>

0 commit comments

Comments
 (0)