Skip to content

βœ… Merge main into live #2845

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
merged 3 commits into from
Mar 18, 2025
Merged

βœ… Merge main into live #2845

merged 3 commits into from
Mar 18, 2025

Conversation

mujiansu and others added 3 commits March 17, 2025 07:16
* Fixes #2317

* A few updates

* Fix xref

* Apply suggestions from code review

Co-authored-by: Liangying.Wei <lianwei@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Andy (Steve) De George <67293991+adegeo@users.noreply.github.com>

* Bump the dotnet group (#2814)

Bumps the dotnet group in /docs/real-time/snippets/signalr/SignalR.Web with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [Microsoft.Extensions.Http.Resilience](https://github.com/dotnet/extensions) | `9.2.0` | `9.3.0` |
| [OpenTelemetry.Instrumentation.AspNetCore](https://github.com/open-telemetry/opentelemetry-dotnet-contrib) | `1.11.0` | `1.11.1` |
| [OpenTelemetry.Instrumentation.Http](https://github.com/open-telemetry/opentelemetry-dotnet-contrib) | `1.11.0` | `1.11.1` |
| [OpenTelemetry.Instrumentation.Runtime](https://github.com/open-telemetry/opentelemetry-dotnet-contrib) | `1.11.0` | `1.11.1` |
| [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) | `9.0.2` | `9.0.3` |


Updates `Microsoft.Extensions.Http.Resilience` from 9.2.0 to 9.3.0
- [Release notes](https://github.com/dotnet/extensions/releases)
- [Commits](dotnet/extensions@v9.2.0...v9.3.0)

Updates `OpenTelemetry.Instrumentation.AspNetCore` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

Updates `OpenTelemetry.Instrumentation.Http` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

Updates `OpenTelemetry.Instrumentation.Runtime` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

Updates `Microsoft.AspNetCore.SignalR.Client` from 9.0.2 to 9.0.3
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](dotnet/aspnetcore@v9.0.2...v9.0.3)

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.Http
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.Runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.AspNetCore.SignalR.Client
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump the dotnet group (#2823)

Bumps the dotnet group in /docs/database/snippets/tutorial/aspiresqlefcore/AspireSQLEFCore.AppHost with 4 updates: [Microsoft.Extensions.Http.Resilience](https://github.com/dotnet/extensions), [OpenTelemetry.Instrumentation.AspNetCore](https://github.com/open-telemetry/opentelemetry-dotnet-contrib), [OpenTelemetry.Instrumentation.Http](https://github.com/open-telemetry/opentelemetry-dotnet-contrib) and [OpenTelemetry.Instrumentation.Runtime](https://github.com/open-telemetry/opentelemetry-dotnet-contrib).


Updates `Microsoft.Extensions.Http.Resilience` from 9.2.0 to 9.3.0
- [Release notes](https://github.com/dotnet/extensions/releases)
- [Commits](dotnet/extensions@v9.2.0...v9.3.0)

Updates `OpenTelemetry.Instrumentation.AspNetCore` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

Updates `OpenTelemetry.Instrumentation.Http` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

Updates `OpenTelemetry.Instrumentation.Runtime` from 1.11.0 to 1.11.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases)
- [Commits](open-telemetry/opentelemetry-dotnet-contrib@Resources.AWS-1.11.0...Resources.AWS-1.11.1)

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.Http
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Instrumentation.Runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump the dotnet group (#2828)

Bumps the dotnet group in /docs/extensibility/snippets/MailDevResourceWithCredentials/MailKit.Client with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [MailKit](https://github.com/jstedfast/MailKit) | `4.10.0` | `4.11.0` |
| [Microsoft.Extensions.Configuration.Binder](https://github.com/dotnet/runtime) | `9.0.2` | `9.0.3` |
| [Microsoft.Extensions.Diagnostics.HealthChecks](https://github.com/dotnet/aspnetcore) | `9.0.2` | `9.0.3` |
| [Microsoft.Extensions.Hosting.Abstractions](https://github.com/dotnet/runtime) | `9.0.2` | `9.0.3` |
| [Microsoft.Extensions.Resilience](https://github.com/dotnet/extensions) | `9.2.0` | `9.3.0` |


Updates `MailKit` from 4.10.0 to 4.11.0
- [Changelog](https://github.com/jstedfast/MailKit/blob/master/ReleaseNotes.md)
- [Commits](jstedfast/MailKit@4.10.0...4.11.0)

Updates `Microsoft.Extensions.Configuration.Binder` from 9.0.2 to 9.0.3
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.2...v9.0.3)

Updates `Microsoft.Extensions.Diagnostics.HealthChecks` from 9.0.2 to 9.0.3
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](dotnet/aspnetcore@v9.0.2...v9.0.3)

Updates `Microsoft.Extensions.Hosting.Abstractions` from 9.0.2 to 9.0.3
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.2...v9.0.3)

Updates `Microsoft.Extensions.Configuration.Binder` from 9.0.2 to 9.0.3
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.2...v9.0.3)

Updates `Microsoft.Extensions.Resilience` from 9.2.0 to 9.3.0
- [Release notes](https://github.com/dotnet/extensions/releases)
- [Commits](dotnet/extensions@v9.2.0...v9.3.0)

---
updated-dependencies:
- dependency-name: MailKit
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Configuration.Binder
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Diagnostics.HealthChecks
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Hosting.Abstractions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Configuration.Binder
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Resilience
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Address peer feedback

* Add clarification about the client type

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Liangying.Wei <lianwei@microsoft.com>
Co-authored-by: Andy (Steve) De George <67293991+adegeo@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Updated the Visual Studio pivot.

* Updated the VS Code pivot.
@dotnetrepoman dotnetrepoman bot added caching Content related to caching. database Content related to database. messaging Content related to messaging. security Content related to security. storage Content related to storage. labels Mar 18, 2025
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@dotnet-policy-service dotnet-policy-service bot added this pull request to the merge queue Mar 18, 2025
Merged via the queue into live with commit 166b4ed Mar 18, 2025
8 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
caching Content related to caching. database Content related to database. messaging Content related to messaging. :octocat: auto-merge security Content related to security. storage Content related to storage.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants