Skip to content

Commit 62bf510

Browse files
ismcagdasismcagdas
authored
Merge pull request #65 from aspnetboilerplate/upgrade-abp-380
Reolved #64 - Upgrade ABP to v3.8
2 parents d16aa89 + 484083f commit 62bf510

File tree

9 files changed

+108
-41
lines changed

9 files changed

+108
-41
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

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

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.7.2" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.5" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.0">
24+
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.8.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1">
2929
<PrivateAssets>All</PrivateAssets>
3030
</PackageReference>
3131
</ItemGroup>

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20180726084415_Upgrade_ABP_3.8.0.Designer.cs

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20180726084415_Upgrade_ABP_3.8.0.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using Microsoft.EntityFrameworkCore.Migrations;
2+
3+
namespace AbpCompanyName.AbpProjectName.Migrations
4+
{
5+
public partial class Upgrade_ABP_380 : Migration
6+
{
7+
protected override void Up(MigrationBuilder migrationBuilder)
8+
{
9+
10+
}
11+
12+
protected override void Down(MigrationBuilder migrationBuilder)
13+
{
14+
15+
}
16+
}
17+
}

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// <auto-generated />
2+
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Infrastructure;
5+
using Microsoft.EntityFrameworkCore.Metadata;
6+
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
7+
8+
namespace AbpCompanyName.AbpProjectName.Migrations
9+
{
10+
[DbContext(typeof(AbpProjectNameDbContext))]
11+
partial class AbpProjectNameDbContextModelSnapshot : ModelSnapshot
12+
{
13+
protected override void BuildModel(ModelBuilder modelBuilder)
14+
{
15+
#pragma warning disable 612, 618
16+
modelBuilder
17+
.HasAnnotation("ChangeDetector.SkipDetectChanges", "true")
18+
.HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
19+
.HasAnnotation("Relational:MaxIdentifierLength", 128)
20+
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
21+
#pragma warning restore 612, 618
22+
}
23+
}
24+
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@
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.0" />
37-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.0" />
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0" />
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
43-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.5" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
45-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
46-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" />
47-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.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.1" />
39+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
40+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
41+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
43+
<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.1" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1">
4949
<PrivateAssets>All</PrivateAssets>
5050
</PackageReference>
51-
<PackageReference Include="Castle.Core" Version="4.3.0" />
52-
<PackageReference Include="Abp.AspNetCore" Version="3.7.2" />
53-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.7.2" />
51+
<PackageReference Include="Castle.Core" Version="4.3.1" />
52+
<PackageReference Include="Abp.AspNetCore" Version="3.8.0" />
53+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.8.0" />
5454
</ItemGroup>
5555

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Castle.Core" Version="4.3.0" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
25-
<PackageReference Include="xunit" Version="2.3.1" />
26-
<PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
23+
<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" />
2828
<PackageReference Include="Shouldly" Version="3.0.0" />
29-
<PackageReference Include="Abp.TestBase" Version="3.7.2" />
29+
<PackageReference Include="Abp.TestBase" Version="3.8.0" />
3030
<PackageReference Include="NSubstitute" Version="3.1.0" />
31-
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.0" />
31+
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
3333
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3434
</ItemGroup>
3535

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Castle.Core" Version="4.3.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
26-
<PackageReference Include="xunit" Version="2.3.1" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
29-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="3.7.2" />
30-
<PackageReference Include="AngleSharp" Version="0.9.9.2" />
24+
<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.1" />
29+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="3.8.0" />
30+
<PackageReference Include="AngleSharp" Version="0.9.10" />
3131
</ItemGroup>
3232

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

0 commit comments

Comments
 (0)