Skip to content

Commit 923e085

Browse files
ismcagdasismcagdas
committed
resolved #54
1 parent 365574e commit 923e085

File tree

16 files changed

+379
-198
lines changed

16 files changed

+379
-198
lines changed

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

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1921
<DebugSymbols>true</DebugSymbols>
@@ -33,12 +35,12 @@
3335
<WarningLevel>4</WarningLevel>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Abp, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.1.3.1.0\lib\net452\Abp.dll</HintPath>
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>
3840
<Private>True</Private>
3941
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.1.3.1.0\lib\net452\Abp.AutoMapper.dll</HintPath>
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>
4244
<Private>True</Private>
4345
</Reference>
4446
<Reference Include="AutoMapper, Version=5.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
@@ -49,28 +51,44 @@
4951
<SpecificVersion>False</SpecificVersion>
5052
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
5153
</Reference>
52-
<Reference Include="Castle.Facilities.Logging, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
54+
<Reference Include="Castle.Facilities.Logging, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Castle.LoggingFacility.3.4.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
56+
<Private>True</Private>
5557
</Reference>
56-
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
58+
<Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
63+
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
66+
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
72+
<Private>True</Private>
73+
</Reference>
74+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
76+
<Private>True</Private>
5977
</Reference>
6078
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6179
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6280
<Private>True</Private>
6381
</Reference>
64-
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
82+
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
6684
<Private>True</Private>
6785
</Reference>
68-
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
86+
<Reference Include="Nito.AsyncEx.Concurrent, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
7088
<Private>True</Private>
7189
</Reference>
72-
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
90+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
7492
<Private>True</Private>
7593
</Reference>
7694
<Reference Include="System" />
@@ -85,6 +103,7 @@
85103
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
86104
<Private>True</Private>
87105
</Reference>
106+
<Reference Include="System.Net" />
88107
<Reference Include="System.Runtime.Caching" />
89108
<Reference Include="System.Transactions" />
90109
<Reference Include="System.Xml.Linq" />
@@ -115,7 +134,9 @@
115134
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
116135
</PropertyGroup>
117136
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
137+
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
118138
</Target>
139+
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
119140
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120141
Other similar extension points exist, see Microsoft.Common.targets.
121142
<Target Name="BeforeBuild">

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="1.3.1.0" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="1.3.1.0" targetFramework="net452" />
3+
<package id="Abp" version="1.5.1" targetFramework="net452" />
4+
<package id="Abp.AutoMapper" version="1.5.1" targetFramework="net452" />
55
<package id="AutoMapper" version="5.2.0" targetFramework="net452" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
7-
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
8-
<package id="Castle.Windsor" version="3.3.0" 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" />
10+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
11+
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
12+
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
913
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
10-
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
14+
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1115
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
1216
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
1317
</packages>

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

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1921
<DebugSymbols>true</DebugSymbols>
@@ -33,36 +35,52 @@
3335
<WarningLevel>4</WarningLevel>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Abp, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.1.3.1.0\lib\net452\Abp.dll</HintPath>
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>
3840
<Private>True</Private>
3941
</Reference>
4042
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4143
<SpecificVersion>False</SpecificVersion>
4244
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
4345
</Reference>
44-
<Reference Include="Castle.Facilities.Logging, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\packages\Castle.LoggingFacility.3.3.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
46+
<Reference Include="Castle.Facilities.Logging, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Castle.LoggingFacility.3.4.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
48+
<Private>True</Private>
4749
</Reference>
48-
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
50+
<Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
55+
<HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
58+
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
66+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
68+
<Private>True</Private>
5169
</Reference>
5270
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5371
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5472
<Private>True</Private>
5573
</Reference>
56-
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
74+
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
5876
<Private>True</Private>
5977
</Reference>
60-
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
78+
<Reference Include="Nito.AsyncEx.Concurrent, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
6280
<Private>True</Private>
6381
</Reference>
64-
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
82+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
6684
<Private>True</Private>
6785
</Reference>
6886
<Reference Include="System" />
@@ -77,6 +95,7 @@
7795
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
7896
<Private>True</Private>
7997
</Reference>
98+
<Reference Include="System.Net" />
8099
<Reference Include="System.Runtime.Caching" />
81100
<Reference Include="System.Transactions" />
82101
<Reference Include="System.Xml.Linq" />
@@ -101,7 +120,9 @@
101120
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
102121
</PropertyGroup>
103122
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
123+
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
104124
</Target>
125+
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
105126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106127
Other similar extension points exist, see Microsoft.Common.targets.
107128
<Target Name="BeforeBuild">

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="1.3.1.0" targetFramework="net452" />
3+
<package id="Abp" version="1.5.1" targetFramework="net452" />
44
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
5-
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
6-
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
5+
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
6+
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
7+
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
8+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
9+
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
10+
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
711
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
8-
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
12+
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
913
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
1014
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
1115
</packages>

0 commit comments

Comments
 (0)