Supporting .NET version 9.0. (#56)

* Supporting .NET version 9.0.
BpsLogicBuilder · Nov 25, 2024 · 4fd5037 · 4fd5037
1 parent 52941fa
commit 4fd5037
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 98 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,13 +23,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.x
         source-url: https://nuget.pkg.github.com/bpslogicbuilder/index.json
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Add Telerik Nuget source
-      run: dotnet nuget add source https://nuget.telerik.com/nuget -n telerik -u ${{ secrets.TELERIK_USERNAME }} -p ${{ secrets.TELERIK_PASSWORD }}
+      run: dotnet nuget add source https://nuget.telerik.com/v3/index.json -n telerik -u ${{ secrets.TELERIK_USERNAME }} -p ${{ secrets.TELERIK_PASSWORD }}
 
     - name: Add AutoMapper Myget Source
       run: dotnet nuget add source https://www.myget.org/F/automapperdev/api/v3/index.json -n automappermyget

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,13 +21,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.x
         source-url: https://nuget.pkg.github.com/bpslogicbuilder/index.json
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Add Telerik Nuget source
-      run: dotnet nuget add source https://nuget.telerik.com/nuget -n telerik -u ${{ secrets.TELERIK_USERNAME }} -p ${{ secrets.TELERIK_PASSWORD }}
+      run: dotnet nuget add source https://nuget.telerik.com/v3/index.json -n telerik -u ${{ secrets.TELERIK_USERNAME }} -p ${{ secrets.TELERIK_PASSWORD }}
 
     - name: Set Variables
       run: |

diff --git a/LogicBuilder.Data/LogicBuilder.Data.csproj b/LogicBuilder.Data/LogicBuilder.Data.csproj
@@ -22,11 +22,11 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<None Include="docs\README.md" Pack="true" PackagePath="\"/>
+		<None Include="docs\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/LogicBuilder.Domain/LogicBuilder.Domain.csproj b/LogicBuilder.Domain/LogicBuilder.Domain.csproj
@@ -22,11 +22,11 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<None Include="docs\README.md" Pack="true" PackagePath="\"/>
+		<None Include="docs\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...erver.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj b/...erver.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...tityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj b/...tityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj b/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <RootNamespace>LogicBuilder.EntityFrameworkCore.SqlServer</RootNamespace>
     <PackageId>LogicBuilder.EntityFrameworkCore.SqlServer</PackageId>
     <Authors>BlaiseD</Authors>
     <Description>Given an EF Core DBContext, LogicBuilder.EntityFrameworkCore.SqlServer uses AutoMapper configurations to support CRUD operations using the DTO objects.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Bug fix: Allow delete after updating an entity.</PackageReleaseNotes>
+    <PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
     <PackageTags>crud operations efcore</PackageTags>
     <Copyright>Copyright © BPS 2017</Copyright>
     <RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
@@ -22,31 +22,27 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<None Include="docs\README.md" Pack="true" PackagePath="\"/>
+		<None Include="docs\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[7.0.0,8.0.0)" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[7.0.2,8.0.0)" />
     <PackageReference Include="LogicBuilder.Data" Version="6.0.3" />
     <PackageReference Include="LogicBuilder.Domain" Version="6.0.3" />
 		<PackageReference Include="LogicBuilder.Expressions.Utils" Version="6.0.3" />
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
 	</ItemGroup>
 
   <ItemGroup>

diff --git a/...ilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj b/...ilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <RootNamespace>LogicBuilder.Expressions.EntityFrameworkCore</RootNamespace>
     <PackageId>LogicBuilder.Expressions.EntityFrameworkCore</PackageId>
     <Authors>BlaiseD</Authors>
@@ -22,28 +22,24 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<None Include="docs\README.md" Pack="true" PackagePath="\"/>
+		<None Include="docs\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="LogicBuilder.Expressions.Utils" Version="6.0.3" />
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </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 Condition=" '$(TargetFramework)' == 'net8.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj b/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj
@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="8.2.2" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/LogicBuilder.Expressions.Utils.Tests/QueryableExpressionTests.cs b/LogicBuilder.Expressions.Utils.Tests/QueryableExpressionTests.cs
@@ -1,6 +1,5 @@
 using Contoso.Data.Entities;
 using LogicBuilder.Expressions.Utils.ExpressionBuilder;
-using LogicBuilder.Expressions.Utils.ExpressionBuilder.Arithmetic;
 using LogicBuilder.Expressions.Utils.ExpressionBuilder.Cacnonical;
 using LogicBuilder.Expressions.Utils.ExpressionBuilder.Collection;
 using LogicBuilder.Expressions.Utils.ExpressionBuilder.Lambda;
@@ -9,7 +8,6 @@
 using LogicBuilder.Expressions.Utils.Tests.Data;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using Xunit;

diff --git a/LogicBuilder.Expressions.Utils/Constants.cs b/LogicBuilder.Expressions.Utils/Constants.cs
@@ -10,9 +10,11 @@ public struct AttributeNames
         public const string PROPERTYSOURCEPARAMETER = "propertySourceParameter";
     }
 
