Skip to content

Commit edff80b

Browse files
malimingmaliming
committed
Merge branch 'master' into System.Text.Json
2 parents d11cd78 + d34557a commit edff80b

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
12-
<TargetFramework>net7.0</TargetFramework>
12+
<TargetFramework>net8.0</TargetFramework>
1313
</PropertyGroup>
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp.EntityFrameworkCore" Version="8.4.0" />
21-
<PackageReference Include="Abp.AutoMapper" Version="8.4.0" />
20+
<PackageReference Include="Abp.EntityFrameworkCore" Version="9.0.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="9.0.0" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
12-
<TargetFramework>net7.0</TargetFramework>
12+
<TargetFramework>net8.0</TargetFramework>
1313
</PropertyGroup>
1414

1515
<ItemGroup>
1616
<EmbeddedResource Include="Localization\SourceFiles\*.json" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp" Version="8.4.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
20+
<PackageReference Include="Abp" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
1515
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
16-
<TargetFramework>net7.0</TargetFramework>
16+
<TargetFramework>net8.0</TargetFramework>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
@@ -27,15 +27,15 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Abp.EntityFrameworkCore" Version="8.4.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.12" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.12">
30+
<PackageReference Include="Abp.EntityFrameworkCore" Version="9.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
3737
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
38+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4141
</PackageReference>

‎src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<LangVersion>7.2</LangVersion>
1414
<PreserveCompilationReferences>true</PreserveCompilationReferences>
1515
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
16-
<TargetFramework>net7.0</TargetFramework>
16+
<TargetFramework>net8.0</TargetFramework>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
@@ -33,16 +33,16 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.12" />
36+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
3737
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
3838
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3939
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
42-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
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.0" />
4343
<PackageReference Include="Castle.Core" Version="5.1.1" />
44-
<PackageReference Include="Abp.AspNetCore" Version="8.4.0" />
45-
<PackageReference Include="Abp.Castle.Log4Net" Version="8.4.0" />
44+
<PackageReference Include="Abp.AspNetCore" Version="9.0.0" />
45+
<PackageReference Include="Abp.Castle.Log4Net" Version="9.0.0" />
4646
</ItemGroup>
4747

4848
<ItemGroup>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1212
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1313
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
14-
<TargetFramework>net7.0</TargetFramework>
14+
<TargetFramework>net8.0</TargetFramework>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
@@ -21,18 +21,18 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Castle.Core" Version="5.1.1" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
25-
<PackageReference Include="xunit" Version="2.5.3" />
26-
<PackageReference Include="xunit.extensibility.execution" Version="2.5.3" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
25+
<PackageReference Include="xunit" Version="2.6.2" />
26+
<PackageReference Include="xunit.extensibility.execution" Version="2.6.2" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3030
</PackageReference>
3131
<PackageReference Include="Shouldly" Version="4.2.1" />
32-
<PackageReference Include="Abp.TestBase" Version="8.4.0" />
32+
<PackageReference Include="Abp.TestBase" Version="9.0.0" />
3333
<PackageReference Include="NSubstitute" Version="5.1.0" />
3434
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
3636
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3737
</ItemGroup>
3838
</Project>

‎test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
15-
<TargetFramework>net7.0</TargetFramework>
15+
<TargetFramework>net8.0</TargetFramework>
1616
</PropertyGroup>
1717

1818
<ItemGroup>
@@ -22,17 +22,17 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Castle.Core" Version="5.1.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.12" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
25+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2727
<PackageReference Include="Shouldly" Version="4.2.1" />
28-
<PackageReference Include="xunit" Version="2.5.3" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
28+
<PackageReference Include="xunit" Version="2.6.2" />
29+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3232
</PackageReference>
3333
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
34-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="8.4.0" />
35-
<PackageReference Include="AngleSharp" Version="1.0.5" />
34+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="9.0.0" />
35+
<PackageReference Include="AngleSharp" Version="1.0.7" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

0 commit comments

Comments
 (0)