Skip to content

Commit 29e7094

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Resolved #84 - Upgrade ABP to v3.8.3
1 parent bf98f94 commit 29e7094

File tree

26 files changed

+286
-202
lines changed

26 files changed

+286
-202
lines changed

‎src/.vs/AbpCompanyName.AbpProjectName/DesignTimeBuild/.dtbcache

1.05 KB
Binary file not shown.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.8.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.8.3\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.8.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.8.3\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
4444
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4545
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
@@ -56,14 +56,14 @@
5656
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
5858
</Reference>
59-
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
60-
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
59+
<Reference Include="JetBrains.Annotations, Version=2018.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
60+
<HintPath>..\packages\JetBrains.Annotations.2018.2.1\lib\net20\JetBrains.Annotations.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
62+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
65+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
6969
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -139,8 +139,8 @@
139139
<Reference Include="System.Data.OracleClient" />
140140
<Reference Include="System.Drawing" />
141141
<Reference Include="System.IO.Compression.FileSystem" />
142-
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
143-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
142+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.8.18, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
143+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
144144
</Reference>
145145
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
146146
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@
3434
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
44+
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
47+
<bindingRedirect oldVersion="0.0.0.0-1.0.8.18" newVersion="1.0.8.18" />
48+
</dependentAssembly>
3749
</assemblyBinding>
3850
</runtime>
3951
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.8.1" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.8.1" targetFramework="net461" />
3+
<package id="Abp" version="3.8.3" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.8.3" targetFramework="net461" />
55
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="4.0.0" targetFramework="net461" />
77
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
99
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
10-
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
10+
<package id="JetBrains.Annotations" version="2018.2.1" targetFramework="net461" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
14-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.1" targetFramework="net461" />
15-
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.1" targetFramework="net461" />
14+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.2" targetFramework="net461" />
15+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.2" targetFramework="net461" />
1616
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
1717
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
1818
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
@@ -28,7 +28,7 @@
2828
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
2929
<package id="System.Configuration.ConfigurationManager" version="4.5.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.8.11" targetFramework="net461" />
31+
<package id="System.Linq.Dynamic.Core" version="1.0.8.18" targetFramework="net461" />
3232
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3333
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
3434
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.8.1.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.8.1\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.8.3\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
@@ -47,14 +47,14 @@
4747
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
4949
</Reference>
50-
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
51-
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
50+
<Reference Include="JetBrains.Annotations, Version=2018.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
51+
<HintPath>..\packages\JetBrains.Annotations.2018.2.1\lib\net20\JetBrains.Annotations.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
53+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
56+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
6060
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -130,8 +130,8 @@
130130
<Reference Include="System.Data.OracleClient" />
131131
<Reference Include="System.Drawing" />
132132
<Reference Include="System.IO.Compression.FileSystem" />
133-
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
134-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
133+
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.8.18, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
134+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.8.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
135135
</Reference>
136136
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
137137
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@
3030
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
3131
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
3232
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-1.0.8.18" newVersion="1.0.8.18" />
44+
</dependentAssembly>
3345
</assemblyBinding>
3446
</runtime>
3547
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.8.1" targetFramework="net461" />
3+
<package id="Abp" version="3.8.3" targetFramework="net461" />
44
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
55
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
66
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
7-
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
7+
<package id="JetBrains.Annotations" version="2018.2.1" 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" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
11-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.1" targetFramework="net461" />
12-
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.1" targetFramework="net461" />
11+
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.2" targetFramework="net461" />
12+
<package id="Microsoft.Extensions.Caching.Memory" version="2.1.2" targetFramework="net461" />
1313
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
1414
<package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
1515
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
@@ -25,7 +25,7 @@
2525
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
2626
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
2727
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
28-
<package id="System.Linq.Dynamic.Core" version="1.0.8.11" targetFramework="net461" />
28+
<package id="System.Linq.Dynamic.Core" version="1.0.8.18" targetFramework="net461" />
2929
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3030
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
3131
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />

0 commit comments

Comments
 (0)