Skip to content

Commit 8c51139

Browse files
ismcagdasismcagdas
authored
Merge pull request #191 from aspnetboilerplate/pr/6185
Upgrade to Abp 6.4.0-rc-1
2 parents b18c551 + 010e094 commit 8c51139

29 files changed

+419
-201
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.3.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.AutoMapper, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.6.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
42+
<Reference Include="Abp.AutoMapper, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.6.4.0-rc1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.6.3.0\lib\net461\Abp.Zero.dll</HintPath>
45+
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.6.4.0-rc1\lib\net461\Abp.Zero.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Abp.Zero.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.Common.6.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
48+
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.Common.6.4.0-rc1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5050
</Reference>
5151
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5252
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Application/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@
282282
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
283283
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
284284
</dependentAssembly>
285+
<dependentAssembly>
286+
<assemblyIdentity name="Castle.Core.AsyncInterceptor" publicKeyToken="e33b67d3bb5581e4" culture="neutral" />
287+
<bindingRedirect oldVersion="0.0.0.0-2.0.21.0" newVersion="2.0.21.0" />
288+
</dependentAssembly>
285289
</assemblyBinding>
286290
</runtime>
287291
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎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="6.3.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="6.3.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="6.3.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="6.3.0" targetFramework="net461" />
3+
<package id="Abp" version="6.4.0-rc1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.4.0-rc1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.4.0-rc1" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.4.0-rc1" targetFramework="net461" />
77
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.6.3.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.Zero, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.6.3.0\lib\net461\Abp.Zero.dll</HintPath>
42+
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.6.4.0-rc1\lib\net461\Abp.Zero.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.Zero.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.Zero.Common.6.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
45+
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.Common.6.4.0-rc1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4949
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleStore.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Abp.Authorization.Roles;
22
using Abp.Authorization.Users;
33
using Abp.Domain.Repositories;
4+
using Abp.Domain.Uow;
45
using AbpCompanyName.AbpProjectName.Authorization.Users;
56

67
namespace AbpCompanyName.AbpProjectName.Authorization.Roles
@@ -10,11 +11,13 @@ public class RoleStore : AbpRoleStore<Role, User>
1011
public RoleStore(
1112
IRepository<Role> roleRepository,
1213
IRepository<UserRole, long> userRoleRepository,
13-
IRepository<RolePermissionSetting, long> rolePermissionSettingRepository)
14+
IRepository<RolePermissionSetting, long> rolePermissionSettingRepository,
15+
IUnitOfWorkManager unitOfWorkManager)
1416
: base(
1517
roleRepository,
1618
userRoleRepository,
17-
rolePermissionSettingRepository)
19+
rolePermissionSettingRepository,
20+
unitOfWorkManager)
1821
{
1922
}
2023
}

‎src/AbpCompanyName.AbpProjectName.Core/Editions/EditionManager.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Abp.Application.Editions;
22
using Abp.Application.Features;
33
using Abp.Domain.Repositories;
4+
using Abp.Domain.Uow;
45

56
namespace AbpCompanyName.AbpProjectName.Editions
67
{
@@ -10,10 +11,12 @@ public class EditionManager : AbpEditionManager
1011

1112
public EditionManager(
1213
IRepository<Edition> editionRepository,
13-
IAbpZeroFeatureValueStore featureValueStore)
14+
IAbpZeroFeatureValueStore featureValueStore,
15+
IUnitOfWorkManager unitOfWorkManager)
1416
: base(
1517
editionRepository,
16-
featureValueStore
18+
featureValueStore,
19+
unitOfWorkManager
1720
)
1821
{
1922
}

