From 1b517959943e51f2e0432fcc829b13cebc66e6cb Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Sat, 15 Jun 2024 17:30:55 +0200
Subject: [PATCH] .

---
 .../LinqKit.EntityFramework.csproj            | 108 +++++++++---------
 src/LinqKit/LinqKit.csproj                    |   6 +-
 ...inqKit.EntityFramework.Tests.Net452.csproj |  63 +++++-----
 3 files changed, 83 insertions(+), 94 deletions(-)

diff --git a/src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj b/src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj
index 03dcbba..be68e93 100644
--- a/src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj
+++ b/src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj
@@ -1,59 +1,55 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../version.xml" />
-
-  <PropertyGroup>
-    <Version>1.2.$(PatchVersion)</Version>
-    <Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
-    <AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
-    <Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
-    <TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
-    <DefineConstants>$(DefineConstants);EF</DefineConstants>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>LinqKit.EntityFramework</AssemblyName>
-    <AssemblyOriginatorKeyFile>LinqKit.EntityFramework.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageId>LinqKit.EntityFramework</PackageId>
-    <PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
-    <PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions'  ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-      <PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
-          <PrivateAssets>All</PrivateAssets>
-      </PackageReference>
-      <PackageReference Include="Timestamp" Version="1.0.2">
-          <PrivateAssets>All</PrivateAssets>
-      </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="EntityFramework" Version="6.5.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="EntityFramework" Version="6.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
-  </ItemGroup>
+	<Import Project="../../version.xml" />
+
+	<PropertyGroup>
+		<Version>1.2.$(PatchVersion)</Version>
+		<Description>LinqKit.EntityFramework contains extensions for LINQ to SQL and Entity Framework. Include(...) and IAsync are supported.</Description>
+		<AssemblyTitle>LinqKit for EntityFramework with Include(...) and IAsync support.</AssemblyTitle>
+		<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
+		<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
+		<DefineConstants>$(DefineConstants);EF</DefineConstants>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<AssemblyName>LinqKit.EntityFramework</AssemblyName>
+		<AssemblyOriginatorKeyFile>LinqKit.EntityFramework.snk</AssemblyOriginatorKeyFile>
+		<SignAssembly>true</SignAssembly>
+		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+		<PackageId>LinqKit.EntityFramework</PackageId>
+		<PackageTags>linq;EF;EntityFramework;Entity;Framework</PackageTags>
+		<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions'  ">
+		<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs;..\LinqKit.Core\ExpandableDbAsyncEnumerator.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
+			<PrivateAssets>All</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Timestamp" Version="1.0.2">
+			<PrivateAssets>All</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="EntityFramework" Version="6.5.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+		<Reference Include="System" />
+		<Reference Include="Microsoft.CSharp" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
+	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/LinqKit/LinqKit.csproj b/src/LinqKit/LinqKit.csproj
index d630eac..3704ac9 100644
--- a/src/LinqKit/LinqKit.csproj
+++ b/src/LinqKit/LinqKit.csproj
@@ -38,16 +38,12 @@
         <PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
             <PrivateAssets>All</PrivateAssets>
         </PackageReference>
+	    <PackageReference Include="EntityFramework" Version="6.5.0" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
         <Reference Include="System" />
         <Reference Include="Microsoft.CSharp" />
-        <PackageReference Include="EntityFramework" Version="6.5.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-        <PackageReference Include="EntityFramework" Version="6.3.0" />
     </ItemGroup>
 
     <ItemGroup>
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 37d3618..ff0a8aa 100644
--- a/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj
+++ b/tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj
@@ -1,40 +1,37 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFramework>net452</TargetFramework>
-    <AssemblyName>LinqKit.Microsoft.EntityFrameworkCore.Tests</AssemblyName>
-    <PackageId>LinqKit.Microsoft.EntityFrameworkCore.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-  </PropertyGroup>
+	<PropertyGroup>
+		<Authors>Stef Heyenrath</Authors>
+		<TargetFramework>net452</TargetFramework>
+		<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore.Tests</AssemblyName>
+		<PackageId>LinqKit.Microsoft.EntityFrameworkCore.Tests</PackageId>
+		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\LinqKit.Tests.Net452\*.cs" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Include="..\LinqKit.Tests.Net452\*.cs" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\LinqKit.EntityFramework\LinqKit.EntityFramework.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\LinqKit.EntityFramework\LinqKit.EntityFramework.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Moq" Version="4.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+		<PackageReference Include="Moq" Version="4.8.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="EntityFramework" Version="6.5.0" />
+	</ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="EntityFramework" Version="6.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Properties\" />
+	</ItemGroup>
 
 </Project>
\ No newline at end of file