Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/8.0' => 'main' #31775

Merged
merged 2 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0-rc.2.23465.13">
<Dependency Name="System.Text.Json" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-rc.2.23465.13">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-rc.2.23466.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f262154e0a2129e51313bb1b35aa6aeee4dca4fb</Sha>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
26 changes: 13 additions & 13 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-rc.2.23465.13</MicrosoftExtensionsLoggingVersion>
<SystemTextJsonVersion>8.0.0-rc.2.23465.13</SystemTextJsonVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-rc.2.23465.13</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rc.2.23465.13</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-rc.2.23465.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-rc.2.23466.4</MicrosoftExtensionsLoggingVersion>
<SystemTextJsonVersion>8.0.0-rc.2.23466.4</SystemTextJsonVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreBrowserDebugHostTransportVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23451.1</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,13 @@ protected override Expression VisitMethodCall(MethodCallExpression call)
methodIdentifier),
ArgumentList(SeparatedList(arguments[1..])));
}
else if (call.Method is { Name: "op_Equality", IsHideBySig: true, IsSpecialName: true })
{
Result = BinaryExpression(
SyntaxKind.EqualsExpression,
Translate<ExpressionSyntax>(call.Arguments[0]),
Translate<ExpressionSyntax>(call.Arguments[1]));
}
else
{
ExpressionSyntax expression;
Expand All @@ -1440,12 +1447,23 @@ ExpressionSyntax GetMemberAccessesForAllDeclaringTypes(Type type)
expression = Translate<ExpressionSyntax>(call.Object);
}

Result = InvocationExpression(
MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
if (call.Method.Name.StartsWith("get_", StringComparison.Ordinal)
&& call.Method.GetParameters().Length == 1
&& call.Method is { IsHideBySig: true, IsSpecialName: true })
{
Result = ElementAccessExpression(
expression,
methodIdentifier),
ArgumentList(SeparatedList(arguments)));
BracketedArgumentList(SeparatedList(arguments)));
}
else
{
Result = InvocationExpression(
MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
expression,
methodIdentifier),
ArgumentList(SeparatedList(arguments)));
}
}

if (call.Method.DeclaringType.Namespace is { } ns)
Expand Down Expand Up @@ -1904,7 +1922,11 @@ protected override Expression VisitTypeBinary(TypeBinaryExpression node)
/// <inheritdoc />
protected override Expression VisitUnary(UnaryExpression unary)
{
if (unary.Method is not null)
if (unary.Method is not null
&& !unary.Method.IsHideBySig
&& !unary.Method.IsSpecialName
&& unary.Method.Name != "op_Implicit"
&& unary.Method.Name != "op_Explicit")
{
throw new NotImplementedException("Unary node with non-null method");
}
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Storage/ByteTypeMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ByteTypeMapping : RelationalTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static ByteArrayTypeMapping Default { get; } = new("tinyint");
public static ByteTypeMapping Default { get; } = new("tinyint");

/// <summary>
/// Initializes a new instance of the <see cref="ByteTypeMapping" /> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class SqliteGuidTypeMapping : GuidTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static new readonly SqliteGuidTypeMapping Default = new(SqliteTypeMappingSource.TextTypeName);
public static new SqliteGuidTypeMapping Default { get; } = new(SqliteTypeMappingSource.TextTypeName);

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private static readonly ConstructorInfo MemoryStreamConstructor
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static readonly SqliteJsonTypeMapping Default = new(SqliteTypeMappingSource.TextTypeName);
public static SqliteJsonTypeMapping Default { get; } = new(SqliteTypeMappingSource.TextTypeName);

/// <summary>
/// Initializes a new instance of the <see cref="SqliteJsonTypeMapping" /> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class SqliteStringTypeMapping : StringTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static new readonly SqliteStringTypeMapping Default = new(SqliteTypeMappingSource.TextTypeName);
public static new SqliteStringTypeMapping Default { get; } = new(SqliteTypeMappingSource.TextTypeName);

/// <summary>
/// Initializes a new instance of the <see cref="SqliteStringTypeMapping" /> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class SqliteTimeOnlyTypeMapping : TimeOnlyTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static new readonly SqliteTimeOnlyTypeMapping Default = new(SqliteTypeMappingSource.TextTypeName);
public static new SqliteTimeOnlyTypeMapping Default { get; } = new(SqliteTypeMappingSource.TextTypeName);

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class SqliteULongTypeMapping : ULongTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static new readonly SqliteULongTypeMapping Default = new(SqliteTypeMappingSource.IntegerTypeName);
public static new SqliteULongTypeMapping Default { get; } = new(SqliteTypeMappingSource.IntegerTypeName);

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,7 @@ public static void Create(
CreateJsonValueReaderWriter((JsonValueReaderWriter)jsonReaderWriterProperty.GetValue(converter)!, parameters, codeHelper);

mainBuilder
.Append(")")
.DecrementIndent();
.Append(")");
}
}

Expand Down Expand Up @@ -443,8 +442,7 @@ public static void Create(
Create((ValueComparer)elementComparerProperty.GetValue(comparer)!, parameters, codeHelper);

mainBuilder
.Append(")")
.DecrementIndent();
.Append(")");
}
}

Expand Down
Loading