Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

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
Jun 23, 2025
Merged

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

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
4514895
[efcore] Source update 33e9cd7 → 4588678
dotnet-maestro[bot] Jun 21, 2025
ae9567b
Merge branch main into darc-main-c35cf57b-417b-4a10-b37c-fa66ce1a2697
dotnet-maestro[bot] Jun 21, 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 74 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="9bcfe617e4f615d6931e2eec47767c3f15116d1d" BarId="272322" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="10060d128e3f470e77265f8490f5e4f72dae738e" BarId="272389" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25318.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25318.104">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25318.104">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25318.104">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25318.104">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25318.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25318.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25318.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25318.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
<Sha>10060d128e3f470e77265f8490f5e4f72dae738e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions 32 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.25318.104</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25318.104</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25318.104</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25318.104</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25318.104</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25318.104</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25318.104</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25318.105</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25318.105</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25318.105</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25318.105</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25318.105</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25318.105</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25318.105</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25318.104</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25318.105</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
Expand Down
6 changes: 0 additions & 6 deletions 6 src/efcore/eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi

baseRidArgs=
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
fi

portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
Expand All @@ -55,7 +50,6 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$baseRidArgs \
$portableBuildArgs \
displayName: Build

Expand Down
4 changes: 2 additions & 2 deletions 4 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.25318.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25318.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25318.105",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25318.105"
}
}
6 changes: 3 additions & 3 deletions 6 src/source-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"commitSha": "c80de30e0d582df0c6fb9b24e8b10c3a78c97161"
},
{
"packageVersion": "10.0.0-preview.7.25318.2",
"barId": 272403,
"packageVersion": "10.0.0-preview.7.25320.1",
"barId": 272560,
"path": "efcore",
"remoteUri": "https://github.com/dotnet/efcore",
"commitSha": "202d207420bb3b035973c0b5b6da6018ec64c49e"
"commitSha": "4588678bb94b2710977907db00ae7ddcd67156fc"
},
{
"packageVersion": "10.0.0-preview.7.25316.1",
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.