‎src/AbpCompanyName.AbpProjectName.Core/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@
278278
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
279279
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
280280
</dependentAssembly>
281+
<dependentAssembly>
282+
<assemblyIdentity name="Castle.Core.AsyncInterceptor" publicKeyToken="e33b67d3bb5581e4" culture="neutral" />
283+
<bindingRedirect oldVersion="0.0.0.0-2.0.21.0" newVersion="2.0.21.0" />
284+
</dependentAssembly>
281285
</assemblyBinding>
282286
</runtime>
283287
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎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="6.3.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="6.3.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="6.3.0" targetFramework="net461" />
3+
<package id="Abp" version="6.4.0-rc1" targetFramework="net461" />
4+
<package id="Abp.Zero" version="6.4.0-rc1" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="6.4.0-rc1" 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" />

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

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Abp, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.6.3.0\lib\netstandard2.0\Abp.dll</HintPath>
40+
<Reference Include="Abp, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Abp.EntityFramework, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.EntityFramework.6.3.0\lib\net461\Abp.EntityFramework.dll</HintPath>
43+
<Reference Include="Abp.EntityFramework, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.EntityFramework.6.4.0-rc1\lib\net461\Abp.EntityFramework.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Abp.EntityFramework.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Abp.EntityFramework.Common.6.3.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
46+
<Reference Include="Abp.EntityFramework.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.EntityFramework.Common.6.4.0-rc1\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Abp.Zero, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Abp.Zero.6.3.0\lib\net461\Abp.Zero.dll</HintPath>
49+
<Reference Include="Abp.Zero, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Abp.Zero.6.4.0-rc1\lib\net461\Abp.Zero.dll</HintPath>
5151
</Reference>
52-
<Reference Include="Abp.Zero.Common, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Abp.Zero.Common.6.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
52+
<Reference Include="Abp.Zero.Common, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Zero.Common.6.4.0-rc1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Abp.Zero.EntityFramework, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Abp.Zero.EntityFramework.6.3.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
55+
<Reference Include="Abp.Zero.EntityFramework, Version=6.4.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Abp.Zero.EntityFramework.6.4.0-rc1\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5959
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -293,6 +293,10 @@
293293
<Compile Include="Migrations\202103241020465_Upgradd_To_ABP_6_3_0.designer.cs">
294294
<DependentUpon>202103241020465_Upgradd_To_ABP_6_3_0.cs</DependentUpon>
295295
</Compile>
296+
<Compile Include="Migrations\202106281034299_Upgrade_To_ABP_6_4_rc1.cs" />
297+
<Compile Include="Migrations\202106281034299_Upgrade_To_ABP_6_4_rc1.designer.cs">
298+
<DependentUpon>202106281034299_Upgrade_To_ABP_6_4_rc1.cs</DependentUpon>
299+
</Compile>
296300
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
297301
<Compile Include="Migrations\Configuration.cs" />
298302
<Compile Include="Migrations\SeedData\DefaultEditionsCreator.cs" />
@@ -360,6 +364,9 @@
360364
<EmbeddedResource Include="Migrations\202103241020465_Upgradd_To_ABP_6_3_0.resx">
361365
<DependentUpon>202103241020465_Upgradd_To_ABP_6_3_0.cs</DependentUpon>
362366
</EmbeddedResource>
367+
<EmbeddedResource Include="Migrations\202106281034299_Upgrade_To_ABP_6_4_rc1.resx">
368+
<DependentUpon>202106281034299_Upgrade_To_ABP_6_4_rc1.cs</DependentUpon>
369+
</EmbeddedResource>
363370
</ItemGroup>
364371
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
365372
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@
292292
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
293293
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
294294
</dependentAssembly>
295+
<dependentAssembly>
296+
<assemblyIdentity name="Castle.Core.AsyncInterceptor" publicKeyToken="e33b67d3bb5581e4" culture="neutral" />
297+
<bindingRedirect oldVersion="0.0.0.0-2.0.21.0" newVersion="2.0.21.0" />
298+
</dependentAssembly>
295299
</assemblyBinding>
296300
</runtime>
297301
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

0 commit comments

Comments
 (0)