Skip to content

Commit 0b30ff0

Browse files
yekalkanyekalkan
committed
Resolved #103 Upgraded to abp 3.1
1 parent 91b6ed8 commit 0b30ff0

File tree

25 files changed

+561
-326
lines changed

25 files changed

+561
-326
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,29 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.0.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.0.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.1.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
53+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Castle.LoggingFacility.4.0.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
58-
<Private>True</Private>
57+
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5958
</Reference>
6059
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
62-
<Private>True</Private>
60+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
6361
</Reference>
6462
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6563
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
@@ -145,14 +143,15 @@
145143
<Reference Include="System.Drawing" />
146144
<Reference Include="System.IO.Compression.FileSystem" />
147145
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
148-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.7\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
146+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
149147
</Reference>
150148
<Reference Include="System.Net" />
151149
<Reference Include="System.Numerics" />
152150
<Reference Include="System.Runtime.Caching" />
153151
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154152
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
155153
</Reference>
154+
<Reference Include="System.Runtime.Remoting" />
156155
<Reference Include="System.Runtime.Serialization" />
157156
<Reference Include="System.Runtime.Serialization.Formatters">
158157
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
@@ -167,6 +166,7 @@
167166
<Private>True</Private>
168167
</Reference>
169168
<Reference Include="System.Transactions" />
169+
<Reference Include="System.Web" />
170170
<Reference Include="System.Xml.Linq" />
171171
<Reference Include="System.Data.DataSetExtensions" />
172172
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.0.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.0.0" targetFramework="net461" />
3+
<package id="Abp" version="3.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.1.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.1.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.1.0" targetFramework="net461" />
77
<package id="AutoMapper" version="6.1.1" targetFramework="net461" />
8-
<package id="Castle.Core" version="4.1.1" targetFramework="net461" />
9-
<package id="Castle.LoggingFacility" version="4.0.0" targetFramework="net461" />
10-
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
8+
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
9+
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
10+
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
1111
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
@@ -29,7 +29,7 @@
2929
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
3030
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
3131
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
32-
<package id="System.Linq.Dynamic.Core" version="1.0.7.7" targetFramework="net461" />
32+
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
3333
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3434
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3535
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,23 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.0.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.3.0.0\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.3.1.0\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.3.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.3.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
47+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Castle.LoggingFacility.4.0.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
52-
<Private>True</Private>
51+
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5352
</Reference>
5453
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
56-
<Private>True</Private>
54+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
5755
</Reference>
5856
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
5957
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
@@ -139,14 +137,15 @@
139137
<Reference Include="System.Drawing" />
140138
<Reference Include="System.IO.Compression.FileSystem" />
141139
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
142-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.7\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
140+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
143141
</Reference>
144142
<Reference Include="System.Net" />
145143
<Reference Include="System.Numerics" />
146144
<Reference Include="System.Runtime.Caching" />
147145
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148146
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
149147
</Reference>
148+
<Reference Include="System.Runtime.Remoting" />
150149
<Reference Include="System.Runtime.Serialization" />
151150
<Reference Include="System.Runtime.Serialization.Formatters">
152151
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
@@ -161,6 +160,7 @@
161160
<Private>True</Private>
162161
</Reference>
163162
<Reference Include="System.Transactions" />
163+
<Reference Include="System.Web" />
164164
<Reference Include="System.Xml.Linq" />
165165
<Reference Include="System.Data.DataSetExtensions" />
166166
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 7 additions & 7 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="3.0.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="3.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="3.0.0" targetFramework="net461" />
6-
<package id="Castle.Core" version="4.1.1" targetFramework="net461" />
7-
<package id="Castle.LoggingFacility" version="4.0.0" targetFramework="net461" />
8-
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
3+
<package id="Abp" version="3.1.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="3.1.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="3.1.0" targetFramework="net461" />
6+
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
7+
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
8+
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
99
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
1010
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
@@ -27,7 +27,7 @@
2727
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
2828
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
2929
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
30-
<package id="System.Linq.Dynamic.Core" version="1.0.7.7" targetFramework="net461" />
30+
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
3131
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3232
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3333
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)