Skip to content

Commit e3d9f8e

Browse files
hikalkanhikalkan
committed
Upgraded Abp.EntityFramework to v0.10.0.2 and downgraded EntityFramework.DynamicFilters to v1.4.11.0.
1 parent ab21340 commit e3d9f8e

File tree

16 files changed

+73
-47
lines changed

16 files changed

+73
-47
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">
@@ -69,8 +69,8 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
7171
</Reference>
72-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
72+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +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"/>
4+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
55
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
66
<entityFramework>
7-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
7+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
88
<providers>
9-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
9+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1010
</providers>
1111
</entityFramework>
1212
<runtime>
1313
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1414
<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"/>
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" />
1717
</dependentAssembly>
1818
<dependentAssembly>
19-
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
20-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0"/>
19+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
21+
</dependentAssembly>
22+
<dependentAssembly>
23+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
2125
</dependentAssembly>
2226
</assemblyBinding>
2327
</runtime>
24-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
28+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/SeedData/DefaultLanguagesCreator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void CreateLanguages()
4646

4747
private void AddLanguageIfNotExists(ApplicationLanguage language)
4848
{
49-
if (_context.Languages.Any(l => l.TenantId == null && l.Name == language.Name))
49+
if (_context.Languages.Any(l => l.TenantId == language.TenantId && l.Name == language.Name))
5050
{
5151
return;
5252
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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="Abp.Zero" version="0.10.0.0" targetFramework="net452" />
77
<package id="Abp.Zero.EntityFramework" version="0.10.0.0" targetFramework="net452" />
88
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
99
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
1010
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
1111
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
12-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
12+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1414
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1515
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<HintPath>..\packages\Abp.AutoMapper.0.10.0.1\lib\net452\Abp.AutoMapper.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="Abp.EntityFramework, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.EntityFramework.0.10.0.1\lib\net452\Abp.EntityFramework.dll</HintPath>
53+
<Reference Include="Abp.EntityFramework, Version=0.10.0.2, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.EntityFramework.0.10.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Abp.EntityFramework.Common, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
@@ -122,8 +122,8 @@
122122
<SpecificVersion>False</SpecificVersion>
123123
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
124124
</Reference>
125-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
126-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
125+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
126+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
127127
<Private>True</Private>
128128
</Reference>
129129
<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
@@ -120,6 +120,10 @@
120120
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
121121
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
122122
</dependentAssembly>
123+
<dependentAssembly>
124+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
125+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
126+
</dependentAssembly>
123127
</assemblyBinding>
124128
</runtime>
125129
<system.webServer>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Abp" version="0.10.0.1" targetFramework="net452" />
44
<package id="Abp.AutoMapper" version="0.10.0.1" targetFramework="net452" />
5-
<package id="Abp.EntityFramework" version="0.10.0.1" targetFramework="net452" />
5+
<package id="Abp.EntityFramework" version="0.10.0.2" targetFramework="net452" />
66
<package id="Abp.EntityFramework.Common" version="0.10.0.1" targetFramework="net452" />
77
<package id="Abp.HangFire" version="0.10.0.1" targetFramework="net452" />
88
<package id="Abp.Owin" version="0.10.0.1" targetFramework="net452" />
@@ -23,7 +23,7 @@
2323
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
2424
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
2525
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
26-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
26+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
2727
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
2828
<package id="Hangfire.Core" version="1.6.0" targetFramework="net452" />
2929
<package id="Hangfire.SqlServer" version="1.6.0" targetFramework="net452" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<HintPath>..\packages\Abp.AutoMapper.0.10.0.1\lib\net452\Abp.AutoMapper.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="Abp.EntityFramework, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.EntityFramework.0.10.0.1\lib\net452\Abp.EntityFramework.dll</HintPath>
53+
<Reference Include="Abp.EntityFramework, Version=0.10.0.2, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.EntityFramework.0.10.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Abp.EntityFramework.Common, Version=0.10.0.1, Culture=neutral, processorArchitecture=MSIL">
@@ -119,8 +119,8 @@
119119
<SpecificVersion>False</SpecificVersion>
120120
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
121121
</Reference>
122-
<Reference Include="EntityFramework.DynamicFilters, Version=2.1.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
123-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.1.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
122+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
123+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
124124
<Private>True</Private>
125125
</Reference>
126126
<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
@@ -120,6 +120,10 @@
120120
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
121121
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
122122
</dependentAssembly>
123+
<dependentAssembly>
124+
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
125+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
126+
</dependentAssembly>
123127
</assemblyBinding>
124128
</runtime>
125129
<system.webServer>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Abp" version="0.10.0.1" targetFramework="net452" />
44
<package id="Abp.AutoMapper" version="0.10.0.1" targetFramework="net452" />
5-
<package id="Abp.EntityFramework" version="0.10.0.1" targetFramework="net452" />
5+
<package id="Abp.EntityFramework" version="0.10.0.2" targetFramework="net452" />
66
<package id="Abp.EntityFramework.Common" version="0.10.0.1" targetFramework="net452" />
77
<package id="Abp.HangFire" version="0.10.0.1" targetFramework="net452" />
88
<package id="Abp.Owin" version="0.10.0.1" targetFramework="net452" />
@@ -27,7 +27,7 @@
2727
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
2828
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net452" />
2929
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
30-
<package id="EntityFramework.DynamicFilters" version="2.1.0" targetFramework="net452" />
30+
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
3131
<package id="FontAwesome" version="4.4.0" targetFramework="net452" />
3232
<package id="Hangfire.Core" version="1.6.0" targetFramework="net452" />
3333
<package id="Hangfire.SqlServer" version="1.6.0" targetFramework="net452" />

0 commit comments

Comments
 (0)