Skip to content

Commit 3b1e160

Browse files
hikalkanhikalkan
authored
Merge pull request #87 from aspnetboilerplate/ali/master
Upgraded to ABP v2.0.0 resolved #86
2 parents cfed64d + 3e46b33 commit 3b1e160

File tree

33 files changed

+407
-468
lines changed

33 files changed

+407
-468
lines changed

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -35,21 +35,20 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.1.5.1\lib\net452\Abp.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Abp, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.0.0\lib\net46\Abp.dll</HintPath>
4140
</Reference>
42-
<Reference Include="Abp.AutoMapper, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.AutoMapper.1.5.1\lib\net452\Abp.AutoMapper.dll</HintPath>
44-
<Private>True</Private>
41+
<Reference Include="Abp.AutoMapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.2.0.0\lib\net46\Abp.AutoMapper.dll</HintPath>
4543
</Reference>
46-
<Reference Include="Abp.Zero, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Abp.Zero.1.5.1\lib\net452\Abp.Zero.dll</HintPath>
48-
<Private>True</Private>
44+
<Reference Include="Abp.Zero, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.2.0.0\lib\net46\Abp.Zero.dll</HintPath>
4946
</Reference>
50-
<Reference Include="AutoMapper, Version=5.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\packages\AutoMapper.5.2.0\lib\net45\AutoMapper.dll</HintPath>
52-
<Private>True</Private>
47+
<Reference Include="Abp.Zero.Common, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.2.0.0\lib\net46\Abp.Zero.Common.dll</HintPath>
49+
</Reference>
50+
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
5352
</Reference>
5453
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5554
<SpecificVersion>False</SpecificVersion>
@@ -83,9 +82,8 @@
8382
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
8483
<Private>True</Private>
8584
</Reference>
86-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
88-
<Private>True</Private>
85+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
8987
</Reference>
9088
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
9189
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -107,9 +105,8 @@
107105
<Reference Include="System.ComponentModel.DataAnnotations" />
108106
<Reference Include="System.Configuration" />
109107
<Reference Include="System.Core" />
110-
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
111-
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
112-
<Private>True</Private>
108+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
109+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
113110
</Reference>
114111
<Reference Include="System.Net" />
115112
<Reference Include="System.Runtime.Caching" />

‎src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task CreateTenant(CreateTenantInput input)
5959
tenant.EditionId = defaultEdition.Id;
6060
}
6161

62-
CheckErrors(await TenantManager.CreateAsync(tenant));
62+
await TenantManager.CreateAsync(tenant);
6363
await CurrentUnitOfWork.SaveChangesAsync(); //To get new tenant's id.
6464

6565
//Create tenant database

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
6+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
10+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
14+
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0"/>
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
19+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="1.5.1" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="1.5.1" targetFramework="net452" />
5-
<package id="Abp.Zero" version="1.5.1" targetFramework="net452" />
6-
<package id="AutoMapper" version="5.2.0" targetFramework="net452" />
3+
<package id="Abp" version="2.0.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="2.0.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="2.0.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="2.0.0" targetFramework="net461" />
7+
<package id="AutoMapper" version="6.0.2" targetFramework="net461" />
78
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
89
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
910
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
@@ -12,8 +13,8 @@
1213
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1314
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1415
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
15-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
16+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
1617
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1718
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
18-
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
19+
<package id="System.Linq.Dynamic.Core" version="1.0.6.13" targetFramework="net461" />
1920
</packages>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -35,13 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.1.5.1\lib\net452\Abp.dll</HintPath>
40-
<Private>True</Private>
38+
<Reference Include="Abp, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.0.0\lib\net46\Abp.dll</HintPath>
4140
</Reference>
42-
<Reference Include="Abp.Zero, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.Zero.1.5.1\lib\net452\Abp.Zero.dll</HintPath>
44-
<Private>True</Private>
41+
<Reference Include="Abp.Zero, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.2.0.0\lib\net46\Abp.Zero.dll</HintPath>
43+
</Reference>
44+
<Reference Include="Abp.Zero.Common, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.2.0.0\lib\net46\Abp.Zero.Common.dll</HintPath>
4546
</Reference>
4647
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4748
<SpecificVersion>False</SpecificVersion>
@@ -75,9 +76,8 @@
7576
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
7677
<Private>True</Private>
7778
</Reference>
78-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
79-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
80-
<Private>True</Private>
79+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
8181
</Reference>
8282
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
8383
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -99,9 +99,8 @@
9999
<Reference Include="System.ComponentModel.DataAnnotations" />
100100
<Reference Include="System.Configuration" />
101101
<Reference Include="System.Core" />
102-
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
103-
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
104-
<Private>True</Private>
102+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
103+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
105104
</Reference>
106105
<Reference Include="System.Net" />
107106
<Reference Include="System.Runtime.Caching" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
11+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
1515
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0"/>
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>
19-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="1.5.1" targetFramework="net452" />
4-
<package id="Abp.Zero" version="1.5.1" targetFramework="net452" />
3+
<package id="Abp" version="2.0.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="2.0.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="2.0.0" targetFramework="net461" />
56
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
67
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
78
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
@@ -10,8 +11,8 @@
1011
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1112
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1213
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
13-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
14+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
1415
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1516
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
16-
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
17+
<package id="System.Linq.Dynamic.Core" version="1.0.6.13" targetFramework="net461" />
1718
</packages>

0 commit comments

Comments
 (0)