Skip to content

Commit e4780dd

Browse files
hikalkanhikalkan
authored
Merge pull request #71 from aspnetboilerplate/abp-3.0.0-beta3
Abp 3.0.0 beta3
2 parents 5628bf8 + e584861 commit e4780dd

File tree

538 files changed

+47743
-31242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

538 files changed

+47743
-31242
lines changed

‎src/.vs/AbpCompanyName.AbpProjectName/v15/sqlite3/storage.ide

3.88 MB
Binary file not shown.

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

Lines changed: 89 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,41 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.0.2\lib\net46\Abp.dll</HintPath>
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>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.2.0.2\lib\net46\Abp.AutoMapper.dll</HintPath>
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>
4343
</Reference>
44-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
45-
<HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
44+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
45+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
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>
5049
</Reference>
51-
<Reference Include="Castle.Facilities.Logging, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Castle.LoggingFacility.3.4.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
53-
<Private>True</Private>
50+
<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>
5452
</Reference>
55-
<Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
57-
<Private>True</Private>
53+
<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>
5855
</Reference>
59-
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
60-
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
61-
<Private>True</Private>
56+
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
57+
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
61+
</Reference>
62+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
67+
</Reference>
68+
<Reference Include="Microsoft.Extensions.Options, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
6273
</Reference>
6374
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6475
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -73,7 +84,7 @@
7384
<Private>True</Private>
7485
</Reference>
7586
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
76-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
87+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
7788
</Reference>
7889
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
7990
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
@@ -83,29 +94,83 @@
8394
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
8495
<Private>True</Private>
8596
</Reference>
97+
<Reference Include="Nito.AsyncEx.Context, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
98+
<HintPath>..\packages\Nito.AsyncEx.Context.1.1.0\lib\net46\Nito.AsyncEx.Context.dll</HintPath>
99+
</Reference>
100+
<Reference Include="Nito.AsyncEx.Coordination, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Nito.AsyncEx.Coordination.1.0.2\lib\net46\Nito.AsyncEx.Coordination.dll</HintPath>
102+
</Reference>
86103
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
87104
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
88105
<Private>True</Private>
89106
</Reference>
107+
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
108+
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
109+
</Reference>
110+
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
111+
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
112+
</Reference>
113+
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
114+
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
115+
</Reference>
90116
<Reference Include="System" />
91-
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92-
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
93-
<Private>True</Private>
117+
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118+
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
119+
</Reference>
120+
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121+
<HintPath>..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
94122
</Reference>
95123
<Reference Include="System.ComponentModel.DataAnnotations" />
96124
<Reference Include="System.Configuration" />
125+
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
126+
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
127+
</Reference>
97128
<Reference Include="System.Core" />
98-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
99-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
129+
<Reference Include="System.Data.Common">
130+
<HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
131+
<Private>True</Private>
132+
</Reference>
133+
<Reference Include="System.Drawing" />
134+
<Reference Include="System.IO.Compression.FileSystem" />
135+
<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>
100137
</Reference>
101138
<Reference Include="System.Net" />
139+
<Reference Include="System.Numerics" />
102140
<Reference Include="System.Runtime.Caching" />
141+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
143+
</Reference>
144+
<Reference Include="System.Runtime.Serialization" />
145+
<Reference Include="System.Runtime.Serialization.Formatters">
146+
<HintPath>..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll</HintPath>
147+
<Private>True</Private>
148+
</Reference>
149+
<Reference Include="System.Runtime.Serialization.Primitives">
150+
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
151+
<Private>True</Private>
152+
</Reference>
153+
<Reference Include="System.Security.Claims">
154+
<HintPath>..\packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll</HintPath>
155+
<Private>True</Private>
156+
</Reference>
103157
<Reference Include="System.Transactions" />
104158
<Reference Include="System.Xml.Linq" />
105159
<Reference Include="System.Data.DataSetExtensions" />
106160
<Reference Include="Microsoft.CSharp" />
107161
<Reference Include="System.Data" />
108162
<Reference Include="System.Xml" />
163+
<Reference Include="System.Xml.XmlDocument">
164+
<HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
165+
<Private>True</Private>
166+
</Reference>
167+
<Reference Include="System.Xml.XPath">
168+
<HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
169+
<Private>True</Private>
170+
</Reference>
171+
<Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
172+
<HintPath>..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
173+
</Reference>
109174
</ItemGroup>
110175
<ItemGroup>
111176
<Compile Include="AbpProjectNameApplicationModule.cs" />

‎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.0.34.0" newVersion="1.0.34.0"/>
6+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.0.34.0" newVersion="1.0.34.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-4.1.1.0" newVersion="4.1.1.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-4.1.1.0" newVersion="4.1.1.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="10.0.0.0"/>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="10.0.0.0" />
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,39 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="2.0.2" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="2.0.2" targetFramework="net461" />
5-
<package id="AutoMapper" version="6.0.2" targetFramework="net461" />
6-
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
7-
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
8-
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
9-
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
3+
<package id="Abp" version="3.0.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.0.0" targetFramework="net461" />
5+
<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" />
9+
<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" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
13-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
13+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.0" targetFramework="net461" />
14+
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.0" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
16+
<package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
18+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
1419
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
15-
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
16-
<package id="System.Linq.Dynamic.Core" version="1.0.6.13" targetFramework="net461" />
20+
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
21+
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
22+
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
23+
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
24+
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
25+
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
26+
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
27+
<package id="System.Configuration.ConfigurationManager" version="4.4.0" targetFramework="net461" />
28+
<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" />
30+
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
31+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
32+
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
33+
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
34+
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
35+
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
36+
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
37+
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
38+
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
1739
</packages>

0 commit comments

Comments
 (0)