Skip to content

Commit c1152b4

Browse files
koenbeukkoenbeuk
committed
Add .NET9 TFM adn consolidate on C# 14
1 parent ed4cc38 commit c1152b4

18 files changed

Lines changed: 64 additions & 21 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
with:
2929
dotnet-version: |
3030
8.0.x
31+
9.0.x
3132
10.0.x
3233
3334
- name: Cache NuGet packages

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
with:
3131
dotnet-version: |
3232
8.0.x
33+
9.0.x
3334
10.0.x
3435
3536
- name: Cache NuGet packages

‎Directory.Build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5-
<LangVersion>12.0</LangVersion>
6-
<LangVersion Condition="'$(TargetFramework)' == 'net10.0'">14.0</LangVersion>
5+
<LangVersion>14.0</LangVersion>
76
<Nullable>enable</Nullable>
87
<EnableNETAnalyzers>true</EnableNETAnalyzers>
98
<EnableMSTestAnalyzers>true</EnableMSTestAnalyzers>

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
1818
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
1919
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.60" />
20+
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.4" />
2021
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
2122
</ItemGroup>
2223
</Project>

‎benchmarks/ExpressiveSharp.Benchmarks/ExpressiveSharp.Benchmarks.csproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@
88
<ItemGroup>
99
<PackageReference Include="BenchmarkDotNet" />
1010
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="10.0.5" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
12+
Condition="'$(TargetFramework)' == 'net8.0'"
13+
VersionOverride="8.0.25" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
15+
Condition="'$(TargetFramework)' == 'net9.0'"
16+
VersionOverride="9.0.0" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
18+
Condition="'$(TargetFramework)' == 'net10.0'"
19+
VersionOverride="10.0.5" />
1220
<PackageReference Include="Basic.Reference.Assemblies.Net100" />
1321
</ItemGroup>
1422

‎samples/EFCoreSample/EFCoreSample.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<ItemGroup>
99
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
1010
Condition="'$(TargetFramework)' == 'net8.0'" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
12+
Condition="'$(TargetFramework)' == 'net9.0'"
13+
VersionOverride="9.0.0" />
1114
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"
1215
Condition="'$(TargetFramework)' == 'net10.0'"
1316
VersionOverride="10.0.5" />

‎src/ExpressiveSharp.EntityFrameworkCore.RelationalExtensions/ExpressiveSharp.EntityFrameworkCore.RelationalExtensions.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational"
1111
Condition="'$(TargetFramework)' == 'net8.0'"
1212
VersionOverride="8.0.25" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational"
14+
Condition="'$(TargetFramework)' == 'net9.0'"
15+
VersionOverride="9.0.0" />
1316
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational"
1417
Condition="'$(TargetFramework)' == 'net10.0'"
1518
VersionOverride="10.0.0" />

‎src/ExpressiveSharp.EntityFrameworkCore.RelationalExtensions/Infrastructure/Internal/WindowFunctionParameterBasedSqlProcessor.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal sealed class WindowFunctionParameterBasedSqlProcessor : RelationalParam
1515
{
1616
private readonly RelationalParameterBasedSqlProcessor _inner;
1717

18-
#if NET10_0_OR_GREATER
18+
#if NET9_0_OR_GREATER
1919
public WindowFunctionParameterBasedSqlProcessor(
2020
RelationalParameterBasedSqlProcessor inner,
2121
RelationalParameterBasedSqlProcessorDependencies dependencies,
@@ -24,15 +24,6 @@ public WindowFunctionParameterBasedSqlProcessor(
2424
{
2525
_inner = inner;
2626
}
27-
28-
public override Expression Process(
29-
Expression queryExpression,
30-
ParametersCacheDecorator parametersDecorator)
31-
{
32-
var wrapped = WindowFunctionSqlExpressionWrapper.WrapAll(queryExpression, out var stash);
33-
var processed = _inner.Process(wrapped, parametersDecorator);
34-
return WindowFunctionSqlExpressionWrapper.UnwrapAll(processed, stash);
35-
}
3627
#else
3728
public WindowFunctionParameterBasedSqlProcessor(
3829
RelationalParameterBasedSqlProcessor inner,
@@ -44,7 +35,16 @@ public WindowFunctionParameterBasedSqlProcessor(
4435
}
4536
#endif
4637

47-
#if !NET10_0_OR_GREATER
38+
#if NET10_0_OR_GREATER
39+
public override Expression Process(
40+
Expression queryExpression,
41+
ParametersCacheDecorator parametersDecorator)
42+
{
43+
var wrapped = WindowFunctionSqlExpressionWrapper.WrapAll(queryExpression, out var stash);
44+
var processed = _inner.Process(wrapped, parametersDecorator);
45+
return WindowFunctionSqlExpressionWrapper.UnwrapAll(processed, stash);
46+
}
47+
#else
4848
public override Expression Optimize(
4949
Expression queryExpression,
5050
IReadOnlyDictionary<string, object?> parametersValues,

‎src/ExpressiveSharp.EntityFrameworkCore.RelationalExtensions/Infrastructure/Internal/WindowFunctionParameterBasedSqlProcessorFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public WindowFunctionParameterBasedSqlProcessorFactory(
2121
_dependencies = dependencies;
2222
}
2323

24-
#if NET10_0_OR_GREATER
24+
#if NET9_0_OR_GREATER
2525
public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters) =>
2626
new WindowFunctionParameterBasedSqlProcessor(_inner.Create(parameters), _dependencies, parameters);
2727
#else

‎src/ExpressiveSharp.EntityFrameworkCore.RelationalExtensions/Infrastructure/Internal/WindowFunctionSqlExpression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void EmitWindowFunction(Action<string> appendText, Action<Expression> vi
104104
appendText(")");
105105
}
106106

107-
#if NET10_0_OR_GREATER
107+
#if NET9_0_OR_GREATER
108108
public override Expression Quote() =>
109109
throw new InvalidOperationException("WindowFunctionSqlExpression quoting is not supported.");
110110
#endif

0 commit comments

Comments
 (0)