Skip to content

Commit b2cb300

Browse files
StefHStefH
committed
Upgrade EntityFramework to version 6.5.1
1 parent 5fba15d commit b2cb300

File tree

3 files changed

+92
-92
lines changed

3 files changed

+92
-92
lines changed

‎src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../version.xml" />
2+
<Import Project="../../version.xml" />
33

4-
<PropertyGroup>
5-
<Version>1.3.$(PatchVersion)</Version>
6-
<Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
7-
<AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
8-
<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
9-
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
10-
<DefineConstants>$(DefineConstants);EF</DefineConstants>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<AssemblyName>LinqKit.EntityFramework</AssemblyName>
13-
<AssemblyOriginatorKeyFile>LinqKit.EntityFramework.snk</AssemblyOriginatorKeyFile>
14-
<SignAssembly>true</SignAssembly>
15-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16-
<PackageId>LinqKit.EntityFramework</PackageId>
17-
<PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
18-
<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
19-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20-
<RepositoryType>git</RepositoryType>
21-
<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
22-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
23-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
24-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25-
</PropertyGroup>
4+
<PropertyGroup>
5+
<Version>1.3.$(PatchVersion)</Version>
6+
<Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
7+
<AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
8+
<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
9+
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
10+
<DefineConstants>$(DefineConstants);EF</DefineConstants>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<AssemblyName>LinqKit.EntityFramework</AssemblyName>
13+
<AssemblyOriginatorKeyFile>LinqKit.EntityFramework.snk</AssemblyOriginatorKeyFile>
14+
<SignAssembly>true</SignAssembly>
15+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16+
<PackageId>LinqKit.EntityFramework</PackageId>
17+
<PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
18+
<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20+
<RepositoryType>git</RepositoryType>
21+
<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
22+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
23+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
24+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25+
</PropertyGroup>
2626

27-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
28-
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
29-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30-
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
28+
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
29+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30+
</PropertyGroup>
3131

32-
<ItemGroup>
33-
<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
34-
</ItemGroup>
32+
<ItemGroup>
33+
<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
34+
</ItemGroup>
3535

36-
<ItemGroup>
37-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
38-
<PrivateAssets>All</PrivateAssets>
39-
</PackageReference>
40-
<PackageReference Include="Timestamp" Version="1.0.2">
41-
<PrivateAssets>All</PrivateAssets>
42-
</PackageReference>
43-
<PackageReference Include="EntityFramework" Version="6.5.0" />
44-
</ItemGroup>
36+
<ItemGroup>
37+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
38+
<PrivateAssets>All</PrivateAssets>
39+
</PackageReference>
40+
<PackageReference Include="Timestamp" Version="1.0.2">
41+
<PrivateAssets>All</PrivateAssets>
42+
</PackageReference>
43+
<PackageReference Include="EntityFramework" Version="6.5.1" />
44+
</ItemGroup>
4545

46-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
47-
<Reference Include="System" />
48-
<Reference Include="Microsoft.CSharp" />
49-
</ItemGroup>
46+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
47+
<Reference Include="System" />
48+
<Reference Include="Microsoft.CSharp" />
49+
</ItemGroup>
5050

51-
<ItemGroup>
52-
<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
53-
</ItemGroup>
51+
<ItemGroup>
52+
<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
53+
</ItemGroup>
5454

5555
</Project>

‎src/LinqKit/LinqKit.csproj‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../version.xml" />
2+
<Import Project="../../version.xml" />
33

4-
<PropertyGroup>
5-
<Version>1.3.$(PatchVersion)</Version>
6-
<Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
7-
<AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
8-
<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
9-
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
10-
<DefineConstants>$(DefineConstants);EF</DefineConstants>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<AssemblyName>LinqKit</AssemblyName>
13-
<AssemblyOriginatorKeyFile>../LinqKit.Core/LinqKit.snk</AssemblyOriginatorKeyFile>
14-
<SignAssembly>true</SignAssembly>
15-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16-
<PackageId>LinqKit</PackageId>
17-
<PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
18-
<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
19-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20-
<RepositoryType>git</RepositoryType>
21-
<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
22-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
23-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
24-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25-
</PropertyGroup>
4+
<PropertyGroup>
5+
<Version>1.3.$(PatchVersion)</Version>
6+
<Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
7+
<AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
8+
<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
9+
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
10+
<DefineConstants>$(DefineConstants);EF</DefineConstants>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<AssemblyName>LinqKit</AssemblyName>
13+
<AssemblyOriginatorKeyFile>../LinqKit.Core/LinqKit.snk</AssemblyOriginatorKeyFile>
14+
<SignAssembly>true</SignAssembly>
15+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16+
<PackageId>LinqKit</PackageId>
17+
<PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
18+
<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20+
<RepositoryType>git</RepositoryType>
21+
<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
22+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
23+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
24+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25+
</PropertyGroup>
2626

27-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
28-
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
29-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30-
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
28+
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
29+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30+
</PropertyGroup>
3131

32-
<ItemGroup>
33-
<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
34-
<Compile Include="..\LinqKit.EntityFramework\ExtensionsEF.cs" />
35-
</ItemGroup>
32+
<ItemGroup>
33+
<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
34+
<Compile Include="..\LinqKit.EntityFramework\ExtensionsEF.cs" />
35+
</ItemGroup>
3636

37-
<ItemGroup>
38-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
39-
<PrivateAssets>All</PrivateAssets>
40-
</PackageReference>
41-
<PackageReference Include="EntityFramework" Version="6.5.0" />
42-
</ItemGroup>
37+
<ItemGroup>
38+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
39+
<PrivateAssets>All</PrivateAssets>
40+
</PackageReference>
41+
<PackageReference Include="EntityFramework" Version="6.5.1" />
42+
</ItemGroup>
4343

44-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
45-
<Reference Include="System" />
46-
<Reference Include="Microsoft.CSharp" />
47-
</ItemGroup>
44+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
45+
<Reference Include="System" />
46+
<Reference Include="Microsoft.CSharp" />
47+
</ItemGroup>
4848

49-
<ItemGroup>
50-
<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
51-
</ItemGroup>
49+
<ItemGroup>
50+
<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
51+
</ItemGroup>
5252

5353
</Project>

‎tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2424
<PackageReference Include="Moq" Version="4.8.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
2929
<PackageReference Include="xunit" Version="2.4.1" />
30-
<PackageReference Include="EntityFramework" Version="6.5.0" />
30+
<PackageReference Include="EntityFramework" Version="6.5.1" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

0 commit comments

Comments
 (0)