Merging internal commits for release/9.0 #61925
Merged
+768
−738
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…otnet-efcore build 20250318.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.4 -> To Version 9.0.4
…ng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:67a6df8f-40a9-4218-839a-e336f1bd1d79) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 67a6df8f-40a9-4218-839a-e336f1bd1d79 - **Build**: [20250318.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2666310) - **Date Produced**: March 18, 2025 2:26:32 PM UTC - **Commit**: [55700ce7d51b40ea546f817fd4947a6bae50be07](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GC55700ce7d51b40ea546f817fd4947a6bae50be07) - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.Design**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 9.0.4 to 9.0.4][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 9.0.4 to 9.0.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC9275e9ac55e413546a09551c29d5227d6d009747&targetVersion=GC55700ce7d51b40ea546f817fd4947a6bae50be07&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79)
Fix merge conflicts ---- #### AI description (iteration 1) #### PR Classification Release update. #### PR Summary This pull request updates dependencies and scripts for the 9.0 release. - Updated versions in `Version.Details.xml` and `Versions.props`. - Modified `generate-sbom-prep.ps1` and `generate-sbom-prep.sh` to handle artifact names and directories. - Changed `global.json` to use SDK version 9.0.104. - Updated `default-build.yml` to use Ubuntu 22.04 images. - Added quarantine attributes to tests in `EnhancedNavigationTest.cs` and `FormWithParentBindingContextTest.cs`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
#### AI description (iteration 1) #### PR Classification Version update. #### PR Summary This pull request updates the baseline package versions from 9.0.2 to 9.0.4. - Changes in `/eng/Baseline.xml`: Updated all package versions from 9.0.2 to 9.0.4. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…covery code # Add empty string check for recovery code If an empty string gets passed as the recovery code to `UserStoreBase.RedeemCodeAsync(TUser user, string code, CancellationToken ct)`, the method returns `true`, incorrectly indicating a valid recovery code. This PR resolves the issue by validating that the `code` argument is not an empty string. ## Description The `RedeemCodeAsync()` method already validates that `code` is non-null. This PR: * Extends the logic in this method to handle the empty string (`""`) case * Adds tests validating that an exception gets thrown when `code` is `null` or `""` ---- #### AI description (iteration 1) #### PR Classification Bug fix #### PR Summary This pull request adds a check for empty strings in recovery codes to prevent null or empty values from being processed. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to validate strings as non-null and non-empty. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests to ensure `RedeemCodeAsync` throws exceptions for null or empty codes. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated `ThrowIfNull` to `ThrowIfNullOrEmpty` for code validation in `RedeemCodeAsync`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot --> ---- #### AI description (iteration 1) #### PR Classification Bug fix #### PR Summary This pull request adds a check for empty strings in recovery code validation to prevent errors. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to validate non-null and non-empty strings. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests for null and empty recovery code validation. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated recovery code validation to use `ThrowIfNullOrEmpty`.
…otnet-runtime build 20250415.9 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.4 -> To Version 9.0.5
…otnet-efcore build 20250416.4 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.4 -> To Version 9.0.5
…ng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:ff8719c2-a1bf-4aef-ad09-b38561e103bc) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [ff8719c2-a1bf-4aef-ad09-b38561e103bc](https://maestro.dot.net/subscriptions?search=ff8719c2-a1bf-4aef-ad09-b38561e103bc) - **Build**: [20250415.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=2687946) - **Date Produced**: April 15, 2025 11:46:54 PM UTC - **Commit**: [e36e4d1a8f8dfb08d7e3a6041459c9791d732c01](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCe36e4d1a8f8dfb08d7e3a6041459c9791d732c01) - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Bcl.TimeProvider**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Caching.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Caching.Memory**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.Binder**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.CommandLine**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.Ini**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Configuration.Xml**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Diagnostics**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Diagnostics.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.FileProviders.Composite**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.FileProviders.Physical**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.4-servicing.25163.5 to 9.0.5-servicing.25215.9][1] - **Microsoft.Extensions.Hosting**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Http**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Logging**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.4 to 9.0.5][1] - **Microsoft.Extensions.Logging.Configuration**: [fr...
Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary
…-merge-9.0-2025-05-13-1503
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.