Skip to content

Commit 9b9d783

Browse files
authored
Merge pull request #163 from aspnetboilerplate/packages-update
packages are updated to 4.8.0
2 parents ef7ca8b + 5d3f7e2 commit 9b9d783

File tree

19 files changed

+423
-197
lines changed

19 files changed

+423
-197
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.7.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.8.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.4.7.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.4.8.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.4.7.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.4.8.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.4.7.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.4.8.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=8.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.8.1.1\lib\net461\AutoMapper.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Application/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="4.7.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="4.7.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="4.7.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="4.7.0" targetFramework="net461" />
3+
<package id="Abp" version="4.8.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="4.8.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="4.8.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="4.8.0" targetFramework="net461" />
77
<package id="AutoMapper" version="8.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.7.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.8.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.4.7.0\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.4.8.0\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.4.7.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.4.8.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Core/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="4.7.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="4.7.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="4.7.0" targetFramework="net461" />
3+
<package id="Abp" version="4.8.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="4.8.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="4.8.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="5.0.0" targetFramework="net461" />
88
<package id="Castle.Windsor" version="5.0.0" targetFramework="net461" />

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.7.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.8.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.EntityFramework, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.4.7.0\lib\net461\Abp.EntityFramework.dll</HintPath>
41+
<Reference Include="Abp.EntityFramework, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.4.8.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.4.7.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.4.8.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.4.7.0\lib\net461\Abp.Zero.dll</HintPath>
47+
<Reference Include="Abp.Zero, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.4.8.0\lib\net461\Abp.Zero.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Abp.Zero.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Zero.Common.4.7.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
50+
<Reference Include="Abp.Zero.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Zero.Common.4.8.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Abp.Zero.EntityFramework, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.Zero.EntityFramework.4.7.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
53+
<Reference Include="Abp.Zero.EntityFramework, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Zero.EntityFramework.4.8.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
@@ -244,6 +244,10 @@
244244
<Compile Include="Migrations\201907021413234_Upgraded_To_Abp_v4_7_0.Designer.cs">
245245
<DependentUpon>201907021413234_Upgraded_To_Abp_v4_7_0.cs</DependentUpon>
246246
</Compile>
247+
<Compile Include="Migrations\201907220636309_Upgrated_To_ABP_4_8_0.cs" />
248+
<Compile Include="Migrations\201907220636309_Upgrated_To_ABP_4_8_0.Designer.cs">
249+
<DependentUpon>201907220636309_Upgrated_To_ABP_4_8_0.cs</DependentUpon>
250+
</Compile>
247251
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
248252
<Compile Include="Migrations\Configuration.cs" />
249253
<Compile Include="Migrations\SeedData\DefaultEditionsCreator.cs" />
@@ -284,6 +288,9 @@
284288
<EmbeddedResource Include="Migrations\201907021413234_Upgraded_To_Abp_v4_7_0.resx">
285289
<DependentUpon>201907021413234_Upgraded_To_Abp_v4_7_0.cs</DependentUpon>
286290
</EmbeddedResource>
291+
<EmbeddedResource Include="Migrations\201907220636309_Upgrated_To_ABP_4_8_0.resx">
292+
<DependentUpon>201907220636309_Upgrated_To_ABP_4_8_0.cs</DependentUpon>
293+
</EmbeddedResource>
287294
</ItemGroup>
288295
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
289296
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201907220636309_Upgrated_To_ABP_4_8_0.Designer.cs

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
namespace AbpCompanyName.AbpProjectName.Migrations
2+
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Data.Entity.Infrastructure.Annotations;
6+
using System.Data.Entity.Migrations;
7+
8+
public partial class Upgrated_To_ABP_4_8_0 : DbMigration
9+
{
10+
public override void Up()
11+
{
12+
AlterTableAnnotations(
13+
"dbo.AbpOrganizationUnitRoles",
14+
c => new
15+
{
16+
Id = c.Long(nullable: false, identity: true),
17+
TenantId = c.Int(),
18+
RoleId = c.Int(nullable: false),
19+
OrganizationUnitId = c.Long(nullable: false),
20+
IsDeleted = c.Boolean(nullable: false),
21+
CreationTime = c.DateTime(nullable: false),
22+
CreatorUserId = c.Long(),
23+
},
24+
annotations: new Dictionary<string, AnnotationValues>
25+
{
26+
{
27+
"DynamicFilter_OrganizationUnitRole_SoftDelete",
28+
new AnnotationValues(oldValue: null, newValue: "EntityFramework.DynamicFilters.DynamicFilterDefinition")
29+
},
30+
});
31+
32+
AlterColumn("dbo.AbpLanguages", "Name", c => c.String(nullable: false, maxLength: 128));
33+
AlterColumn("dbo.AbpLanguageTexts", "LanguageName", c => c.String(nullable: false, maxLength: 128));
34+
CreateIndex("dbo.AbpOrganizationUnitRoles", "IsDeleted");
35+
}
36+
37+
public override void Down()
38+
{
39+
DropIndex("dbo.AbpOrganizationUnitRoles", new[] { "IsDeleted" });
40+
AlterColumn("dbo.AbpLanguageTexts", "LanguageName", c => c.String(nullable: false, maxLength: 10));
41+
AlterColumn("dbo.AbpLanguages", "Name", c => c.String(nullable: false, maxLength: 10));
42+
AlterTableAnnotations(
43+
"dbo.AbpOrganizationUnitRoles",
44+
c => new
45+
{
46+
Id = c.Long(nullable: false, identity: true),
47+
TenantId = c.Int(),
48+
RoleId = c.Int(nullable: false),
49+
OrganizationUnitId = c.Long(nullable: false),
50+
IsDeleted = c.Boolean(nullable: false),
51+
CreationTime = c.DateTime(nullable: false),
52+
CreatorUserId = c.Long(),
53+
},
54+
annotations: new Dictionary<string, AnnotationValues>
55+
{
56+
{
57+
"DynamicFilter_OrganizationUnitRole_SoftDelete",
58+
new AnnotationValues(oldValue: "EntityFramework.DynamicFilters.DynamicFilterDefinition", newValue: null)
59+
},
60+
});
61+
62+
}
63+
}
64+
}

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201907220636309_Upgrated_To_ABP_4_8_0.resx

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="4.7.0" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="4.7.0" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.Common" version="4.7.0" targetFramework="net461" />
6-
<package id="Abp.Zero" version="4.7.0" targetFramework="net461" />
7-
<package id="Abp.Zero.Common" version="4.7.0" targetFramework="net461" />
8-
<package id="Abp.Zero.EntityFramework" version="4.7.0" targetFramework="net461" />
3+
<package id="Abp" version="4.8.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="4.8.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.Common" version="4.8.0" targetFramework="net461" />
6+
<package id="Abp.Zero" version="4.8.0" targetFramework="net461" />
7+
<package id="Abp.Zero.Common" version="4.8.0" targetFramework="net461" />
8+
<package id="Abp.Zero.EntityFramework" version="4.8.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
1010
<package id="Castle.LoggingFacility" version="5.0.0" targetFramework="net461" />
1111
<package id="Castle.Windsor" version="5.0.0" targetFramework="net461" />

src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.7.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.8.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.4.7.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.4.8.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Web, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Web.4.7.0\lib\net461\Abp.Web.dll</HintPath>
44+
<Reference Include="Abp.Web, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Web.4.8.0\lib\net461\Abp.Web.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Web.Api, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Web.Api.4.7.0\lib\net461\Abp.Web.Api.dll</HintPath>
47+
<Reference Include="Abp.Web.Api, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Web.Api.4.8.0\lib\net461\Abp.Web.Api.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Abp.Web.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Web.Common.4.7.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
50+
<Reference Include="Abp.Web.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Web.Common.4.8.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Abp.Zero, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.Zero.4.7.0\lib\net461\Abp.Zero.dll</HintPath>
53+
<Reference Include="Abp.Zero, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Zero.4.8.0\lib\net461\Abp.Zero.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Abp.Zero.Common, Version=4.7.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Abp.Zero.Common.4.7.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
56+
<Reference Include="Abp.Zero.Common, Version=4.8.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Abp.Zero.Common.4.8.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5858
</Reference>
5959
<Reference Include="AutoMapper, Version=8.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6060
<HintPath>..\packages\AutoMapper.8.1.1\lib\net461\AutoMapper.dll</HintPath>

0 commit comments

Comments
 (0)