Skip to content

Commit f3fb1a6

Browse files
rojiroji
authored
Sync to EF Core 9.0.0-preview.7.24405.3 (#3258)
1 parent 36295e9 commit f3fb1a6

File tree

136 files changed

+3005
-1724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+3005
-1724
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>9.0.0-preview.4</VersionPrefix>
3+
<VersionPrefix>9.0.0-preview.7</VersionPrefix>
44
<LangVersion>latest</LangVersion>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<AnalysisLevel>latest</AnalysisLevel>

‎Directory.Packages.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>9.0.0-preview.3.24172.4</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>9.0.0-preview.3.24172.9</MicrosoftExtensionsVersion>
3+
<EFCoreVersion>[9.0.0-preview.7.24405.3]</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>9.0.0-preview.7.24405.7</MicrosoftExtensionsVersion>
55
<NpgsqlVersion>8.0.3</NpgsqlVersion>
66
</PropertyGroup>
77

@@ -21,14 +21,15 @@
2121
<PackageVersion Include="Npgsql.NetTopologySuite" Version="$(NpgsqlVersion)" />
2222
<PackageVersion Include="Npgsql.DependencyInjection" Version="$(NpgsqlVersion)" />
2323

24+
<!-- Workaround for unsecure dependency on EF.Specification.Tests -->
25+
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
26+
2427
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2528
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
26-
<!-- <PackageVersion Include="xunit" Version="2.6.7-pre.5" />-->
27-
<!-- <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7-pre.8" />-->
28-
<PackageVersion Include="xunit" Version="2.7.1" />
29-
<PackageVersion Include="xunit.assert" Version="2.7.1" />
30-
<PackageVersion Include="xunit.core" Version="2.7.1" />
31-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
29+
<PackageVersion Include="xunit" Version="2.8.1" />
30+
<PackageVersion Include="xunit.assert" Version="2.8.1" />
31+
<PackageVersion Include="xunit.core" Version="2.8.1" />
32+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
3233
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
3334
</ItemGroup>
3435
</Project>

‎src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMemberTranslatorPlugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public NpgsqlGeometryMemberTranslator(
172172
_ => null
173173
};
174174

175-
SqlFunctionExpression Function(string name, SqlExpression[] arguments, Type returnType, RelationalTypeMapping? typeMapping = null)
175+
SqlExpression Function(string name, SqlExpression[] arguments, Type returnType, RelationalTypeMapping? typeMapping = null)
176176
=> _sqlExpressionFactory.Function(
177177
name, arguments,
178178
nullable: true, argumentsPropagateNullability: TrueArrays[arguments.Length],

‎src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMethodCallTranslatorPlugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public NpgsqlGeometryMethodTranslator(
220220
_ => null
221221
};
222222

223-
SqlFunctionExpression Function(string name, SqlExpression[] arguments, Type returnType, RelationalTypeMapping? typeMapping = null)
223+
SqlExpression Function(string name, SqlExpression[] arguments, Type returnType, RelationalTypeMapping? typeMapping = null)
224224
=> _sqlExpressionFactory.Function(
225225
name, arguments,
226226
nullable: true, argumentsPropagateNullability: TrueArrays[arguments.Length],

‎src/EFCore.PG.NTS/Storage/Internal/NpgsqlJsonGeometryWktReaderWriter.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
1010
/// </summary>
1111
public sealed class NpgsqlJsonGeometryWktReaderWriter : JsonValueReaderWriter<Geometry>
1212
{
13+
private static readonly PropertyInfo InstanceProperty = typeof(NpgsqlJsonGeometryWktReaderWriter).GetProperty(nameof(Instance))!;
14+
1315
private static readonly WKTReader WktReader = new();
1416

1517
/// <summary>
@@ -28,4 +30,7 @@ public override Geometry FromJsonTyped(ref Utf8JsonReaderManager manager, object
2830
/// <inheritdoc />
2931
public override void ToJsonTyped(Utf8JsonWriter writer, Geometry value)
3032
=> writer.WriteStringValue(value.ToText());
33+
34+
/// <inheritdoc />
35+
public override Expression ConstructorExpression => Expression.Property(null, InstanceProperty);
3136
}

‎src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMemberTranslatorPlugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public NpgsqlNodaTimeMemberTranslator(
175175
_ => null,
176176
};
177177

178-
SqlBinaryExpression TranslateDurationTotalMember(SqlExpression instance, double divisor)
178+
SqlExpression TranslateDurationTotalMember(SqlExpression instance, double divisor)
179179
=> _sqlExpressionFactory.Divide(GetDatePartExpressionDouble(instance, "epoch"), _sqlExpressionFactory.Constant(divisor));
180180
}
181181

‎src/EFCore.PG.NodaTime/Storage/Internal/DateMapping.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ public override Expression GenerateCodeLiteral(object value)
116116

117117
private sealed class JsonLocalDateReaderWriter : JsonValueReaderWriter<LocalDate>
118118
{
119+
private static readonly PropertyInfo InstanceProperty = typeof(JsonLocalDateReaderWriter).GetProperty(nameof(Instance))!;
120+
119121
public static JsonLocalDateReaderWriter Instance { get; } = new();
120122

121123
public override LocalDate FromJsonTyped(ref Utf8JsonReaderManager manager, object? existingObject = null)
@@ -138,5 +140,8 @@ public override LocalDate FromJsonTyped(ref Utf8JsonReaderManager manager, objec
138140

139141
public override void ToJsonTyped(Utf8JsonWriter writer, LocalDate value)
140142
=> writer.WriteStringValue(FormatLocalDate(value));
143+
144+
/// <inheritdoc />
145+
public override Expression ConstructorExpression => Expression.Property(null, InstanceProperty);
141146
}
142147
}

‎src/EFCore.PG.NodaTime/Storage/Internal/DurationIntervalMapping.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,17 @@ void Compose(Expression toAdd)
137137

138138
private sealed class JsonDurationReaderWriter : JsonValueReaderWriter<Duration>
139139
{
140+
private static readonly PropertyInfo InstanceProperty = typeof(JsonDurationReaderWriter).GetProperty(nameof(Instance))!;
141+
140142
public static JsonDurationReaderWriter Instance { get; } = new();
141143

142144
public override Duration FromJsonTyped(ref Utf8JsonReaderManager manager, object? existingObject = null)
143145
=> Duration.FromTimeSpan(NpgsqlIntervalTypeMapping.ParseIntervalAsTimeSpan(manager.CurrentReader.GetString()!));
144146

145147
public override void ToJsonTyped(Utf8JsonWriter writer, Duration value)
146148
=> writer.WriteStringValue(NpgsqlIntervalTypeMapping.FormatTimeSpanAsInterval(value.ToTimeSpan()));
149+
150+
/// <inheritdoc />
151+
public override Expression ConstructorExpression => Expression.Property(null, InstanceProperty);
147152
}
148153
}

‎src/EFCore.PG.NodaTime/Storage/Internal/PeriodIntervalMapping.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,17 @@ void Compose(Expression toAdd)
163163

164164
private sealed class JsonPeriodReaderWriter : JsonValueReaderWriter<Period>
165165
{
166+
private static readonly PropertyInfo InstanceProperty = typeof(JsonPeriodReaderWriter).GetProperty(nameof(Instance))!;
167+
166168
public static JsonPeriodReaderWriter Instance { get; } = new();
167169

168170
public override Period FromJsonTyped(ref Utf8JsonReaderManager manager, object? existingObject = null)
169171
=> PeriodPattern.NormalizingIso.Parse(manager.CurrentReader.GetString()!).GetValueOrThrow();
170172

171173
public override void ToJsonTyped(Utf8JsonWriter writer, Period value)
172174
=> writer.WriteStringValue(PeriodPattern.NormalizingIso.Format(value));
175+
176+
/// <inheritdoc />
177+
public override Expression ConstructorExpression => Expression.Property(null, InstanceProperty);
173178
}
174179
}

‎src/EFCore.PG.NodaTime/Storage/Internal/TimeMapping.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,17 @@ public override Expression GenerateCodeLiteral(object value)
119119

120120
private sealed class JsonLocalTimeReaderWriter : JsonValueReaderWriter<LocalTime>
121121
{
122+
private static readonly PropertyInfo InstanceProperty = typeof(JsonLocalTimeReaderWriter).GetProperty(nameof(Instance))!;
123+
122124
public static JsonLocalTimeReaderWriter Instance { get; } = new();
123125

124126
public override LocalTime FromJsonTyped(ref Utf8JsonReaderManager manager, object? existingObject = null)
125127
=> LocalTimePattern.ExtendedIso.Parse(manager.CurrentReader.GetString()!).GetValueOrThrow();
126128

127129
public override void ToJsonTyped(Utf8JsonWriter writer, LocalTime value)
128130
=> writer.WriteStringValue(LocalTimePattern.ExtendedIso.Format(value));
131+
132+
/// <inheritdoc />
133+
public override Expression ConstructorExpression => Expression.Property(null, InstanceProperty);
129134
}
130135
}

0 commit comments

Comments
 (0)