-    public struct NET6OnlyLiteralTypeNames
+    public struct UnreferencedLiteralTypeNames
     {
         public const string DATEONLY = "System.DateOnly";
         public const string TIMEONLY = "System.TimeOnly";
+        public const string DATE = "Microsoft.OData.Edm.Date";
+        public const string TIMEOFDAY = "Microsoft.OData.Edm.TimeOfDay";
     }
 }
diff --git a/...der.Expressions.Utils/ExpressionBuilder/DateTimeOperators/ConvertToNumericDateOperator.cs b/...der.Expressions.Utils/ExpressionBuilder/DateTimeOperators/ConvertToNumericDateOperator.cs
@@ -1,5 +1,4 @@
-using Microsoft.OData.Edm;
-using System;
+using System;
 using System.Linq.Expressions;
 
 namespace LogicBuilder.Expressions.Utils.ExpressionBuilder.DateTimeOperators
@@ -21,8 +20,8 @@ private Expression Build(Expression operandExpression)
 
             if (operandExpression.Type != typeof(DateTimeOffset) 
                 && operandExpression.Type != typeof(DateTime) 
-                && operandExpression.Type != typeof(Date)
-                && operandExpression.Type.FullName != NET6OnlyLiteralTypeNames.DATEONLY)
+                && operandExpression.Type.FullName != UnreferencedLiteralTypeNames.DATE
+                && operandExpression.Type.FullName != UnreferencedLiteralTypeNames.DATEONLY)
                 return operandExpression;
 
             return Expression.Add

diff --git a/...der.Expressions.Utils/ExpressionBuilder/DateTimeOperators/ConvertToNumericTimeOperator.cs b/...der.Expressions.Utils/ExpressionBuilder/DateTimeOperators/ConvertToNumericTimeOperator.cs
@@ -1,5 +1,4 @@
-using Microsoft.OData.Edm;
-using System;
+using System;
 using System.Linq.Expressions;
 
 namespace LogicBuilder.Expressions.Utils.ExpressionBuilder.DateTimeOperators
@@ -22,8 +21,8 @@ private Expression Build(Expression operandExpression)
             if (operandExpression.Type != typeof(DateTimeOffset) 
                 && operandExpression.Type != typeof(DateTime) 
                 && operandExpression.Type != typeof(TimeSpan)
-                && operandExpression.Type != typeof(TimeOfDay)
-                && operandExpression.Type.FullName != NET6OnlyLiteralTypeNames.TIMEONLY)
+                && operandExpression.Type.FullName != UnreferencedLiteralTypeNames.TIMEOFDAY
+                && operandExpression.Type.FullName != UnreferencedLiteralTypeNames.TIMEONLY)
                 return operandExpression;
 
             return Expression.Add

