From 75d19ff8e3bb977600b014de7400440677d73e1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 22:17:04 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/arcade build 20240916.2 (#34701) [release/9.0-rc2] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38804068fcb..864a993f633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,17 +63,17 @@ - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 04b9022eba9c184a8036328af513c22e6949e8b6 diff --git a/eng/Versions.props b/eng/Versions.props index 91f24188b04..e6f9cfd9b85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ 9.0.0-rc.2.24456.9 - 9.0.0-beta.24453.1 + 9.0.0-beta.24466.2 17.8.3 @@ -43,6 +43,6 @@ 1.12.0 1.3.2 1.8.1 - 2.1.10 + 2.1.10 diff --git a/global.json b/global.json index ec891a9d891..1aeb665ebfa 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2" } } From c5835ccf0a792a322168c19b210135f75654ba3b Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 20 Sep 2024 00:54:13 +0000 Subject: [PATCH 02/15] Merged PR 42953: [internal/release/9.0-rc2] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2177b436-b119-4fb2-9dc5-a86eb51fb875) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 2177b436-b119-4fb2-9dc5-a86eb51fb875 - **Build**: 20240918.7 - **Date Produced**: September 19, 2024 7:08:57 AM UTC - **Commit**: 2dc643f60ef1841bd32f07473cca3b6c65148b7d - **Branch**: refs/heads/internal/release/9.0-rc2 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.Configuration**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.Extensions.Logging**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.NETCore.App.Ref**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **System.Formats.Asn1**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **System.Text.Encodings.Web**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] - **System.Text.Json**: [from 9.0.0-rc.2.24467.12 to 9.0.0-rc.2.24468.7][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC17830f83e8e4c2e939f92f172e62fbd261c8592d&targetVersion=GC2dc643f60ef1841bd32f07473cca3b6c65148b7d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2177b436-b119-4fb2-9dc5-a86eb51fb875) --- Directory.Packages.props | 2 + NuGet.config | 30 +------ azure-pipelines.yml | 11 +++ eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 28 +++---- .../steps/get-delegation-sas.yml | 11 ++- src/EFCore.Analyzers/EFCore.Analyzers.csproj | 2 +- src/EFCore.Design/EFCore.Design.csproj | 2 +- src/EFCore.SqlServer/EFCore.SqlServer.csproj | 2 +- .../EFCore.Sqlite.Core.csproj | 2 +- src/EFCore.Tasks/EFCore.Tasks.csproj | 2 +- 11 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b54137363c7..2a88b69da3e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,6 +7,8 @@ true true true + + $(NoWarn);NU1507 diff --git a/NuGet.config b/NuGet.config index 21b746fb5ac..a7e22c6acaf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,32 +16,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1b28fae5108..8741f1c3b71 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -187,6 +187,7 @@ extends: displayName: Build - task: AzureCLI@2 displayName: Run Cosmos tests + condition: notin(variables['Build.Reason'], 'PullRequest', 'Schedule') inputs: azureSubscription: EFCosmosTesting scriptType: bash @@ -231,6 +232,16 @@ extends: arguments: 'locals all -clear' - template: /eng/common/templates-official/steps/enable-internal-sources.yml - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: 'dotnetbuilds-internal-read' + outputVariableName: 'dotnetbuilds-internal-container-read-token' + expiryInHours: 1 + base64Encode: false + storageAccount: dotnetbuilds + container: internal + permissions: rl - script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs) displayName: Restore packages - script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 864a993f633..9c32d5aa765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d - - https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2dc643f60ef1841bd32f07473cca3b6c65148b7d diff --git a/eng/Versions.props b/eng/Versions.props index e6f9cfd9b85..3fc42ba3954 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,20 +16,20 @@ False - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24468.7 9.0.0-beta.24466.2 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a7f..571846efc62 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj index 90c28c46a19..3a73644bec0 100644 --- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -10,7 +10,7 @@ $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true true - NU5128 + $(NoWarn);NU5128 diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj index 9fb32f5f722..caae39e9f4f 100644 --- a/src/EFCore.Design/EFCore.Design.csproj +++ b/src/EFCore.Design/EFCore.Design.csproj @@ -8,7 +8,7 @@ true true true - EF9100 + $(NoWarn);EF9100 diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 9c55dc8c9bf..fff89e95202 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -9,7 +9,7 @@ true $(PackageTags);SQL Server true - EF9100 + $(NoWarn);EF9100 diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj index ce21537a399..b916b92851a 100644 --- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj +++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj @@ -10,7 +10,7 @@ true $(PackageTags);SQLite true - EF9100 + $(NoWarn);EF9100 diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index a84046e613c..eb72b2ae76a 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -10,7 +10,7 @@ true true true - NU5100;NU5128 + $(NoWarn);NU5100;NU5128 true $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset From c59bf30392cfd2cb4f64cb05cc0d713758e72059 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 20 Sep 2024 08:25:43 +0000 Subject: [PATCH 03/15] [internal/release/9.0-rc2] Update dependencies from dnceng/internal/dotnet-runtime --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c32d5aa765..19066d4bf38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2dc643f60ef1841bd32f07473cca3b6c65148b7d + 327e087789062a8930335aa2a214d1c21ec26173 diff --git a/eng/Versions.props b/eng/Versions.props index 3fc42ba3954..a5a56523381 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,20 +16,20 @@ False - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 - 9.0.0-rc.2.24468.7 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24469.6 9.0.0-beta.24466.2 From 0499d093323445fd461f68f26bec5e02a9a13886 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 23 Sep 2024 18:45:44 +0000 Subject: [PATCH 04/15] Merged PR 43075: [internal/release/9.0-rc2] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2177b436-b119-4fb2-9dc5-a86eb51fb875) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 2177b436-b119-4fb2-9dc5-a86eb51fb875 - **Build**: 20240921.4 - **Date Produced**: September 23, 2024 3:46:32 PM UTC - **Commit**: 002e894b34e678524323398e11c1485f9fd5c5dd - **Branch**: refs/heads/internal/release/9.0-rc2 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.Configuration**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.Extensions.Logging**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **System.Formats.Asn1**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **System.Text.Encodings.Web**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] - **System.Text.Json**: [from 9.0.0-rc.2.24469.6 to 9.0.0-rc.2.24471.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC327e087789062a8930335aa2a214d1c21ec26173&targetVersion=GC002e894b34e678524323398e11c1485f9fd5c5dd&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2177b436-b119-4fb2-9dc5-a86eb51fb875) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19066d4bf38..e1c3bbe22b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 327e087789062a8930335aa2a214d1c21ec26173 + 002e894b34e678524323398e11c1485f9fd5c5dd diff --git a/eng/Versions.props b/eng/Versions.props index a5a56523381..2964611f91e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,20 +16,20 @@ False - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 - 9.0.0-rc.2.24469.6 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24471.4 9.0.0-beta.24466.2 From d0599b96b5f9c9e11d7c032688328478e830ae4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Sep 2024 02:31:27 +0000 Subject: [PATCH 05/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240923.5 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json From Version 9.0.0-rc.2.24471.4 -> To Version 9.0.0-rc.2.24473.5 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1c3bbe22b6..13321ff83c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 002e894b34e678524323398e11c1485f9fd5c5dd + 990ebf52fc408ca45929fd176d2740675a67fab8 diff --git a/eng/Versions.props b/eng/Versions.props index 2964611f91e..8704aa376bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,20 +16,20 @@ False - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 - 9.0.0-rc.2.24471.4 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 + 9.0.0-rc.2.24473.5 9.0.0-beta.24466.2 From 0bf4e1cdfea9abd78dedd7c45018fc8fcec39718 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 26 Sep 2024 13:31:00 -0700 Subject: [PATCH 06/15] [release/9.0] Tools: Fallback to service provider when no context types found (#34759) Fixes #34758 --- .../Design/Internal/DbContextOperations.cs | 6 ++-- ...spNetIdentityCustomTypesDefaultTestBase.cs | 3 +- .../Internal/DbContextOperationsTest.cs | 28 +++++++++++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/EFCore.Design/Design/Internal/DbContextOperations.cs b/src/EFCore.Design/Design/Internal/DbContextOperations.cs index d076d3ac68e..da44b15b283 100644 --- a/src/EFCore.Design/Design/Internal/DbContextOperations.cs +++ b/src/EFCore.Design/Design/Internal/DbContextOperations.cs @@ -447,7 +447,7 @@ public virtual DbContext CreateContext(string? contextType) public virtual IEnumerable CreateAllContexts() { EF.IsDesignTime = true; - var types = FindContextTypes(); + var types = FindContextTypes(useServiceProvider: false); foreach (var contextPair in types) { yield return CreateContext(null, contextPair); @@ -499,7 +499,7 @@ public virtual IEnumerable GetContextTypes() public virtual Type GetContextType(string? name) => FindContextType(name).Key; - private IDictionary> FindContextTypes(string? name = null) + private IDictionary> FindContextTypes(string? name = null, bool useServiceProvider = true) { _reporter.WriteVerbose(DesignStrings.FindingContexts); @@ -576,7 +576,7 @@ where i.IsGenericType } if (contexts.Values.All(f => f != null) - && (string.IsNullOrEmpty(name) || contexts.Count == 1)) + && (!useServiceProvider || contexts.Count == 1)) { return contexts!; } diff --git a/test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesDefaultTestBase.cs b/test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesDefaultTestBase.cs index b88e33d4923..3c62689b1b3 100644 --- a/test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesDefaultTestBase.cs +++ b/test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesDefaultTestBase.cs @@ -348,12 +348,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .WithMany(e => e.Users) .UsingEntity( j => j.HasOne(e => e.Role).WithMany(e => e.UserRoles).HasForeignKey(e => e.RoleId), - j => j.HasOne(e => e.User).WithMany(e => e.UserRoles).HasForeignKey(e => e.RoleId)); + j => j.HasOne(e => e.User).WithMany(e => e.UserRoles).HasForeignKey(e => e.UserId)); b.HasMany(e => e.Claims).WithOne(e => e.User).HasForeignKey(uc => uc.UserId).IsRequired(); b.HasMany(e => e.Logins).WithOne(e => e.User).HasForeignKey(ul => ul.UserId).IsRequired(); b.HasMany(e => e.Tokens).WithOne(e => e.User).HasForeignKey(ut => ut.UserId).IsRequired(); - b.HasMany(e => e.UserRoles).WithOne(e => e.User).HasForeignKey(ur => ur.UserId).IsRequired(); b.ToTable("MyUsers"); b.Property(u => u.UserName).HasMaxLength(128); b.Property(u => u.NormalizedUserName).HasMaxLength(128); diff --git a/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs b/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs index 0ab95ab7bfd..990345659b5 100644 --- a/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs +++ b/test/EFCore.Design.Tests/Design/Internal/DbContextOperationsTest.cs @@ -10,7 +10,11 @@ public class DbContextOperationsTest { [ConditionalFact] public void CreateContext_gets_service() - => CreateOperations(typeof(TestProgram)).CreateContext(typeof(TestContext).FullName.ToLower()); + => CreateOperations(typeof(TestProgram), includeContext: false).CreateContext(typeof(TestContext).FullName.ToLower()); + + [ConditionalFact] + public void CreateContext_gets_service_without_name() + => CreateOperations(typeof(TestProgram), includeContext: false).CreateContext(null); [ConditionalFact] public void CreateContext_gets_service_without_AddDbContext() @@ -18,7 +22,11 @@ public void CreateContext_gets_service_without_AddDbContext() [ConditionalFact] public void CreateContext_gets_service_when_context_factory_used() - => CreateOperations(typeof(TestProgramWithContextFactory)).CreateContext(typeof(TestContextFromFactory).FullName); + => CreateOperations(typeof(TestProgramWithContextFactory), includeContext: false).CreateContext(typeof(TestContextFromFactory).FullName); + + [ConditionalFact] + public void CreateContext_gets_service_when_context_factory_used_without_name() + => CreateOperations(typeof(TestProgramWithContextFactory), includeContext: false).CreateContext(null); [ConditionalFact] public void CreateContext_throws_if_context_type_not_found() @@ -230,10 +238,9 @@ public void Optimize_throws_when_no_contexts() Assert.Equal( DesignStrings.NoContextsToOptimize, - Assert.Throws( - () => - operations.Optimize( - null, null, contextTypeName: "*", null, scaffoldModel: true, precompileQueries: false, nativeAot: false)).Message); + Assert.Throws(() => + operations.Optimize( + null, null, contextTypeName: "*", null, scaffoldModel: true, precompileQueries: false, nativeAot: false)).Message); Assert.DoesNotContain(reporter.Messages, m => m.Level == LogLevel.Critical); Assert.DoesNotContain(reporter.Messages, m => m.Level == LogLevel.Error); @@ -364,9 +371,14 @@ private static TestWebHost BuildWebHost(string[] args) => CreateWebHost(b => b.UseSqlServer(@"Cake=None")); } - private static TestDbContextOperations CreateOperations(Type testProgramType) + private static TestDbContextOperations CreateOperations(Type testProgramType, bool includeContext = true) { - var assembly = MockAssembly.Create(testProgramType, typeof(TestContext)); + List types = [testProgramType]; + if (includeContext) + { + types.Add(typeof(TestContext)); + } + var assembly = MockAssembly.Create([.. types]); var reporter = new TestOperationReporter(); var operations = new TestDbContextOperations( reporter, From fc705003a96f7be19f381cfdb50d51dcdf224585 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Fri, 27 Sep 2024 14:15:54 -0700 Subject: [PATCH 07/15] [release/9.0] Use the specified migrations assembly in validation (#34777) Fixes #34772 --- .../Design/Internal/MigrationsOperations.cs | 18 ++++++++---- .../Migrations/Internal/MigrationsAssembly.cs | 5 ++-- .../Internal/MigrationsOperationsTest.cs | 29 +++++++++++++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/EFCore.Design/Design/Internal/MigrationsOperations.cs b/src/EFCore.Design/Design/Internal/MigrationsOperations.cs index e841e680ac9..88a7603b5fa 100644 --- a/src/EFCore.Design/Design/Internal/MigrationsOperations.cs +++ b/src/EFCore.Design/Design/Internal/MigrationsOperations.cs @@ -287,13 +287,19 @@ private void EnsureMigrationsAssembly(IServiceProvider services) var assemblyName = _assembly.GetName(); var options = services.GetRequiredService(); var contextType = services.GetRequiredService().Context.GetType(); - var migrationsAssemblyName = RelationalOptionsExtension.Extract(options).MigrationsAssembly - ?? contextType.Assembly.GetName().Name; - if (assemblyName.Name != migrationsAssemblyName - && assemblyName.FullName != migrationsAssemblyName) + var optionsExtension = RelationalOptionsExtension.Extract(options); + if (optionsExtension.MigrationsAssemblyObject == null + || optionsExtension.MigrationsAssemblyObject != _assembly) { - throw new OperationException( - DesignStrings.MigrationsAssemblyMismatch(assemblyName.Name, migrationsAssemblyName)); + var migrationsAssemblyName = optionsExtension.MigrationsAssembly + ?? optionsExtension.MigrationsAssemblyObject?.GetName().Name + ?? contextType.Assembly.GetName().Name; + if (assemblyName.Name != migrationsAssemblyName + && assemblyName.FullName != migrationsAssemblyName) + { + throw new OperationException( + DesignStrings.MigrationsAssemblyMismatch(assemblyName.Name, migrationsAssemblyName)); + } } } } diff --git a/src/EFCore.Relational/Migrations/Internal/MigrationsAssembly.cs b/src/EFCore.Relational/Migrations/Internal/MigrationsAssembly.cs index bfbfa0af56e..9b0c75444cd 100644 --- a/src/EFCore.Relational/Migrations/Internal/MigrationsAssembly.cs +++ b/src/EFCore.Relational/Migrations/Internal/MigrationsAssembly.cs @@ -31,8 +31,9 @@ public MigrationsAssembly( { _contextType = currentContext.Context.GetType(); - var assemblyName = RelationalOptionsExtension.Extract(options).MigrationsAssembly; - var assemblyObject = RelationalOptionsExtension.Extract(options).MigrationsAssemblyObject; + var optionsExtension = RelationalOptionsExtension.Extract(options); + var assemblyName = optionsExtension.MigrationsAssembly; + var assemblyObject = optionsExtension.MigrationsAssemblyObject; Assembly = assemblyName == null ? assemblyObject ?? _contextType.Assembly diff --git a/test/EFCore.Design.Tests/Design/Internal/MigrationsOperationsTest.cs b/test/EFCore.Design.Tests/Design/Internal/MigrationsOperationsTest.cs index dba09218fed..5e02c2ca914 100644 --- a/test/EFCore.Design.Tests/Design/Internal/MigrationsOperationsTest.cs +++ b/test/EFCore.Design.Tests/Design/Internal/MigrationsOperationsTest.cs @@ -22,5 +22,34 @@ public void Can_pass_null_args() args: null); } + [ConditionalFact] + public void Can_use_migrations_assembly() + { + // Even though newer versions of the tools will pass an empty array + // older versions of the tools can pass null args. + var assembly = MockAssembly.Create(typeof(AssemblyTestContext)); + var migrationsAssembly = MockAssembly.Create(); + AssemblyTestContext.MigrationsAssembly = migrationsAssembly; + var testOperations = new TestMigrationsOperations( + new TestOperationReporter(), + assembly, + assembly, + "projectDir", + "RootNamespace", + "C#", + nullable: false, + args: null); + + testOperations.AddMigration("Test", null, null, null, dryRun: true); + } + private class TestContext : DbContext; + + private class AssemblyTestContext : DbContext + { + public static Assembly MigrationsAssembly { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + => optionsBuilder.UseSqlServer(o => o.MigrationsAssembly(MigrationsAssembly)); + } } From ab821853763801fa53b2c442f7f762303421aea1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:37:45 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/arcade build 20240923.1 (#34798) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8435f2d7f1f..fa18bfafb2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,17 +63,17 @@ - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 diff --git a/eng/Versions.props b/eng/Versions.props index 99a39945444..83ebebef418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 9.0.0-rtm.24473.2 - 9.0.0-beta.24466.2 + 9.0.0-beta.24473.1 17.8.3 diff --git a/global.json b/global.json index 1aeb665ebfa..d5f2ffaf6bd 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1" } } From 6746305e41476ca7b49cb259fd0bc425a6c58281 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:38:08 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/runtime build 20240926.4 (#34799) [release/9.0] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa18bfafb2e..583bba7998a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 diff --git a/eng/Versions.props b/eng/Versions.props index 83ebebef418..13d108f68aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,20 +17,20 @@ False - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 9.0.0-beta.24473.1 From 590bc43cea2c56d19bc7318f84d3c358f3085544 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:22:12 -0700 Subject: [PATCH 10/15] Update branding to 8.0.11 (#34807) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 271e3e739a2..9597604ad7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 8.0.10 + 8.0.11 servicing From 43718a756200828d173d1bd1ce1426e6b344d8dd Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Wed, 2 Oct 2024 11:20:53 -0700 Subject: [PATCH 11/15] [release/8.0] Remove referencing indexes when reconfiguring a property as a navigation (#34651) Fixes #29997 --- .../Internal/InternalTypeBaseBuilder.cs | 12 +++++++++- .../CosmosModelBuilderGenericTest.cs | 24 +++++++------------ .../ModelBuilding/OwnedTypesTestBase.cs | 6 +++++ test/EFCore.Tests/ModelBuilding/TestModel.cs | 8 +++++++ 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs b/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs index 24333f89885..0bc79b42feb 100644 --- a/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs +++ b/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs @@ -18,6 +18,9 @@ public abstract class InternalTypeBaseBuilder : AnnotatableBuilder /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to /// the same compatibility standards as public APIs. It may be changed or removed without notice in @@ -754,7 +757,14 @@ public virtual void RemoveMembersInHierarchy(string propertyName, ConfigurationS { if (conflictingProperty.GetConfigurationSource() != ConfigurationSource.Explicit) { - conflictingProperty.DeclaringType.RemoveProperty(conflictingProperty); + if (UseOldBehavior29997) + { + conflictingProperty.DeclaringType.RemoveProperty(conflictingProperty); + } + else + { + conflictingProperty.DeclaringType.Builder.RemoveProperty(conflictingProperty, configurationSource); + } } } diff --git a/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs b/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs index 4a1fd8ecb06..a1236b475f0 100644 --- a/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs +++ b/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs @@ -1023,28 +1023,20 @@ public virtual void Reference_type_is_discovered_as_owned() { var modelBuilder = CreateModelBuilder(); - modelBuilder.Entity( - e => - { - e.Property(p => p.Id); - e.Property(p => p.AlternateKey); - e.Property(p => p.Description); - e.HasKey(p => p.Id); - }); + modelBuilder.Entity(); var model = modelBuilder.FinalizeModel(); - var owner = model.FindEntityType(typeof(OneToOneOwnerWithField)); - Assert.Equal(typeof(OneToOneOwnerWithField).FullName, owner.Name); - var ownership = owner.FindNavigation(nameof(OneToOneOwnerWithField.OwnedDependent)).ForeignKey; + var owner = model.FindEntityType(typeof(OwnerOfOwnees))!; + var ownership = owner.FindNavigation(nameof(OwnerOfOwnees.Ownee1))!.ForeignKey; Assert.True(ownership.IsOwnership); - Assert.Equal(nameof(OneToOneOwnerWithField.OwnedDependent), ownership.PrincipalToDependent.Name); - Assert.Equal(nameof(OneToOneOwnedWithField.OneToOneOwner), ownership.DependentToPrincipal.Name); - Assert.Equal(nameof(OneToOneOwnerWithField.Id), ownership.PrincipalKey.Properties.Single().Name); + Assert.Equal(nameof(OwnerOfOwnees.Ownee1), ownership.PrincipalToDependent!.Name); + Assert.Equal(nameof(Ownee1.Owner), ownership.DependentToPrincipal!.Name); + Assert.Equal(nameof(OwnerOfOwnees.Id), ownership.PrincipalKey.Properties.Single().Name); var owned = ownership.DeclaringEntityType; Assert.Single(owned.GetForeignKeys()); - Assert.NotNull(model.FindEntityType(typeof(OneToOneOwnedWithField))); - Assert.Equal(1, model.GetEntityTypes().Count(e => e.ClrType == typeof(OneToOneOwnedWithField))); + Assert.NotNull(model.FindEntityType(typeof(Ownee1))); + Assert.Equal(1, model.GetEntityTypes().Count(e => e.ClrType == typeof(Ownee1))); } protected override TestModelBuilder CreateModelBuilder(Action configure = null) diff --git a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs index fa421eb73b7..c30d4d34bde 100644 --- a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs @@ -559,6 +559,12 @@ public virtual void Can_call_Owner_fluent_api_after_calling_Entity() modelBuilder.Owned(); modelBuilder.Owned(); modelBuilder.Owned(); + + var model = modelBuilder.FinalizeModel(); + + var owner = model.FindEntityType(typeof(OwnerOfOwnees))!; + var ownership = owner.FindNavigation(nameof(OwnerOfOwnees.Ownee1))!.ForeignKey; + Assert.True(ownership.IsOwnership); } [Flags] diff --git a/test/EFCore.Tests/ModelBuilding/TestModel.cs b/test/EFCore.Tests/ModelBuilding/TestModel.cs index cc1a81e459e..39d6e45d067 100644 --- a/test/EFCore.Tests/ModelBuilding/TestModel.cs +++ b/test/EFCore.Tests/ModelBuilding/TestModel.cs @@ -1144,16 +1144,23 @@ protected class OwnerOfOwnees protected class Ownee1 { + public string Data { get; private set; } = ""; + + public OwnerOfOwnees Owner { get; private set; } = null!; public Ownee3? NewOwnee3 { get; private set; } } protected class Ownee2 { + public Guid Data { get; private set; } + public Ownee3? Ownee3 { get; private set; } } protected class Ownee3 { + public DateTime Data { get; private set; } + public string? Name { get; private set; } } @@ -1221,6 +1228,7 @@ protected class OneToManyOwnedWithField public OneToManyOwnerWithField? OneToManyOwner { get; set; } } + [Index(nameof(OwnedDependent))] protected class OneToOneOwnerWithField { public int Id; From 576f0d009f9d63fc36fa3d4a4a6c40b8e9d9d93b Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Fri, 4 Oct 2024 11:10:43 -0700 Subject: [PATCH 12/15] [release/8.0] Update dependencies (#34822) --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/EFCore.Cosmos/EFCore.Cosmos.csproj | 2 ++ src/EFCore.SqlServer/EFCore.SqlServer.csproj | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bc188e91f9..d73508d663c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -37,6 +37,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2aade6beb02ea367fd97c4070a4198802fe61c03 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 diff --git a/eng/Versions.props b/eng/Versions.props index 9597604ad7d..fb33afe6af1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,6 +27,7 @@ 8.0.8-servicing.24366.12 8.0.0 8.0.4 + 8.0.1 8.0.8 8.0.8 8.0.8-servicing.24366.12 diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj index 7a20bf69d21..d4fb7ac9c87 100644 --- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -46,6 +46,8 @@ + + diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 339e8774d57..17979be03a4 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -48,7 +48,8 @@ - + + From 5d288f18e92094c067c7c5e1fb29a7628cdd9e3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:02:23 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/arcade build 20241003.2 (#34839) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 1 + eng/common/templates/job/job.yml | 1 + global.json | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 583bba7998a..02ac6878c49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,17 +63,17 @@ - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + beb827ded6acdff8c7333dfc6583cc984a8f2620 diff --git a/eng/Versions.props b/eng/Versions.props index 13d108f68aa..e55918274de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 9.0.0-rtm.24476.4 - 9.0.0-beta.24473.1 + 9.0.0-beta.24503.2 17.8.3 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c..605692d2fb7 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f9..d1aeb92fcea 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/global.json b/global.json index d5f2ffaf6bd..abbe6ef4c8f 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2" } } From 3c29800b4a8c0299219b93546f1a225c9435d52b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:13:06 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/runtime build 20241003.8 (#34840) [release/9.0] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02ac6878c49..d2fd063ca67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,65 +1,65 @@ - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 diff --git a/eng/Versions.props b/eng/Versions.props index e55918274de..54ebebd4f48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,20 +17,20 @@ False - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 9.0.0-beta.24503.2 From 1c9c8fa4f060f70a448b03c1eb14586c43c502ef Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 7 Oct 2024 12:34:56 -0700 Subject: [PATCH 15/15] [release/9.0] Don't throw on non-transactional migration operation warning. (#34830) Fixes #34829 --- .../Infrastructure/RelationalOptionsExtension.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs b/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs index ce2742e46a6..3c77010b2f7 100644 --- a/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs +++ b/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs @@ -463,8 +463,7 @@ public static CoreOptionsExtension WithDefaultWarningConfiguration(CoreOptionsEx .TryWithExplicit(RelationalEventId.IndexPropertiesMappedToNonOverlappingTables, WarningBehavior.Throw) .TryWithExplicit(RelationalEventId.ForeignKeyPropertiesMappedToUnrelatedTables, WarningBehavior.Throw) .TryWithExplicit(RelationalEventId.StoredProcedureConcurrencyTokenNotMapped, WarningBehavior.Throw) - .TryWithExplicit(RelationalEventId.PendingModelChangesWarning, WarningBehavior.Throw) - .TryWithExplicit(RelationalEventId.NonTransactionalMigrationOperationWarning, WarningBehavior.Throw)); + .TryWithExplicit(RelationalEventId.PendingModelChangesWarning, WarningBehavior.Throw)); /// /// Information/metadata for a .