Skip to content

Commit cf13138

Browse files
Merge pull request #50 from thomasbach-dk/dotnet10
Ensure .NET 10 compatibility
2 parents aad075e + 4f091a9 commit cf13138

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11-
<PackageReference Include="NodaTime" Version="3.2.0" />
12-
<PackageReference Include="xunit" Version="2.9.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
11+
<PackageReference Include="NodaTime" Version="3.2.2" />
12+
<PackageReference Include="xunit" Version="2.9.3" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="6.0.2">
17+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Query/ExpressionTranslators/BaseNodaTimeMemberTranslator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SqlExpression Translate(SqlExpression instance, MemberInfo member, Type r
3838
{
3939
return _sqlExpressionFactory.Function(
4040
"DATEPART",
41-
new[] { _sqlExpressionFactory.Fragment(datePart), instance },
41+
new[] { new SqlFragmentExpression(datePart), instance },
4242
false,
4343
_argumentsPropagateNullability,
4444
returnType);

src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Query/ExpressionTranslators/BaseNodaTimeMethodCallTranslator.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadO
5757
name: "DATEADD",
5858
arguments: new[]
5959
{
60-
_sqlExpressionFactory.Fragment(dateAddPart),
60+
new SqlFragmentExpression(dateAddPart),
6161
_sqlExpressionFactory.Convert(arguments[0], typeof(int)),
6262
instance
6363
},
@@ -76,7 +76,7 @@ public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadO
7676
name: "DATEADD",
7777
arguments: new[]
7878
{
79-
_sqlExpressionFactory.Fragment(dateAddExtensionPart),
79+
new SqlFragmentExpression(dateAddExtensionPart),
8080
_sqlExpressionFactory.Convert(arguments[1], typeof(int)),
8181
arguments[0]
8282
},
@@ -91,7 +91,7 @@ public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadO
9191
name: "DATEPART",
9292
arguments: new[]
9393
{
94-
_sqlExpressionFactory.Fragment(datePart),
94+
new SqlFragmentExpression(datePart),
9595
arguments[0]
9696
},
9797
nullable: false,
@@ -110,7 +110,7 @@ public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadO
110110

111111
return _sqlExpressionFactory.Function(
112112
name: "DATEDIFF",
113-
arguments: new[] { _sqlExpressionFactory.Fragment(dateDiffDatePart), startDate, endDate },
113+
arguments: new[] { new SqlFragmentExpression(dateDiffDatePart), startDate, endDate },
114114
nullable: false,
115115
argumentsPropagateNullability: _3argumentsPropagateNullability,
116116
returnType: method.ReturnType,
@@ -127,7 +127,7 @@ public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadO
127127

128128
return _sqlExpressionFactory.Function(
129129
name: "DATEDIFF_BIG",
130-
arguments: new[] { _sqlExpressionFactory.Fragment(dateDiffBigDatePart), startDate, endDate },
130+
arguments: new[] { new SqlFragmentExpression(dateDiffBigDatePart), startDate, endDate },
131131
nullable: false,
132132
argumentsPropagateNullability: _3argumentsPropagateNullability,
133133
returnType: method.ReturnType,

src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -14,14 +14,14 @@
1414
<RepositoryUrl>https://github.com/StevenRasmussen/EFCore.SqlServer.NodaTime</RepositoryUrl>
1515
<RepositoryType>git</RepositoryType>
1616
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFrameworkCore;EFCore;Noda;NodaTime;Noda Time</PackageTags>
17-
<Version>9.1.1</Version>
17+
<Version>10.0.0</Version>
1818
<PackageReadmeFile>README.md</PackageReadmeFile>
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
24-
<PackageReference Include="NodaTime" Version="3.2.0" />
22+
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
24+
<PackageReference Include="NodaTime" Version="3.2.2" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)