8000 [main] Source code updates from dotnet/efcore by dotnet-maestro[bot] · Pull Request #1391 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content
8000

[main] Source code updates from dotnet/efcore #1391

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 3, 2025
Merged

[main] Source code updates from dotnet/efcore #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10bdfa2
[efcore] Source update 14b439c → 4d458fb
dotnet-maestro[bot] Jul 3, 2025
4fe0146
Merge main into darc-main-8fc03b1c-e721-4c27-9548-3eb667452e66
dotnet-maestro[bot] Jul 3, 2025
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
74 changes: 37 additions & 37 deletions src/efcore/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="1bc437cd77614e60dc6068da6cffeaae1804c72e" BarId="273256" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="df4663b92c2f2d25b66e44524478d9016c812949" BarId="273813" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25326.109">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25326.109">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25326.109">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25326.109">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25326.109">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25326.109">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25326.109">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25326.109">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25351.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1bc437cd77614e60dc6068da6cffeaae1804c72e</Sha>
<Sha>df4663b92c2f2d25b66e44524478d9016c812949</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions src/efcore/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25326.109</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25326.109</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25326.109</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25326.109</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25326.109</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25326.109</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25326.109</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25351.105</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25351.105</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25351.105</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25351.105</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25351.105</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25351.105</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25326.109</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25351.105</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/efcore/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25326.109",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25326.109"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.105",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.105"
}
}
74 changes: 74 additions & 0 deletions src/efcore/src/EFCore.Relational/Extensions/RelationalComplexCollectionBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Microsoft.EntityFrameworkCore;

/// <summary>
/// Relational database specific extension methods for <see cref="ComplexCollectionBuilder" />.
/// </summary>
/// <remarks>
/// See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> for more information and examples.
/// </remarks>
public static class RelationalComplexCollectionBuilderExtensions
{
/// <summary>
/// Configures the complex collection to be stored as a JSON column.
/// </summary>
/// <param name="complexCollectionBuilder">The builder for the complex collection being configured.</param>
/// <param name="jsonColumnName">The name of the JSON column. If not specified, the complex collection name is used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexCollectionBuilder ToJson(
this ComplexCollectionBuilder complexCollectionBuilder,
string? jsonColumnName = null)
{
Check.NullButNotEmpty(jsonColumnName);

var complexProperty = complexCollectionBuilder.Metadata;
complexProperty.ComplexType.SetContainerColumnName(jsonColumnName ?? complexProperty.Name);

return complexCollectionBuilder;
}

/// <summary>
/// Configures the complex collection to be stored as a JSON column.
/// </summary>
/// <param name="complexCollectionBuilder">The builder for the complex collection being configured.</param>
/// <param name="jsonColumnName">The name of the JSON column. If not specified, the complex collection name is used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexCollectionBuilder<TComplex> ToJson<TComplex>(
this ComplexCollectionBuilder<TComplex> complexCollectionBuilder,
string? jsonColumnName = null)
where TComplex : class
=> (ComplexCollectionBuilder<TComplex>)ToJson((ComplexCollectionBuilder)complexCollectionBuilder, jsonColumnName);

/// <summary>
/// Configures the complex property contained in a JSON column to map to a specific JSON property,
/// rather than using the property name.
/// </summary>
/// <param name="complexCollectionBuilder">The builder for the property being configured.</param>
/// <param name="name">JSON property name to be used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexCollectionBuilder HasJsonPropertyName(
this ComplexCollectionBuilder complexCollectionBuilder,
string? name)
{
Check.NullButNotEmpty(name);

complexCollectionBuilder.Metadata.SetJsonPropertyName(name);

return complexCollectionBuilder;
}

/// <summary>
/// Configures the complex property contained in a JSON column to map to a specific JSON property,
/// rather than using the property name.
/// </summary>
/// <param name="complexCollectionBuilder">The builder for the property being configured.</param>
/// <param name="name">JSON property name to be used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexCollectionBuilder<TComplex> HasJsonPropertyName<TComplex>(
this ComplexCollectionBuilder<TComplex> complexCollectionBuilder,
string? name)
where TComplex : notnull
=> (ComplexCollectionBuilder<TComplex>)HasJsonPropertyName((ComplexCollectionBuilder)complexCollectionBuilder, name);
}
75 changes: 75 additions & 0 deletions src/efcore/src/EFCore.Relational/Extensions/RelationalComplexPropertyBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Microsoft.EntityFrameworkCore;

/// <summary>
/// Relational database specific extension methods for <see cref="ComplexPropertyBuilder" />.
/// </summary>
/// <remarks>
/// See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> for more information and examples.
/// </remarks>
public static class RelationalComplexPropertyBuilderExtensions
{
/// <summary>
/// Configures the complex property to be stored as a JSON column.
/// </summary>
/// <param name="complexPropertyBuilder">The builder for the complex property being configured.</param>
/// <param name="jsonColumnName">The name of the JSON column. If not specified, the complex property name is used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexPropertyBuilder ToJson(
this ComplexPropertyBuilder complexPropertyBuilder,
string? jsonColumnName = null)
{
Check.NullButNotEmpty(jsonColumnName);

var complexProperty = complexPropertyBuilder.Metadata;

complexProperty.ComplexType.SetContainerColumnName(jsonColumnName ?? complexProperty.Name);

return complexPropertyBuilder;
}

/// <summary>
/// Configures the complex property to be stored as a JSON column.
/// </summary>
/// <param name="complexPropertyBuilder">The builder for the complex property being configured.</param>
/// <param name="jsonColumnName">The name of the JSON column. If not specified, the complex property name is used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexPropertyBuilder<TComplex> ToJson<TComplex>(
this ComplexPropertyBuilder<TComplex> complexPropertyBuilder,
string? jsonColumnName = null)
where TComplex : class
=> (ComplexPropertyBuilder<TComplex>)ToJson((ComplexPropertyBuilder)complexPropertyBuilder, jsonColumnName);

/// <summary>
/// Configures the complex property of an entity mapped to a JSON column, mapping the complex property to a specific JSON property,
/// rather than using the complex property name.
/// </summary>
/// <param name="complexPropertyBuilder">The builder for the complex property being configured.</param>
/// <param name="name">JSON property name to be used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexPropertyBuilder HasJsonPropertyName(
this ComplexPropertyBuilder complexPropertyBuilder,
string? name)
{
Check.NullButNotEmpty(name);

complexPropertyBuilder.Metadata.SetJsonPropertyName(name);

return complexPropertyBuilder;
}

/// <summary>
/// Configures the complex property of an entity mapped to a JSON column, mapping the complex property to a specific JSON property,
/// rather than using the complex property name.
/// </summary>
/// <param name="complexPropertyBuilder">The builder for the complex property being configured.</param>
/// <param name="name">JSON property name to be used.</param>
/// <returns>The same builder instance so that multiple calls can be chained.</returns>
public static ComplexPropertyBuilder<TComplex> HasJsonPropertyName<TComplex>(
this ComplexPropertyBuilder<TComplex> complexPropertyBuilder,
string? name)
where TComplex : notnull
=> (ComplexPropertyBuilder<TComplex>)HasJsonPropertyName((ComplexPropertyBuilder)complexPropertyBuilder, name);
}
Loading
0