Skip to content

[release/11.0] Source code updates from dotnet/dotnet #38871

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
wtgodbe merged 3 commits into from
Aug 27, 2026
Merged

[release/11.0] Source code updates from dotnet/dotnet #38871

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
ddc71cc
Update dependencies from build 328805
dotnet-maestro[bot] Aug 26, 2026
bdad104
Update dependencies from build 328916
dotnet-maestro[bot] Aug 27, 2026
212009a
Update Nullable value exception assertions
Aug 27, 2026
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
34 changes: 17 additions & 17 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26425.121</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26425.121</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26425.121</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-rc.2.26425.121</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.2.26425.121</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-rc.2.26425.121</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-rc.2.26425.121</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-rc.2.26425.121</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-rc.2.26425.121</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-rc.2.26425.121</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26426.126</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26426.126</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26426.126</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-rc.2.26426.126</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.2.26426.126</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-rc.2.26426.126</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-rc.2.26426.126</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-rc.2.26426.126</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-rc.2.26426.126</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-rc.2.26426.126</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
70 changes: 35 additions & 35 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="e20a5af9c83aaf22b041bc9911de0cbfff9c7317" BarId="328663" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="100002779ceec649fcfd00c233f673b494130827" BarId="328916" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-rc.2.26425.121">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-rc.2.26425.121">
<Dependency Name="System.Text.Json" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-rc.2.26425.121">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="11.0.0-rc.2.26425.121">
<Dependency Name="System.Formats.Asn1" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="11.0.0-rc.2.26425.121">
<Dependency Name="System.Runtime.Caching" Version="11.0.0-rc.2.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26425.121">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26425.121">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26425.121">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26426.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e20a5af9c83aaf22b041bc9911de0cbfff9c7317</Sha>
<Sha>100002779ceec649fcfd00c233f673b494130827</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
22 changes: 13 additions & 9 deletions eng/common/core-templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ parameters:
# exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter.
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'

# GitHub App authentication for the OneLoc check-in PR (dnceng/internal only).
# The infrastructure identifiers are centralized here and the App path is enabled by default.
# DevDiv requires its own project-scoped service connection before this path can be enabled there.
# GitHub App authentication for the OneLoc check-in PR.
# dnceng/internal and DevDiv/DevDiv are enabled by default with their project-scoped service
# connections. Other projects must explicitly opt in after provisioning equivalent infrastructure.
UseGitHubAppAuthentication: true
UseGitHubAppAuthenticationInOtherProjects: false
GitHubAppServiceConnection: 'dnceng-oneloc-githubapp'
GitHubAppClientId: 'Iv23lijBU8x3gc9lDOc9'
GitHubAppKeyVaultName: 'EngKeyVault'
Expand Down Expand Up @@ -98,13 +99,16 @@ jobs:
outputVariableName: 'CeapexEntraToken'
condition: ${{ parameters.condition }}

