Removing references to net5.0. (#188)

AutoMapper · Aug 19, 2023 · 68ff04d · 68ff04d
1 parent 8e522ea
commit 68ff04d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 43 deletions.
diff --git a/AutoMapper.AspNetCore.OData.EFCore/Constants.cs b/AutoMapper.AspNetCore.OData.EFCore/Constants.cs
@@ -13,9 +13,7 @@ internal static class Constants
             typeof(DateTimeOffset),
             typeof(DateTime),
             typeof(Date),
-#if NET6_0 || NET7_0
             typeof(DateOnly)
-#endif
         };
 
         public static HashSet<Type> DateTimeRelatedTypes = new()
@@ -24,10 +22,8 @@ internal static class Constants
             typeof(DateTime),
             typeof(TimeSpan),
             typeof(TimeOfDay),
-#if NET6_0 || NET7_0
             typeof(TimeOnly),
             typeof(DateOnly),
-#endif
             typeof(Date)
         };
 

diff --git a/AutoMapper.AspNetCore.OData.EFCore/FilterHelper.cs b/AutoMapper.AspNetCore.OData.EFCore/FilterHelper.cs
@@ -715,16 +715,12 @@ private bool ShouldConvertToNumericDate(BinaryOperatorNode binaryOperatorNode)
 
             static bool ShouldConvert(Type leftType, Type rightType)
                 => BothTypesDateRelated(leftType, rightType)
-#if NET6_0 || NET7_0
                     && (
                             leftType == typeof(Date)
                             || rightType == typeof(Date)
                             || leftType == typeof(DateOnly)
                             || rightType == typeof(DateOnly)
                        );
-#else
-                    && (leftType == typeof(Date) || rightType == typeof(Date));
-#endif
         }
 
         private bool ShouldConvertToNumericTime(BinaryOperatorNode binaryOperatorNode)
@@ -740,16 +736,12 @@ private bool ShouldConvertToNumericTime(BinaryOperatorNode binaryOperatorNode)
 
             static bool ShouldConvert(Type leftType, Type rightType)
                 => BothTypesDateTimeRelated(leftType, rightType)
-#if NET6_0 || NET7_0
                     && (
                             leftType == typeof(TimeOfDay)
                             || rightType == typeof(TimeOfDay)
                             || leftType == typeof(TimeOnly)
                             || rightType == typeof(TimeOnly)
                        );
-#else
-                    && (leftType == typeof(TimeOfDay) || rightType == typeof(TimeOfDay));
-#endif
         }
 
         public IExpressionPart GetConstantOperandFilterPart(ConstantNode constantNode)

diff --git a/DAL.EFCore/DAL.EFCore.csproj b/DAL.EFCore/DAL.EFCore.csproj
@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 	</PropertyGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
-	</ItemGroup>
-
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/MigrationTool/MigrationTool.csproj b/MigrationTool/MigrationTool.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+	</ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DAL.EFCore\DAL.EFCore.csproj" />

diff --git a/MigrationTool/Migrations/20200918094359_initial.Designer.cs b/MigrationTool/Migrations/20200918094359_initial.Designer.cs
diff --git a/MigrationTool/Migrations/20200918094359_initial.cs b/MigrationTool/Migrations/20200918094359_initial.cs
@@ -3,7 +3,7 @@
 
 namespace MigrationTool.Migrations
 {
-    public partial class initial : Migration
+    public partial class Initial : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

diff --git a/SeedDatabase/SeedDatabase.csproj b/SeedDatabase/SeedDatabase.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+	</ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DAL.EFCore\DAL.EFCore.csproj" />