Skip to content

Commit da74bac

Browse files
author
alirizaadiyahsi
authored
Merge pull request #72 from aspnetboilerplate/upgrade-nuget-packages
Upgrade nuget packages
2 parents 7c9de97 + bf510b9 commit da74bac

File tree

7 files changed

+46
-44
lines changed

7 files changed

+46
-44
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

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

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp" Version="3.9.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
20+
<PackageReference Include="Abp" Version="4.2.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,16 @@
1616
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1717
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<Compile Remove="Migrations\20180927070638_Upgrade_ABP_3.8.3.cs" />
21-
</ItemGroup>
22-
2319
<ItemGroup>
2420
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
2521
</ItemGroup>
2622

2723
<ItemGroup>
28-
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.9.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.3" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.3" />
24+
<PackageReference Include="Abp.EntityFrameworkCore" Version="4.2.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
3127
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.3">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1">
3329
<PrivateAssets>all</PrivateAssets>
3430
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3531
</PackageReference>

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@
3333
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
3434
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3535
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
37-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.3" />
36+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.1" />
38+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
39+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
40+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
41+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
4343
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
45-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
46-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
47-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4" />
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.3">
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
45+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
46+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
47+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5151
</PackageReference>
5252
<PackageReference Include="Castle.Core" Version="4.3.1" />
53-
<PackageReference Include="Abp.AspNetCore" Version="3.9.0" />
54-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.9.0" />
53+
<PackageReference Include="Abp.AspNetCore" Version="4.2.0" />
54+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.2.0" />
5555
</ItemGroup>
5656

5757
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

+11-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,18 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Castle.Core" Version="4.3.1" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
25-
<PackageReference Include="xunit" Version="2.4.0" />
26-
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
28-
<PackageReference Include="Shouldly" Version="3.0.1" />
29-
<PackageReference Include="Abp.TestBase" Version="3.9.0" />
30-
<PackageReference Include="NSubstitute" Version="3.1.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
25+
<PackageReference Include="xunit" Version="2.4.1" />
26+
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="Shouldly" Version="3.0.2" />
32+
<PackageReference Include="Abp.TestBase" Version="4.2.0" />
33+
<PackageReference Include="NSubstitute" Version="4.0.0" />
3134
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.3" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.1" />
3336
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3437
</ItemGroup>
3538

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Castle.Core" Version="4.3.1" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
26-
<PackageReference Include="xunit" Version="2.4.0" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
29-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="3.9.0" />
30-
<PackageReference Include="AngleSharp" Version="0.9.10" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
26+
<PackageReference Include="xunit" Version="2.4.1" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
32+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="4.2.0" />
33+
<PackageReference Include="AngleSharp" Version="0.10.1" />
3134
</ItemGroup>
3235

3336
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using Abp.AspNetCore.TestBase;
66
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
77
using AbpCompanyName.AbpProjectName.Tests.TestDatas;
8-
using AngleSharp.Dom.Html;
9-
using AngleSharp.Parser.Html;
8+
using AngleSharp.Html.Dom;
9+
using AngleSharp.Html.Parser;
1010
using Microsoft.AspNetCore.Hosting;
1111
using Newtonsoft.Json;
1212
using Newtonsoft.Json.Serialization;
@@ -116,7 +116,7 @@ protected async Task<T> UsingDbContextAsync<T>(Func<AbpProjectNameDbContext, Tas
116116

117117
protected IHtmlDocument ParseHtml(string htmlString)
118118
{
119-
return new HtmlParser().Parse(htmlString);
119+
return new HtmlParser().ParseDocument(htmlString);
120120
}
121121

122122
#endregion

0 commit comments

Comments
 (0)