diff --git a/LogicBuilder.Expressions.Utils/LinqHelpers.cs b/LogicBuilder.Expressions.Utils/LinqHelpers.cs
@@ -1,7 +1,6 @@
 using LogicBuilder.Expressions.Utils.ExpressionBuilder;
 using LogicBuilder.Expressions.Utils.ExpressionBuilder.Lambda;
 using LogicBuilder.Expressions.Utils.Strutures;
-using Microsoft.OData.Edm;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -214,8 +213,8 @@ public static Expression MakeDaySelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTime)
                             || operandExpression.Type == typeof(DateTimeOffset)
-                            || operandExpression.Type == typeof(Date)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.DATEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATE
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATEONLY)
                 return operandExpression.MakeSelector("Day");
             else
                 throw new ArgumentException(nameof(operandExpression));
@@ -227,8 +226,8 @@ public static Expression MakeMonthSelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTime)
                             || operandExpression.Type == typeof(DateTimeOffset)
-                            || operandExpression.Type == typeof(Date)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.DATEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATE
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATEONLY)
                 return operandExpression.MakeSelector("Month");
             else
                 throw new ArgumentException(nameof(operandExpression));
@@ -240,8 +239,8 @@ public static Expression MakeYearSelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTime)
                             || operandExpression.Type == typeof(DateTimeOffset)
-                            || operandExpression.Type == typeof(Date)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.DATEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATE
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.DATEONLY)
                 return operandExpression.MakeSelector("Year");
             else
                 throw new ArgumentException(nameof(operandExpression));
@@ -253,12 +252,12 @@ public static Expression MakeHourSelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTimeOffset)
                             || operandExpression.Type == typeof(DateTime)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.TIMEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEONLY)
             {
                 return operandExpression.MakeSelector("Hour");
             }
             else if (operandExpression.Type == typeof(TimeSpan)
-                || operandExpression.Type == typeof(TimeOfDay))
+                || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEOFDAY)
             {
                 return operandExpression.MakeSelector("Hours");
             }
@@ -272,12 +271,12 @@ public static Expression MakeMinuteSelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTimeOffset)
                             || operandExpression.Type == typeof(DateTime)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.TIMEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEONLY)
             {
                 return operandExpression.MakeSelector("Minute");
             }
             else if (operandExpression.Type == typeof(TimeSpan)
-                || operandExpression.Type == typeof(TimeOfDay))
+                || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEOFDAY)
             {
                 return operandExpression.MakeSelector("Minutes");
             }
@@ -291,12 +290,12 @@ public static Expression MakeSecondSelector(this Expression operandExpression)
 
             if (operandExpression.Type == typeof(DateTimeOffset)
                             || operandExpression.Type == typeof(DateTime)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.TIMEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEONLY)
             {
                 return operandExpression.MakeSelector("Second");
             }
             else if (operandExpression.Type == typeof(TimeSpan)
-                || operandExpression.Type == typeof(TimeOfDay))
+                || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEOFDAY)
             {
                 return operandExpression.MakeSelector("Seconds");
             }
@@ -310,12 +309,12 @@ public static Expression MakeMillisecondSelector(this Expression operandExpressi
 
             if (operandExpression.Type == typeof(DateTimeOffset)
                             || operandExpression.Type == typeof(DateTime)
-                            || operandExpression.Type.FullName == NET6OnlyLiteralTypeNames.TIMEONLY)
+                            || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEONLY)
             {
                 return operandExpression.MakeSelector("Millisecond");
             }
             else if (operandExpression.Type == typeof(TimeSpan)
-                || operandExpression.Type == typeof(TimeOfDay))
+                || operandExpression.Type.FullName == UnreferencedLiteralTypeNames.TIMEOFDAY)
             {
                 return operandExpression.MakeSelector("Milliseconds");
             }