Net10 branch merge conflict fix #49714
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
* Update package index with latest published versions * Update docs/azure/includes/dotnet-all.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Bill Wagner <wiwagn@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Corrected the reference to the method in the PrimeService.cs file for clarity.
…ation defaults to false in .NET 10 (#49620)
…ent.Parse().RootElement (#49640)
…Join operations (#49638)
Removed important note regarding GitHub Copilot app modernization agent in Visual Studio 2022.
- Was [<attribute list>] member name [ = initializer ], - Should be [<attribute list>] membername [ = initializer ], - Reason: `membername` is a single identifier; later in the document it is referred to as `membername`
* Refactor more language agnostic content into includes Co-authored-by: Scott Addie <10702007+scottaddie@users.noreply.github.com> Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --------- Co-authored-by: Scott Addie <10702007+scottaddie@users.noreply.github.com> Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
* Add errors for existing C# 14 themes Add all newly created diagnostics that map to existing consolidated error files. * Update docs/csharp/language-reference/compiler-messages/array-declaration-errors.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Edit pass on array errors. After adding the final C# 14 updates, perform an edit pass to match the current format. * edit pass on extension declarations Add final errors introduced in C# 14 for extensions. Perform an edit pass to match the improved format. * Edit pass and update dates After adding the final diagnostics for C# 14, update this file to match the more recent style. * Apply suggestions from code review Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
The Windows docs team wants to emphasize WinUI over UWP
* Fix note syntax for mstest analyzer docs * Update mstest0034.md * Update mstest0053.md
* What's new in F# 10 * Add ai-usage metadata * Add link in .net 10 overview to F# * Apply suggestions from code review Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com> * Add links to language reference * Add entries about *Final methods to CE reference * Update parameters page with voption for optional param info * Apply review feedback * Add type cache section * Add Whats New F#10 to the ToC --------- Co-authored-by: Bill Wagner <wiwagn@microsoft.com>
adegeo
requested review from
a team,
BillWagner,
IEvangelist,
JonathanCrd,
alexwolfmsft,
christothes,
jsquire,
meaghanlewis and
scottaddie
as code owners
Copilot finished reviewing on behalf of
adegeo
November 11, 2025 18:02
dotnet-policy-service
bot
added
dotnet-azure/svc
dotnet-fundamentals/svc
dotnet-cli/subsvc
install/subsvc
dotnet-csharp/svc
fundamentals/subsvc
csharp-errors-warnings/subsvc
lang-reference/subsvc
csharp-diagnostics/subsvc
dotnet-framework/svc
data-access/subsvc
dotnet-fsharp/svc
dotnet-visualbasic/svc
labels
meaghanlewis
approved these changes
Nov 11, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR resolves a merge conflict in the net10 branch. The changes primarily involve:
- Formatting improvements across multiple Markdown files (removing trailing spaces, standardizing line breaks)
- Updates to documentation for new .NET 10 features (F# 10, SDK tools, analyzers, breaking changes)
- Addition of new compiler error documentation for async/await patterns
- Updates to cryptography documentation for OpenSSL support changes on macOS
- Documentation reorganization for error message consolidation
Reviewed Changes
Copilot reviewed 108 out of 109 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| docs/visual-basic/reference/net-framework-reference-information.md | Removed trailing spaces and updated link text |
| docs/visual-basic/language-reference/statements/enum-statement.md | Fixed spacing in syntax example |
| docs/visual-basic/language-reference/queries/join-clause.md | Added missing closing bracket in syntax |
| docs/visual-basic/developing-apps/programming/drives-directories-files/classes-used-in-net-framework-file-io-and-the-file-system.md | Removed trailing spaces and updated link reference |
| docs/standard/serialization/system-text-json/. | Added new nullable annotations documentation and code examples |
| docs/standard/serialization/system-text-json/converters-how-to.md | Updated GitHub repository links to main branch |
| docs/standard/runtime-libraries-overview.md | Added Microsoft.Extensions.AI package to table |
| docs/standard/class-library-overview.md | Major reorganization and simplification of content |
| docs/navigate/tools-diagnostics/toc.yml | Added new dotnet CLI commands and analyzer rules |
| docs/index.yml | Updated UWP reference to WinUI |
| docs/fundamentals/toc.yml | Updated link text |
| docs/fundamentals/syslib-diagnostics/*.md | Added new SYSLIB diagnostic documentation files |
| docs/fundamentals/code-analysis/style-rules/*.md | Added new IDE rules for C# code style |
| docs/fundamentals/code-analysis/quality-rules/*.md | Added new CA rules and snippets |
| docs/fsharp/whats-new/fsharp-10.md | New comprehensive F# 10 feature documentation |
| docs/framework/release-notes/2025/*.md | Fixed typos and CVE references |
| docs/framework/interop/blittable-and-non-blittable-types.md | Improved formatting and consistency |
| docs/framework/data/adonet/dataset-datatable-dataview/datatables.md | Removed trailing spaces |
| docs/csharp/misc/*.md | Removed obsolete CS4009 error documentation |
| docs/csharp/language-reference/toc.yml | Reorganized compiler error documentation |
| docs/csharp/language-reference/keywords/async.md | Updated cross-reference |
| docs/csharp/language-reference/compiler-messages/*.md | Major consolidation of async/await error documentation |
| docs/csharp/fundamentals/types/index.md | Minor formatting fixes |
| docs/core/whats-new/dotnet-10/*.md | Updated F# documentation references |
| docs/core/tutorials/netcore-hosting.md | Added important note about hosting APIs |
| docs/core/tools/*.md | Added new dotnet package download command documentation |
| docs/core/testing/*.md | Fixed incorrect method reference and NOTE syntax |
| docs/core/porting/*.md | Updated Upgrade Assistant deprecation notices |
| docs/core/install/upgrade.md | Added comprehensive version pinning documentation |
| docs/core/compatibility/*.md | Added new breaking change documentation |
| docs/azure/sdk/. | Updated authentication code examples and includes |
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.
Summary
Fix merge conflict
Internal previews
Toggle expand/collapse
Note
This table shows preview links for the 30 files with the most changes. For preview links for other files in this PR, select OpenPublishing.Build Details within checks.