# Mint a short-lived GitHub App installation token for the loc check-in PR (dnceng/internal only).
# All other projects fall back to PAT-based auth, since the app service connection is scoped to dnceng/internal.
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}:
# Mint a short-lived GitHub App installation token for the loc check-in PR. Use the connection
# provisioned in each supported project; other projects must explicitly opt in and override it.
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
- template: /eng/common/core-templates/steps/get-github-app-token.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
azureSubscription: ${{ parameters.GitHubAppServiceConnection }}
${{ if and(eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.GitHubAppServiceConnection, 'dnceng-oneloc-githubapp')) }}:
azureSubscription: 'devdiv-oneloc-githubapp'
${{ else }}:
azureSubscription: ${{ parameters.GitHubAppServiceConnection }}
keyVaultName: ${{ parameters.GitHubAppKeyVaultName }}
keyName: ${{ parameters.GitHubAppKeyName }}
appClientId: ${{ parameters.GitHubAppClientId }}
Expand Down Expand Up @@ -133,9 +137,9 @@ jobs:
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
${{ if and(eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}:
${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
gitHubPatVariable: "$(GitHubAppInstallationToken)"
${{ if or(eq(parameters.UseGitHubAppAuthentication, false), ne(variables['System.TeamProject'], 'internal')) }}:
${{ else }}:
gitHubPatVariable: "${{ parameters.GithubPat }}"
${{ if ne(parameters.MirrorRepo, '') }}:
isMirrorRepoSelected: true
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/publish-logs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ steps:
# Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
# If the file exists - sensitive data for redaction will be sourced from it
# (single entry per line, lines starting with '# ' are considered comments and skipped)
${{ if and(parameters.enableInternalRuntimes, ne(variables['System.TeamProject'], 'public')) }}:
${{ if and(eq(parameters.enableInternalRuntimes, true), ne(variables['System.TeamProject'], 'public')) }}:
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
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 @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26425.121",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26425.121",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26426.126",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26426.126",
"Microsoft.Build.NoTargets": "3.7.134"
}
}
4 changes: 3 additions & 1 deletion ...tionalTests/Query/Associations/ComplexProperties/ComplexPropertiesProjectionCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,9 @@ public override async Task Select_nullable_value_type_with_Value(QueryTrackingBe
{
var ex =
await Assert.ThrowsAsync<InvalidOperationException>(() => base.Select_nullable_value_type_with_Value(queryTrackingBehavior));
Assert.Equal("Nullable object must have a value.", ex.Message);
Assert.Equal(
"Cannot read the Value property of a Nullable object that has no value. Check HasValue before reading Value.",
ex.Message);

AssertSql(
"""
Expand Down
4 changes: 3 additions & 1 deletion test/EFCore.Cosmos.FunctionalTests/Query/JsonQueryCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,9 @@ public virtual async Task Project_null_value_required_scalar()

// Same as in 10.0
var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => context.Set<Context21006.Entity>().Where(x => x.Id == 4).Select(x => x.RequiredReference.Number).ToListAsync());
Assert.Equal("Nullable object must have a value.", ex.Message);
Assert.Equal(
"Cannot read the Value property of a Nullable object that has no value. Check HasValue before reading Value.",
ex.Message);
}

public override Task Project_root_entity_with_missing_required_navigation(bool async)
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public override Task Client_member_and_unsupported_string_Equals_in_the_same_que
public override async Task
Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex(bool async)
=> Assert.Equal(
"Nullable object must have a value.",
"Cannot read the Value property of a Nullable object that has no value. Check HasValue before reading Value.",
(await Assert.ThrowsAsync<InvalidOperationException>(() => base
.Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex(
async))).Message);
Expand Down Expand Up @@ -126,7 +126,7 @@ public override Task Subquery_inside_Take_argument(bool async)

public override async Task Find_underlying_property_after_GroupJoin_DefaultIfEmpty(bool async)
=> Assert.Equal(
"Nullable object must have a value.",
"Cannot read the Value property of a Nullable object that has no value. Check HasValue before reading Value.",
(await Assert.ThrowsAsync<InvalidOperationException>(() => base
.Find_underlying_property_after_GroupJoin_DefaultIfEmpty(
async))).Message);
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.FunctionalTests/Query/NorthwindAggregateOperatorsQueryInMemoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override async Task Average_on_nav_subquery_in_projection(bool async)

public override async Task Sum_over_scalar_returning_subquery(bool async)
=> Assert.Equal(
"Nullable object must have a value.",
"Cannot read the Value property of a Nullable object that has no value. Check HasValue before reading Value.",
(await Assert.ThrowsAsync<InvalidOperationException>(() => base.Sum_over_scalar_returning_subquery(async))).Message);

public override Task Collection_Last_member_access_in_projection_translated(bool async)
Expand Down
4 changes: 2 additions & 2 deletions .../EFCore.Relational.Specification.Tests/Query/AdHocMiscellaneousQueryRelationalTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ public virtual async Task Plain_inner_no_aggregate_LeftJoin_whole_object()
.OrderBy(e => e.PickupStatusId);

var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => query.ToListAsync());
Assert.Contains("Nullable object must have a value", ex.Message);
Assert.Contains("Cannot read the Value property of a Nullable object that has no value", ex.Message);
// #30915 TODO: currently throws on base; flip to assert results if/when fixed.
}

Expand Down Expand Up @@ -1428,7 +1428,7 @@ public virtual async Task RightJoin_whole_object_outer_nullable()
// marker is injected for the INNER nullable side of LEFT JOIN / DefaultIfEmpty only, so this
// RIGHT JOIN whole-object shape is not covered and still fails during materialization.
var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => query.ToListAsync());
Assert.Contains("Nullable object must have a value", ex.Message);
Assert.Contains("Cannot read the Value property of a Nullable object that has no value", ex.Message);
// #30915 TODO: RightJoin (outer-nullable) whole-object not yet covered; flip to assert results if/when fixed.
}

Expand Down
Loading
Loading