diff --git a/README.md b/README.md index 80326fa..a24fed5 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ | Project | NuGet | Dependency | Frameworks | | ------- | ----- | -----------| ---------- | -| LinqKit | [![Version](https://img.shields.io/nuget/v/LinqKit.svg)](https://www.nuget.org/packages/LinqKit) | EntityFramework | | -| LinqKit.Core | [![Version](https://img.shields.io/nuget/v/LinqKit.Core.svg)](https://www.nuget.org/packages/LinqKit.Core) | | | -| LinqKit.EntityFramework | [![Version](https://img.shields.io/nuget/v/LinqKit.EntityFramework.svg)](https://www.nuget.org/packages/LinqKit.EntityFramework) | EntityFramework | | -| LinqKit.Microsoft.EntityFrameworkCore | [![Version](https://img.shields.io/nuget/v/LinqKit.Microsoft.EntityFrameworkCore.svg)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore) | EntityFrameworkCore | | +| LinqKit | [![Version](https://img.shields.io/nuget/v/LinqKit.svg)](https://www.nuget.org/packages/LinqKit) | EntityFramework | | +| LinqKit.Core | [![Version](https://img.shields.io/nuget/v/LinqKit.Core.svg)](https://www.nuget.org/packages/LinqKit.Core) | | | +| LinqKit.EntityFramework | [![Version](https://img.shields.io/nuget/v/LinqKit.EntityFramework.svg)](https://www.nuget.org/packages/LinqKit.EntityFramework) | EntityFramework | | +| LinqKit.Microsoft.EntityFrameworkCore | [![Version](https://img.shields.io/nuget/v/LinqKit.Microsoft.EntityFrameworkCore.svg)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore) | EntityFrameworkCore | | Table of Contents diff --git a/src/LinqKit.Core/LinqKit.Core.xproj b/src/LinqKit.Core/LinqKit.Core.xproj index 7177147..ec2f888 100644 --- a/src/LinqKit.Core/LinqKit.Core.xproj +++ b/src/LinqKit.Core/LinqKit.Core.xproj @@ -4,18 +4,16 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - fc735db2-5419-4cf3-8aea-8231330a4d85 - LinqKit.Core + LinqKit .\obj .\bin\ v4.6.1 - 2.0 - + \ No newline at end of file diff --git a/src/LinqKit.Core/PredicateBuilder.cs b/src/LinqKit.Core/PredicateBuilder.cs index 3047570..c18b13c 100644 --- a/src/LinqKit.Core/PredicateBuilder.cs +++ b/src/LinqKit.Core/PredicateBuilder.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using System; -using System.Linq; using System.Linq.Expressions; namespace LinqKit @@ -20,10 +19,10 @@ public enum PredicateOperator /// public static class PredicateBuilder { - protected class RebindParameterVisitor : ExpressionVisitor + private class RebindParameterVisitor : ExpressionVisitor { - private ParameterExpression _oldParameter; - private ParameterExpression _newParameter; + private readonly ParameterExpression _oldParameter; + private readonly ParameterExpression _newParameter; public RebindParameterVisitor(ParameterExpression oldParameter, ParameterExpression newParameter) { @@ -96,4 +95,4 @@ public static Expression> Extend([NotNull] this ExpressionStart return @operator == PredicateOperator.Or ? first.Or(second) : first.And(second); } } -} +} \ No newline at end of file diff --git a/src/LinqKit.Core/project.json b/src/LinqKit.Core/project.json index c56d812..e709fbf 100644 --- a/src/LinqKit.Core/project.json +++ b/src/LinqKit.Core/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.8.0", + "version": "1.1.9.0", "title": "LinqKit.Core", "description": "LinqKit.Core is a free set of extensions for LINQ to SQL and Entity Framework power users. Note that Include(...), IAsync and IDbAsync are not supported.", "authors": [ "Joseph Albahari", "Tomas Petricek", "Scott Smith", "Tuomas Hietanen", "Stef Heyenrath" ], @@ -14,7 +14,7 @@ }, "projectUrl": "https://github.com/scottksmith95/LINQKit", "licenseUrl": "https://github.com/scottksmith95/LINQKit/master/license.txt", - "releaseNotes": "Create new NuGet package" + "releaseNotes": "Rebind base parameter in PredicateBuilder instead of using Invoke. And upgraded dependencies to 4.3.0 for NETStandard and UAP." }, "buildOptions": { @@ -58,46 +58,6 @@ } } }, - "net451": { - "frameworkAssemblies": { - }, - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, - "net452": { - "frameworkAssemblies": { - }, - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, - "net46": { - "frameworkAssemblies": { - }, - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, - "net461": { - "frameworkAssemblies": { - }, - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, "netcore50": { "buildOptions": { "define": [ "WINDOWS_APP" ] }, "dependencies": { @@ -135,16 +95,16 @@ ], "dependencies": { "JetBrains.Annotations": { - "version": "10.1.5", + "version": "10.4.0", "type": "build" }, - "System.Linq.Expressions": "4.1.0", - "System.Linq.Queryable": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading.Tasks": "4.0.11" + "System.Linq.Expressions": "4.3.0", + "System.Linq.Queryable": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading.Tasks": "4.3.0" } }, "sl5": { @@ -168,16 +128,16 @@ "buildOptions": { "define": [ "UAP" ] }, "dependencies": { "JetBrains.Annotations": { - "version": "10.1.4", + "version": "10.4.0", "type": "build" }, - "System.Linq.Expressions": "4.1.0", - "System.Linq.Queryable": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading.Tasks": "4.0.11" + "System.Linq.Expressions": "4.3.0", + "System.Linq.Queryable": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading.Tasks": "4.3.0" } } } diff --git a/src/LinqKit.EntityFramework/project.json b/src/LinqKit.EntityFramework/project.json index c532b86..59181ee 100644 --- a/src/LinqKit.EntityFramework/project.json +++ b/src/LinqKit.EntityFramework/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.8.0", + "version": "1.1.9.0", "title": "LinqKit for EntityFramework with Include(...) and IAsync support", "description": "LinqKit.EntityFramework is a free set of extensions for LINQ to SQL and Entity Framework power users. Include(...) and IAsync are supported.", "authors": [ "Joseph Albahari", "Tomas Petricek", "Scott Smith", "Tuomas Hietanen", "Stef Heyenrath" ], @@ -14,7 +14,7 @@ }, "projectUrl": "https://github.com/scottksmith95/LINQKit", "licenseUrl": "https://github.com/scottksmith95/LINQKit/master/license.txt", - "releaseNotes": "New version" + "releaseNotes": "Rebind base parameter in PredicateBuilder instead of using Invoke." }, "buildOptions": { @@ -42,14 +42,6 @@ "frameworks": { "net45": { - }, - "net451": { - }, - "net452": { - }, - "net46": { - }, - "net461": { } } } \ No newline at end of file diff --git a/src/LinqKit.Microsoft.EntityFrameworkCore/project.json b/src/LinqKit.Microsoft.EntityFrameworkCore/project.json index 2fc4501..2514eca 100644 --- a/src/LinqKit.Microsoft.EntityFrameworkCore/project.json +++ b/src/LinqKit.Microsoft.EntityFrameworkCore/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.9", + "version": "1.1.10.0", "title": "LinqKit for Microsoft.EntityFrameworkCore with Include(...) and IDbAsync support", "description": "LinqKit.Microsoft.EntityFrameworkCore is a free set of extensions for LINQ to SQL and EntityFrameworkCore power users. With Include(...) and IDbAsync support.", "authors": [ "Joseph Albahari", "Tomas Petricek", "Scott Smith", "Tuomas Hietanen", "Stef Heyenrath" ], @@ -14,7 +14,7 @@ }, "projectUrl": "https://github.com/scottksmith95/LINQKit", "licenseUrl": "https://github.com/scottksmith95/LINQKit/master/license.txt", - "releaseNotes": "Upgrade Microsoft.EntityFrameworkCore to 1.1.0" + "releaseNotes": "Rebind base parameter in PredicateBuilder instead of using Invoke. " }, "buildOptions": { @@ -45,30 +45,6 @@ } } }, - "net452": { - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, - "net46": { - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, - "net461": { - "dependencies": { - "JetBrains.Annotations": { - "version": "10.0.0", - "type": "build" - } - } - }, "dnx451": { "dependencies": { "JetBrains.Annotations": { @@ -91,22 +67,11 @@ "netstandard1.3": { "buildOptions": { "define": [ "NETSTANDARD" ] }, "imports": [ - "dotnet5.4", - "portable-win81+wp81", - "portable-net45+wp8", - "portable-net45+win8+wp8", - "portable-wp81+wpa81", - "portable-win81+wp81+wpa81", - "portable-net45+win8+wpa81+wp8", - "portable-net45+win8", - "portable-net45+win8+wpa81", - "portable-win81+wpa81", - "portable-net451+win81", - "portable-net451+win81+wpa81" + "dotnet5.4" ], "dependencies": { "JetBrains.Annotations": { - "version": "10.1.4", + "version": "10.4.0", "type": "build" }, "System.Reflection.TypeExtensions": "4.3.0", diff --git a/src/LinqKit/project.json b/src/LinqKit/project.json index ab40250..7507125 100644 --- a/src/LinqKit/project.json +++ b/src/LinqKit/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.8.0", + "version": "1.1.9.0", "title": "LinqKit for EntityFramework (with IAsync support)", "description": "LinqKit.EntityFramework is a free set of extensions for LINQ to SQL and Entity Framework power users. Include(...) and IAsync are supported.", "authors": [ "Joseph Albahari", "Tomas Petricek", "Scott Smith", "Tuomas Hietanen", "Stef Heyenrath" ], @@ -14,7 +14,7 @@ }, "projectUrl": "https://github.com/scottksmith95/LINQKit", "licenseUrl": "https://github.com/scottksmith95/LINQKit/master/license.txt", - "releaseNotes": "Bring back dependency on EntityFramework." + "releaseNotes": "Rebind base parameter in PredicateBuilder instead of using Invoke." }, "buildOptions": { @@ -42,14 +42,6 @@ "frameworks": { "net45": { - }, - "net451": { - }, - "net452": { - }, - "net46": { - }, - "net461": { } } } \ No newline at end of file diff --git a/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj b/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj index fced037..e562b6d 100644 --- a/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj +++ b/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj @@ -44,7 +44,7 @@ True - ..\..\src\LinqKit\bin\$(Configuration)\net452\LinqKit.dll + ..\..\src\LinqKit\bin\$(Configuration)\net45\LinqKit.dll diff --git a/tests/LinqKit.Microsoft.EntityFrameworkCore.Tests/project.json b/tests/LinqKit.Microsoft.EntityFrameworkCore.Tests/project.json index 5082540..62885bb 100644 --- a/tests/LinqKit.Microsoft.EntityFrameworkCore.Tests/project.json +++ b/tests/LinqKit.Microsoft.EntityFrameworkCore.Tests/project.json @@ -36,7 +36,7 @@ "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "System.Linq.Parallel": "4.0.1", + "System.Linq.Parallel": "4.3.0", "System.Threading.Tasks": "4.3.0" } } diff --git a/tests/LinqKit.Tests.Net452/LinqKit.Tests.Net452.csproj b/tests/LinqKit.Tests.Net452/LinqKit.Tests.Net452.csproj index 80acffa..0becc93 100644 --- a/tests/LinqKit.Tests.Net452/LinqKit.Tests.Net452.csproj +++ b/tests/LinqKit.Tests.Net452/LinqKit.Tests.Net452.csproj @@ -36,7 +36,7 @@ - ..\..\src\LinqKit.Core\bin\$(Configuration)\net452\LinqKit.Core.dll + ..\..\src\LinqKit.Core\bin\$(Configuration)\net45\LinqKit.Core.dll