Skip to content

Merging internal commits for release/9.0 #60880

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.

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

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

Mirroring and others added 18 commits February 5, 2025 21:45
…g user

Since this is a patch, instead of throwing an exception in cases where we wouldn't before like we do in the PR to `main`, we instead log an error and fail to refresh the cookie if RefreshSignInAsync is called with a TUser that does not have the same user ID as the currently authenticated user.

While this does not make it *as* obvious to developers that something has gone wrong, error logs are still pretty visible, and stale cookies are something web developers have to account for regardless. The big upside to not throwing in the patch is that we do not have to react to it in the email change confirmation flow to account for the possibility of RefreshSignInAsync throwing.

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix

#### PR Summary
This pull request disables the `RefreshSignInAsync` method if it is called with the wrong user or if the user is not authenticated.
- `src/Identity/Core/src/SignInManager.cs`: Added checks to log errors and return early if the user is not authenticated or if the authenticated user ID does not match the provided user ID.
- `src/Identity/test/Identity.Test/SignInManagerTest.cs`: Added tests to verify that `RefreshSignInAsync` logs errors and does not proceed if the user is not authenticated or if authenticated with a different user.
Fixes some merge conflicts

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and dependency updates.

#### PR Summary
This pull request updates dependencies and cleans up configuration files to align with the latest internal and public build sources.
- Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props`.
- Changed container images in `.azure/pipelines/ci.yml` and `.azure/pipelines/ci-public.yml` to `azurelinux-3.0-net9.0-build-amd64`.
- Updated runtime download URLs in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj`, `/eng/helix/helix.proj`, and `/src/Installers/Windows/WindowsHostingBundle/Product.targets`.
- Modified `BuildOsName` condition in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj` for `linux-musl` builds.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…ng/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
- **Build**: 20250211.13
- **Date Produced**: February 12, 2025 3:59:19 AM UTC
- **Commit**: 831d23e56149cd59c40fc00c7feb7c5334bd19c4
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Bcl.TimeProvider**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Caching.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.Binder**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.CommandLine**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.FileExtensions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.Ini**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.UserSecrets**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Configuration.Xml**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Diagnostics**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Diagnostics.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.FileProviders.Composite**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.FileProviders.Physical**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13][1]
  - **Microsoft.Extensions.Hosting**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Hosting.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Http**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.Configuration**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.Console**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.Debug**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.EventLog**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.Extensions.Logging.EventS...
…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**: 20250211.7
- **Date Produced**: February 12, 2025 7:25:19 AM UTC
- **Commit**: 85856237290a59157865454c9e8337dd4d591f53
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-ef**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 9.0.2 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Tools**: [from 9.0.2 to 9.0.3][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e&targetVersion=GC85856237290a59157865454c9e8337dd4d591f53&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79)
Fixes merge conflicts

----
#### AI description  (iteration 1)
#### PR Classification
Version update.

#### PR Summary
This pull request updates the baseline version of various packages from 9.0.1 to 9.0.2.
- Updated package versions in `/eng/Baseline.xml` from 9.0.1 to 9.0.2.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-efcore build 20250212.2

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.3 -> To Version 9.0.3
…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**: 20250212.2
- **Date Produced**: February 12, 2025 11:27:57 PM UTC
- **Commit**: 68c7e19496df80819410fc6de1682a194aad33d3
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-ef**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 9.0.3 to 9.0.3][1]
  - **Microsoft.EntityFrameworkCore.Tools**: [from 9.0.3 to 9.0.3][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC85856237290a59157865454c9e8337dd4d591f53&targetVersion=GC68c7e19496df80819410fc6de1682a194aad33d3&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79)
…-merge-9.0-2025-03-11-1249
@Copilot Copilot AI review requested due to automatic review settings March 11, 2025 19:49
@vseanreesermsft vseanreesermsft requested review from wtgodbe and a team as code owners March 11, 2025 19:49
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Mar 11, 2025
@dotnet-policy-service dotnet-policy-service bot added this to the 9.0.x milestone Mar 11, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges internal commits for the release/9.0 branch with modifications to the SignInManager and its tests as well as updates to the CI pipeline configuration. Key changes include:

  • Refactoring of the RefreshSignInAsync logic and its corresponding tests.
  • Removal of obsolete warning suppression and adjustment of the authentication scheme usage.
  • Update of runtime feed URLs in the CI pipeline configuration.

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.

File Description
src/Identity/test/Identity.Test/SignInManagerTest.cs Updates to test methods including removal of warning suppression and tweaks to authentication setup; new tests for RefreshSignInAsync error scenarios.
src/Identity/Core/src/SignInManager.cs Reordering of authentication checks and consistent handling of claims for RefreshSignInAsync.
.azure/pipelines/ci.yml Update of runtime feed URLs to match the new internal endpoint.
Comments suppressed due to low confidence (2)

src/Identity/test/Identity.Test/SignInManagerTest.cs:602

  • [nitpick] Consider extracting the hard-coded auth scheme literal ('authscheme') into a named constant to reduce duplication and potential typos.
var id = new ClaimsIdentity("authscheme");

src/Identity/Core/src/SignInManager.cs:179

  • [nitpick] Since the auth scheme literal is used across both the core and test files, consider refactoring it into a shared constant to ensure consistency.
IList<Claim> claims = Array.Empty<Claim>();

@wtgodbe wtgodbe merged commit 3365477 into dotnet:release/9.0 Mar 11, 2025
22 of 25 checks passed
@dotnet-policy-service dotnet-policy-service bot modified the milestones: 9.0.x, 9.0.4 Mar 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants