Skip to content

Commit 5d579f3

Browse files
yekalkanyekalkan
committed
Upgraded to Abp 3.1
1 parent 506793d commit 5d579f3

File tree

20 files changed

+188
-185
lines changed

20 files changed

+188
-185
lines changed

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

Lines changed: 11 additions & 9 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=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>
4444
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4545
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.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>
51+
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
54+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
5555
</Reference>
5656
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
5757
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
@@ -133,14 +133,15 @@
133133
<Reference Include="System.Drawing" />
134134
<Reference Include="System.IO.Compression.FileSystem" />
135135
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
136-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.7\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
136+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
137137
</Reference>
138138
<Reference Include="System.Net" />
139139
<Reference Include="System.Numerics" />
140140
<Reference Include="System.Runtime.Caching" />
141141
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142142
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
143143
</Reference>
144+
<Reference Include="System.Runtime.Remoting" />
144145
<Reference Include="System.Runtime.Serialization" />
145146
<Reference Include="System.Runtime.Serialization.Formatters">
146147
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
@@ -155,6 +156,7 @@
155156
<Private>True</Private>
156157
</Reference>
157158
<Reference Include="System.Transactions" />
159+
<Reference Include="System.Web" />
158160
<Reference Include="System.Xml.Linq" />
159161
<Reference Include="System.Data.DataSetExtensions" />
160162
<Reference Include="Microsoft.CSharp" />

‎src/AbpCompanyName.AbpProjectName.Application/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="3.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" 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" />
55
<package id="AutoMapper" version="6.1.1" 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" />
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.Bcl" version="1.1.10" targetFramework="net452" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
@@ -26,7 +26,7 @@
2626
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
2727
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
2828
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
29-
<package id="System.Linq.Dynamic.Core" version="1.0.7.7" targetFramework="net461" />
29+
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
3030
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3131
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3232
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

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

Lines changed: 9 additions & 7 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=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="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
41+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Castle.LoggingFacility.4.0.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
45+
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
48+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
4949
</Reference>
5050
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
5151
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
@@ -127,14 +127,15 @@
127127
<Reference Include="System.Drawing" />
128128
<Reference Include="System.IO.Compression.FileSystem" />
129129
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.7\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
130+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Net" />
133133
<Reference Include="System.Numerics" />
134134
<Reference Include="System.Runtime.Caching" />
135135
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136136
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
137137
</Reference>
138+
<Reference Include="System.Runtime.Remoting" />
138139
<Reference Include="System.Runtime.Serialization" />
139140
<Reference Include="System.Runtime.Serialization.Formatters">
140141
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
@@ -149,6 +150,7 @@
149150
<Private>True</Private>
150151
</Reference>
151152
<Reference Include="System.Transactions" />
153+
<Reference Include="System.Web" />
152154
<Reference Include="System.Xml.Linq" />
153155
<Reference Include="System.Data.DataSetExtensions" />
154156
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 5 additions & 5 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="3.0.0" targetFramework="net461" />
4-
<package id="Castle.Core" version="4.1.1" targetFramework="net461" />
5-
<package id="Castle.LoggingFacility" version="4.0.0" targetFramework="net461" />
6-
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
3+
<package id="Abp" version="3.1.0" targetFramework="net461" />
4+
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
5+
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
6+
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
77
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
88
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
@@ -24,7 +24,7 @@
2424
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
2525
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
2626
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
27-
<package id="System.Linq.Dynamic.Core" version="1.0.7.7" targetFramework="net461" />
27+
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
2828
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
2929
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3030
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

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

Lines changed: 13 additions & 11 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=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.EntityFramework, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.3.0.0\lib\net461\Abp.EntityFramework.dll</HintPath>
41+
<Reference Include="Abp.EntityFramework, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.3.1.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.3.0.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.3.1.0\lib\netstandard2.0\Abp.EntityFramework.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>
51+
<HintPath>..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
54+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
5555
</Reference>
5656
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
@@ -144,14 +144,15 @@
144144
<Reference Include="System.Drawing" />
145145
<Reference Include="System.IO.Compression.FileSystem" />
146146
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
147-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.7\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
147+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
148148
</Reference>
149149
<Reference Include="System.Net" />
150150
<Reference Include="System.Numerics" />
151151
<Reference Include="System.Runtime.Caching" />
152152
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
153153
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
154154
</Reference>
155+
<Reference Include="System.Runtime.Remoting" />
155156
<Reference Include="System.Runtime.Serialization" />
156157
<Reference Include="System.Runtime.Serialization.Formatters">
157158
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
@@ -166,6 +167,7 @@
166167
<Private>True</Private>
167168
</Reference>
168169
<Reference Include="System.Transactions" />
170+
<Reference Include="System.Web" />
169171
<Reference Include="System.Xml.Linq" />
170172
<Reference Include="System.Data.DataSetExtensions" />
171173
<Reference Include="Microsoft.CSharp" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/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.EntityFramework" version="3.0.0" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.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.EntityFramework" version="3.1.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.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="EntityFramework" version="6.1.3" targetFramework="net452" />
1010
<package id="EntityFramework.DynamicFilters" version="2.10.0" targetFramework="net461" />
1111
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
@@ -28,7 +28,7 @@
2828
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
2929
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
3030
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
31-
<package id="System.Linq.Dynamic.Core" version="1.0.7.7" targetFramework="net461" />
31+
<package id="System.Linq.Dynamic.Core" version="1.0.7.9" targetFramework="net461" />
3232
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3333
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
3434
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)