Skip to content

Merge main into live#54547

Open
dotnet-policy-service[bot] wants to merge 8 commits into
livefrom
main
Open

Merge main into live#54547
dotnet-policy-service[bot] wants to merge 8 commits into
livefrom
main

Conversation

@dotnet-policy-service

@dotnet-policy-service dotnet-policy-service Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Please don't squash-merge this PR.


Internal previews

Toggle expand/collapse
📄 File 🔗 Preview link
docs/core/diagnostics/metrics-instrumentation.md Creating metrics
docs/core/extensions/logging/library-guidance.md Logging guidance for .NET library authors
docs/core/testing/microsoft-testing-platform-telemetry.md Microsoft.Testing.Platform (MTP) telemetry
docs/csharp/fundamentals/strings/common-tasks/compare.md Compare strings in C#
docs/csharp/fundamentals/strings/common-tasks/concatenate.md docs/csharp/fundamentals/strings/common-tasks/concatenate
docs/csharp/fundamentals/strings/common-tasks/modify.md Modify string contents in C#
docs/csharp/fundamentals/tutorials/string-interpolation.md Learn string interpolation
docs/csharp/how-to/index.md How to (C#)
docs/csharp/language-reference/operators/addition-operator.md Addition operators - + and +=
docs/csharp/language-reference/operators/equality-operators.md Equality operators - test if two objects are equal or not
docs/csharp/language-reference/tokens/interpolated.md docs/csharp/language-reference/tokens/interpolated
docs/csharp/programming-guide/strings/index.md Strings and string literals
docs/csharp/toc.yml Taken from https://github.com/dotnet/roslyn/wiki/Samples-and-Walkthroughs
docs/framework/performance/performance-tips.md ".NET Performance Tips"
docs/fsharp/language-reference/arrays.md Arrays (F#)
docs/fundamentals/code-analysis/quality-rules/ca1305.md CA1305: Specify IFormatProvider
docs/standard/base-types/best-practices-strings.md Best practices for comparing strings in .NET
docs/standard/serialization/system-text-json/converters-how-to.md docs/standard/serialization/system-text-json/converters-how-to

dependabot Bot and others added 7 commits June 24, 2026 10:41
Bumps Aspire.Azure.Data.Tables from 13.4.3 to 13.4.5
Bumps Aspire.StackExchange.Redis from 13.4.3 to 13.4.5
Bumps Microsoft.Orleans.Client from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Clustering.Redis from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Persistence.Redis from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Sdk from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Server from 10.1.0 to 10.2.0
Bumps OpenTelemetry.Extensions.Hosting from 1.15.3 to 1.16.0

---
updated-dependencies:
- dependency-name: Aspire.Azure.Data.Tables
  dependency-version: 13.4.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Aspire.StackExchange.Redis
  dependency-version: 13.4.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Aspire.StackExchange.Redis
  dependency-version: 13.4.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Client
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Clustering.Redis
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Clustering.Redis
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Persistence.Redis
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Server
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: OpenTelemetry.Extensions.Hosting
  dependency-version: 1.16.0
  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>
Bumps Microsoft.Extensions.Logging.Abstractions from 10.0.8 to 10.0.9
Bumps Microsoft.Extensions.Logging.Console from 10.0.8 to 10.0.9
Bumps Microsoft.Orleans.Client from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Sdk from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Server from 10.1.0 to 10.2.0

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Logging.Abstractions
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Logging.Abstractions
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Logging.Abstractions
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Logging.Console
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Logging.Console
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Client
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Server
  dependency-version: 10.2.0
  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>
Bumps Microsoft.Extensions.Hosting from 10.0.8 to 10.0.9
Bumps Microsoft.Extensions.Logging.Console from 10.0.8 to 10.0.9
Bumps Microsoft.Orleans.BroadcastChannel from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Sdk from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Serialization.SystemTextJson from 10.1.0 to 10.2.0
Bumps Microsoft.Orleans.Server from 10.1.0 to 10.2.0

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Hosting
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Extensions.Logging.Console
  dependency-version: 10.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.BroadcastChannel
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Sdk
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Serialization.SystemTextJson
  dependency-version: 10.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dotnet
- dependency-name: Microsoft.Orleans.Server
  dependency-version: 10.2.0
  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>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…3398)

* Changed non-units to follow the UCUM standard and OTel convention

Specifically changed `{hats}` to be `{hat}` according [Instrument units](https://opentelemetry.io/docs/specs/semconv/general/metrics/#instrument-units):
> All non-units that use curly braces to annotate a quantity need to match the grammatical number of the quantity it represent. For example if measuring the number of individual requests to a process the unit would be `{request}`, not `{requests}`.

The same applies to `{hat}` and the docs should follow best pratices and conventions.

* Better wording

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>

---------

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
* First draft

Move files, create the first draft of all new articles.

* Add redirects for moved strings articles and tutorial

Add redirects for the how-to and tutorial articles moved into the Fundamentals strings section, and fix chained redirects that pointed at the now-moved URLs.

* Review all language for accuracy

Update the language for all major edits. These edits clarify the features, suggest better features to use for modern apps, and avoid any misleading descriptions.

* Apply suggestions from code review

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>

* Redirect document ID for telemetry

* Fix build warning

---------

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
…+) (#52504)

* Document open generic converters with JsonConverterAttribute (.NET 11+)

Add documentation for the new .NET 11 feature (dotnet/runtime#123209) that
allows JsonConverterAttribute to support open generic converter types on
generic types when the type parameter arity matches. This eliminates the
need for JsonConverterFactory in many open generic scenarios.

Changes:
- Add new 'Use open generic converters with [JsonConverter]' section
- Add forward-reference in 'Custom converter patterns' section
- Create Option<T>/OptionConverter<T> code snippet
- Update snippet project TFM to net11.0

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Address review feedback: scope factory requirement, fix arity example

- Scope factory pattern requirement to .NET 10 and earlier
- Replace misleading Dictionary arity example with Result<T>/Result<T,TError>

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

1 similar comment
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@dotnetrepoman dotnetrepoman Bot added this to the June 2026 milestone Jun 25, 2026
The typo was already fixed in ~/samples/snippets/fsharp/arrays/snippet91.fs
but not in the output shown in this page
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants