Skip to content

Commit ad38a8d

Browse files
authored
Merge pull request #108 from aspnetboilerplate/pr/6385
Upgrade Abp packages to v7.1.0
2 parents 4e47c5a + f73bb88 commit ad38a8d

File tree

16 files changed

+119
-149
lines changed

16 files changed

+119
-149
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4644
</Reference>
4745
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4846
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Application/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
55
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
77
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -13,13 +13,13 @@
1313
<package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
16-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
1916
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2017
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
2118
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
2221
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2323
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2424
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2525
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
4342
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4443
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

src/AbpCompanyName.AbpProjectName.Core/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
44
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
55
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
66
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -10,13 +10,13 @@
1010
<package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
13-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
14-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
15-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
1613
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
1714
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
1815
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
1918
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2020
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2121
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2222
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,14 @@
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
41-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
42-
<Private>True</Private>
40+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4342
</Reference>
44-
<Reference Include="Abp.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
45-
<HintPath>..\packages\Abp.EntityFramework.7.0.0\lib\net461\Abp.EntityFramework.dll</HintPath>
46-
<Private>True</Private>
43+
<Reference Include="Abp.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.EntityFramework.7.1.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4745
</Reference>
48-
<Reference Include="Abp.EntityFramework.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
49-
<HintPath>..\packages\Abp.EntityFramework.Common.7.0.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
50-
<Private>True</Private>
46+
<Reference Include="Abp.EntityFramework.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.EntityFramework.Common.7.1.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
5148
</Reference>
5249
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5350
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config

Lines changed: 6 additions & 6 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="7.0.0" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.Common" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.Common" version="7.1.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
77
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -14,13 +14,13 @@
1414
<package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
1515
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1616
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
17-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2017
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2118
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
2219
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
2322
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
23+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2424
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2525
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2626
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,14 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.FluentMigrator, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.FluentMigrator.7.0.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.FluentMigrator, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.FluentMigrator.7.1.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
4644
</Reference>
47-
<Reference Include="Abp.NHibernate, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
48-
<HintPath>..\packages\Abp.NHibernate.7.0.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="Abp.NHibernate, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.NHibernate.7.1.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
5047
</Reference>
5148
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
5249
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>

src/AbpCompanyName.AbpProjectName.NHibernate/packages.config

Lines changed: 4 additions & 4 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="7.0.0" targetFramework="net461" />
4-
<package id="Abp.FluentMigrator" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.NHibernate" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.FluentMigrator" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.NHibernate" version="7.1.0" targetFramework="net461" />
66
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
77
<package id="Azure.Core" version="1.21.0" targetFramework="net461" />
88
<package id="Azure.Identity" version="1.5.0" targetFramework="net461" />
@@ -78,8 +78,8 @@
7878
<package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net461" />
7979
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
8080
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net461" />
81-
<package id="System.IO" version="4.3.0" targetFramework="net461" />
8281
<package id="System.IdentityModel.Tokens.Jwt" version="6.15.0" targetFramework="net461" />
82+
<package id="System.IO" version="4.3.0" targetFramework="net461" />
8383
<package id="System.Linq.Dynamic.Core" version="1.2.14" targetFramework="net461" />
8484
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
8585
<package id="System.Memory" version="4.5.4" targetFramework="net461" />

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,20 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4644
</Reference>
47-
<Reference Include="Abp.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
48-
<HintPath>..\packages\Abp.Web.7.0.0\lib\net461\Abp.Web.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="Abp.Web, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Web.7.1.0\lib\net461\Abp.Web.dll</HintPath>
5047
</Reference>
51-
<Reference Include="Abp.Web.Api, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
52-
<HintPath>..\packages\Abp.Web.Api.7.0.0\lib\net461\Abp.Web.Api.dll</HintPath>
53-
<Private>True</Private>
48+
<Reference Include="Abp.Web.Api, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Web.Api.7.1.0\lib\net461\Abp.Web.Api.dll</HintPath>
5450
</Reference>
55-
<Reference Include="Abp.Web.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
56-
<HintPath>..\packages\Abp.Web.Common.7.0.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
57-
<Private>True</Private>
51+
<Reference Include="Abp.Web.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Abp.Web.Common.7.1.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
5853
</Reference>
5954
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6055
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

src/AbpCompanyName.AbpProjectName.WebApi/packages.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.Web" version="7.0.0" targetFramework="net461" />
6-
<package id="Abp.Web.Api" version="7.0.0" targetFramework="net461" />
7-
<package id="Abp.Web.Common" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.Web" version="7.1.0" targetFramework="net461" />
6+
<package id="Abp.Web.Api" version="7.1.0" targetFramework="net461" />
7+
<package id="Abp.Web.Common" version="7.1.0" targetFramework="net461" />
88
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
99
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
1010
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -21,13 +21,13 @@
2121
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net461" />
2222
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
2323
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
24-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
25-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
26-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2724
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2825
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
2926
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
27+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
28+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
3029
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
30+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
3131
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
3232
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
3333
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />

src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@
318318

319319
function error(message: string, title?: string, options?: any): any;
320320

321-
function confirm(message: string, title?: string, callback?: (result: boolean) => void, options?: any): any;
322-
321+
function confirm(message: string, title?: string, callback?: (result: boolean, info?: any) => void, options?: any): any;
323322
}
324323

325324
namespace ui {

0 commit comments

Comments
 (0)