Merging internal commits for release/8.0 #61924
Merged
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
Fixes merge conflict ---- #### AI description (iteration 1) #### PR Classification Merge from public repository to update dependencies and build configurations. #### PR Summary This pull request updates various dependencies and build configurations to their latest versions. - Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props`. - Added `HelixProjectArguments` parameter in `/eng/common/templates-official/steps/send-to-helix.yml` and `/eng/common/templates/steps/send-to-helix.yml`. - Changed Ubuntu version from 20.04 to 22.04 in `/.azure/pipelines/jobs/default-build.yml`. - Added support for `s390x` architecture in `/eng/common/cross/toolchain.cmake`. - Updated Nginx version in `/eng/scripts/install-nginx-linux.sh`. <!-- 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 codes to prevent potential issues. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to throw an exception if a string is null or empty. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests to validate the new empty string check for recovery codes. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated `RedeemCodeAsync` method to use `ThrowIfNullOrEmpty` for the `code` parameter.
…otnet-runtime build 20250415.6 Microsoft.Extensions.HostFactoryResolver.Sources , 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.Net.Http.WinHttpHandler , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.15-servicing.25164.13 -> To Version 8.0.16-servicing.25215.6
…otnet-efcore build 20250416.6 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.15 -> To Version 8.0.16
…ng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [83131e87-e80d-4d5b-f426-08dbd53b3319](https://maestro.dot.net/subscriptions?search=83131e87-e80d-4d5b-f426-08dbd53b3319) - **Build**: [20250415.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2687939) - **Date Produced**: April 16, 2025 11:39:55 PM UTC - **Commit**: [efd5742bb5dd1677fbbbeb277bcfb5c9025548e5](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCefd5742bb5dd1677fbbbeb277bcfb5c9025548e5) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.15-servicing.25164.13 to 8.0.16-servicing.25215.6][1] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.15-servicing.25164.13 to 8.0.16-servicing.25215.6][1] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.15 to 8.0.16][1] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.15 to 8.0.16][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.15 to 8.0.16][1] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.15 to 8.0.16][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.15 to 8.0.16][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.15-servicing.25164.13 to 8.0.16-servicing.25215.6][1] - **Microsoft.NETCore.Platforms**: [from 8.0.15-servicing.25164.13 to 8.0.16-servicing.25215.6][1] - **System.Net.Http.WinHttpHandler**: [from 8.0.2 to 8.0.3][2] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.15-servicing.25164.13 to 8.0.16-servicing.25215.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC50c4cb9fc31c47f03eac865d7bc518af173b74b7&targetVersion=GCefd5742bb5dd1677fbbbeb277bcfb5c9025548e5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC05e0f2d2c881def48961d3b83fa11ae84df8e534&targetVersion=GCefd5742bb5dd1677fbbbeb277bcfb5c9025548e5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: [e179a2a7-bc5d-4498-2467-08dbd53ba9ce](https://maestro.dot.net/subscriptions?search=e179a2a7-bc5d-4498-2467-08dbd53ba9ce) - **Build**: [20250416.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2689219) - **Date Produced**: April 17, 2025 2:04:04 AM UTC - **Commit**: [c755c4a6f3df392ac86ce9985f27a8c3e851b3b3](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GCc755c4a6f3df392ac86ce9985f27a8c3e851b3b3) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.15 to 8.0.16][3] - **Microsof...
…-merge-8.0-2025-05-13-1456
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.