Skip to content

Commit 9aa5f6e

Browse files
demirmusademirmusa
authored
Merge branch 'master' into packages-update
2 parents 0b571e9 + a255e8d commit 9aa5f6e

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

‎AbpCompanyName.AbpProjectName.sln

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29009.5
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}"
77
EndProject
@@ -61,4 +61,7 @@ Global
6161
{0D4C5D00-C144-4213-A007-4B8944113AB1} = {F10AA149-2626-486E-85BB-9CD5365F3016}
6262
{5D441612-29CA-4DAD-9945-B9DE11CE026C} = {F10AA149-2626-486E-85BB-9CD5365F3016}
6363
EndGlobalSection
64+
GlobalSection(ExtensibilityGlobals) = postSolution
65+
SolutionGuid = {B516B1E8-1CEC-4BCC-BA92-93CB32845E37}
66+
EndGlobalSection
6467
EndGlobal

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Abp" Version="4.8.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.4" />
2222
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
2323
</ItemGroup>
2424

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Abp.EntityFrameworkCore" Version="4.8.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
3232
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1">
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3636
</PackageReference>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
33+
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
3434
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3535
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
3636
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
@@ -39,13 +39,13 @@
3939
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
4040
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
4141
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
4343
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
4444
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
4646
<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">
47+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5151
</PackageReference>

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

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

2222
<ItemGroup>
2323
<PackageReference Include="Castle.Core" Version="4.4.0" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2525
<PackageReference Include="xunit" Version="2.4.1" />
2626
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
2727
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
@@ -30,9 +30,9 @@
3030
</PackageReference>
3131
<PackageReference Include="Shouldly" Version="3.0.2" />
3232
<PackageReference Include="Abp.TestBase" Version="4.8.0" />
33-
<PackageReference Include="NSubstitute" Version="4.0.0" />
33+
<PackageReference Include="NSubstitute" Version="4.2.0" />
3434
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.1" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.4" />
3636
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3737
</ItemGroup>
3838

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Castle.Core" Version="4.4.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2626
<PackageReference Include="xunit" Version="2.4.1" />
2727
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3030
</PackageReference>
3131
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
3232
<PackageReference Include="Abp.AspNetCore.TestBase" Version="4.8.0" />
33-
<PackageReference Include="AngleSharp" Version="0.10.1" />
33+
<PackageReference Include="AngleSharp" Version="0.12.1" />
3434
</ItemGroup>
3535

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

0 commit comments

Comments
 (0)