Skip to content

[main] Source code updates from dotnet/dotnet #36415

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
dotnet-maestro merged 3 commits into from
Jul 23, 2025
Merged

[main] Source code updates from dotnet/dotnet #36415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b83d145
[VMR] Codeflow badb1e8-badb1e8
dotnet-maestro[bot] Jul 23, 2025
325171a
Merge main into darc-main-550d6da1-aec1-4323-b035-c93d216b3e0c
dotnet-maestro[bot] Jul 23, 2025
90f7b3a
Update dependencies from https://github.com/dotnet/dotnet build 276277
dotnet-maestro[bot] Jul 23, 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 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="1c92f346e02a8363def6f7bdbcc526d3c579dd74" BarId="275898" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="96ac952a7886b565e83acc4c9cef656954ed0686" BarId="276277" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25368.105">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25368.105">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25368.105">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25368.105">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25368.105">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25368.105">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25368.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25368.105">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25372.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1c92f346e02a8363def6f7bdbcc526d3c579dd74</Sha>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions 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.25368.105</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25368.105</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25368.105</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25368.105</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25368.105</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25368.105</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25368.105</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25368.105</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25372.103</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25372.103</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25372.103</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25372.103</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25372.103</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25372.103</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25368.105</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25372.103</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
Expand Down
4 changes: 2 additions & 2 deletions 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.25368.105",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.105"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103"
}
}
16 changes: 8 additions & 8 deletions src/EFCore/Properties/CoreStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/EFCore/Properties/CoreStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@
<data name="CanOnlyConfigureExistingNavigations" xml:space="preserve">
<value>Navigation '{1_entityType}.{0_navigationName}' was not found. Please add the navigation to the entity type before configuring it.</value>
</data>
<data name="ChangeTrackingInterfaceMissing" xml:space="preserve">
<value>The entity type '{entityType}' is configured to use the '{changeTrackingStrategy}' change tracking strategy, but does not implement the required '{notificationInterface}' interface. Implement '{notificationInterface}' on '{entityType}' or use a different change tracking strategy.</value>
</data>
<data name="CircularDependency" xml:space="preserve">
<value>Unable to save changes because a circular dependency was detected in the data to be saved: '{cycle}'.</value>
</data>
Expand Down Expand Up @@ -678,6 +675,9 @@
<data name="HiLoBadBlockSize" xml:space="preserve">
<value>The block size used for Hi-Lo value generation is not positive. The Hi-Lo generator is usually backed by a SQL sequence and this means that the sequence increment must be positive.</value>
</data>
<data name="ChangeTrackingInterfaceMissing" xml:space="preserve">
<value>The entity type '{entityType}' is configured to use the '{changeTrackingStrategy}' change tracking strategy, but does not implement the required '{notificationInterface}' interface. Implement '{notificationInterface}' on '{entityType}' or use a different change tracking strategy.</value>
</data>
<data name="IdentifyingRelationshipCycle" xml:space="preserve">
<value>A relationship cycle involving the primary keys of the following entity types was detected: '{entityType}'. This would prevent any entity to be inserted without violating the store constraints. Review the foreign keys defined on the primary keys and either remove or use other properties for at least one of them.</value>
</data>
Expand Down
Loading