Skip to content

Commit 31705b6

Browse files
hikalkanhikalkan
committed
Upgraded Abp.EntityFramework to v0.10.0.2 and downgraded EntityFramework.DynamicFilters to v1.4.11.0.
1 parent ce9fa33 commit 31705b6

File tree

9 files changed

+36
-20
lines changed

9 files changed

+36
-20
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<HintPath>..\packages\Abp.0.10.0.1\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.EntityFramework, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.0.10.0.1\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=0.10.0.2, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.0.10.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Abp.EntityFramework.Common, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
@@ -61,8 +61,8 @@
6161
<SpecificVersion>False</SpecificVersion>
6262
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
6363
</Reference>
64-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
65-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
64+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
65+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.EntityFramework/App.config

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
5-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
4+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
6+
</configSections>
67
<entityFramework>
7-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
8+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
89
<providers>
9-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
10+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1011
</providers>
1112
</entityFramework>
1213
<runtime>
1314
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1415
<dependentAssembly>
15-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
16-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
16+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
17+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
18+
</dependentAssembly>
19+
<dependentAssembly>
20+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
21+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
1722
</dependentAssembly>
1823
</assemblyBinding>
1924
</runtime>
20-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
25+
<startup>
26+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
27+
</startup>
28+
</configuration>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Abp" version="0.10.0.1" targetFramework="net452" />
4-
<package id="Abp.EntityFramework" version="0.10.0.1" targetFramework="net452" />
4+
<package id="Abp.EntityFramework" version="0.10.0.2" targetFramework="net452" />
55
<package id="Abp.EntityFramework.Common" version="0.10.0.1" targetFramework="net452" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
77
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
88
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
99
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
10-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
10+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
1111
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1212
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
1313
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
<SpecificVersion>False</SpecificVersion>
9595
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
9696
</Reference>
97-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
98-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
97+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
98+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebMpa/Web.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
9696
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
9797
</dependentAssembly>
98+
<dependentAssembly>
99+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
100+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
101+
</dependentAssembly>
98102
</assemblyBinding>
99103
</runtime>
100104
<system.webServer>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
1717
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
1818
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
19-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
19+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
2020
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
2121
<package id="jQuery" version="2.1.4" targetFramework="net452" />
2222
<package id="jQuery.BlockUI" version="2.70" targetFramework="net452" />

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
<SpecificVersion>False</SpecificVersion>
9292
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
9393
</Reference>
94-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
95-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
94+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
95+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
9898
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Web.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
9696
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
9797
</dependentAssembly>
98+
<dependentAssembly>
99+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
100+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
101+
</dependentAssembly>
98102
</assemblyBinding>
99103
</runtime>
100104
<system.webServer>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
2121
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
2222
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
23-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
23+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
2424
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
2525
<package id="jQuery" version="2.1.4" targetFramework="net452" />
2626
<package id="jQuery.BlockUI" version="2.70" targetFramework="net452" />

0 commit comments

Comments
 (0)