resolve merge conflict

Author: gewarren

.devcontainer/devcontainer.json

@@ -1,21 +1,57 @@
 {
 	"name": "C# (.NET)",
-	"image": "mcr.microsoft.com/devcontainers/dotnet:latest"
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [5000, 5001],
-	// "portsAttributes": {
-	//		"5001": {
-	//			"protocol": "https"
-	//		}
-	// }
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "dotnet restore",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
+	"image": "mcr.microsoft.com/devcontainers/dotnet:latest",
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"githubIssues.queries": [
+					{
+						"label": "My dotnet/docs Issues",
+						"query": "is:open assignee:${user} repo:dotnet/docs"
+					},
+					{
+						"label": "My seQUESTered dotnet/docs Issues",
+						"query": "is:open assignee:${user} repo:dotnet/docs sort:updated-desc -label:needs-more-info label:\":pushpin: seQUESTered\""           
+					},
+					{
+						"label": "Created dotnet/docs Issues",
+						"query": "author:${user} state:open repo:dotnet/docs sort:created-desc"
+					},
+					{
+						"label": "Recent Issues",
+						"query": "state:open repo:dotnet/docs sort:updated-desc"
+					}
+				],
+				"githubPullRequests.queries": [
+					{
+						"label": "Waiting for dotnet/docs Review",
+						"query": "repo:dotnet/docs is:open team-review-requested:dotnet/docs"
+					},
+					{
+						"label": "Waiting For Just My Review (dotnet/docs)",
+						"query": "repo:dotnet/docs is:open review-requested:${user} -team-review-requested:dotnet/docs"
+					},
+					{
+						"label": "Assigned To Me (dotnet/docs)",
+						"query": "repo:dotnet/docs is:open assignee:${user}"
+					},
+					{
+						"label": "Created By Me (dotnet/docs)",
+						"query": "repo:dotnet/docs is:open author:${user}"
+					}
+				]
+			},
+			"extensions": [
+				"Acrolinx.vscode-sidebar",
+				"DotJoshJohnson.xml",
+				"GitHub.copilot",
+				"GitHub.copilot-chat",
+				"GitHub.vscode-pull-request-github",
+				"IEvangelist.xref-helper",
+				"docsmsft.docs-authoring-pack",
+				"ms-dotnettools.csdevkit",
+				"ms-dotnettools.csharp"
+			]
+		}
+	}
 }

.github/CODEOWNERS

@@ -21,7 +21,10 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 ######## API landing page ###########
-/api/ @dotnet/docs
+/api/ @gewarren @dotnet/docs
+
+######## Includes files ###########
+/includes/ @dotnet/docs
 
 ############ What's new ###############
 /docs/whats-new/ @billwagner @dotnet/docs
@@ -30,6 +33,9 @@
 # .NET Core
 /docs/core/ @dotnet/docs
 
+# .NET fundamentals
+/docs/fundamentals/ @dotnet/docs
+
 # .NET Framework
 /docs/framework/ @dotnet/docs
 
@@ -40,82 +46,85 @@
 /docs/csharp/ @BillWagner @dotnet/docs
 
 # The F# Guide:
-/docs/fsharp/ @BillWagner @kathleendollard @dotnet/fsharp-team-msft @dotnet/docs
+/docs/fsharp/ @BillWagner @dotnet/fsharp-team-msft @dotnet/docs
 
 # The Visual Basic Guide:
-/docs/visual-basic/ @KathleenDollard @BillWagner @dotnet/docs
+/docs/visual-basic/ @BillWagner @dotnet/docs
 
 # The ML.NET Guide:
-/docs/machine-learning/ @gewarren @luisquintanilla @JakeRadMSFT @michaelgsharp @dotnet/docs
+/docs/machine-learning/ @gewarren @luisquintanilla @JakeRadMSFT @dotnet/docs
 
 # The .NET Architecture Guide:
 /docs/architecture/ @nishanil @IEvangelist @dotnet/docs
 
 # .NET Orleans
 /docs/orleans/ @IEvangelist @dotnet/docs
 
+# IoT Guide
+/docs/iot/ @dotnet/docs
+
+############### AI ################
+
+/docs/ai/ @gewarren @dotnet/docs
+
 ############### Azure ################
 
 # Azure Guide
-/docs/azure/ @alexwolfmsft @CamSoper @dotnet/docs
+/docs/azure/ @alexwolfmsft @dotnet/docs
 
 # Azure SDK package list
 /docs/azure/includes/ @dotnet/docs
 
 # Azure SDK catch-all entry
-/docs/azure/sdk/ @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
+/docs/azure/sdk/ @jsquire @alexwolfmsft @scottaddie @dotnet/docs
 
 # Azure SDK authentication topics
-/docs/azure/sdk/authentication/ @christothes @schaabs @dotnet/docs @alexwolfmsft @CamSoper @scottaddie
+/docs/azure/sdk/authentication/ @JonathanCrd @christothes @dotnet/docs @alexwolfmsft @scottaddie
 
 # Azure SDK miscellaneous topics
-/docs/azure/sdk/azure-sdk-configure-proxy.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/azure-sdk-for-net.md @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/dependency-injection.md @JoshLove-msft @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/logging.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/packages.md @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/pagination.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/protocol-convenience-methods.md @annelo-msft @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/resource-management.md @ArthurMa1978 @m-nash @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/thread-safety.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-/docs/azure/sdk/unit-testing-mocking.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @CamSoper @scottaddie @dotnet/docs
-
-# IoT Guide
-/docs/iot/ @CamSoper @dotnet/docs
-
-# Includes files
-/includes/ @dotnet/docs
-
-############### .NET 5 ################
+/docs/azure/sdk/azure-sdk-configure-proxy.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/azure-sdk-for-net.md @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/dependency-injection.md @JoshLove-msft @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/logging.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft
+/docs/azure/sdk/packages.md @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/pagination.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/protocol-convenience-methods.md @annelo-msft @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/resource-management.md @ArthurMa1978 @m-nash @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/thread-safety.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+/docs/azure/sdk/unit-testing-mocking.md @annelo-msft @christothes @JoshLove-msft @KrzysztofCwalina @jsquire @alexwolfmsft @scottaddie @dotnet/docs
+
+############### Fundamentals ################
 
 # Code analysis
 /docs/fundamentals/code-analysis/ @gewarren @dotnet/docs
 
 ############### .NET Core ########################
-# What's New
-/docs/core/whats-new/ @camsoper @dotnet/docs
+# Breaking changes
+/docs/core/compatibility/ @gewarren @dotnet/docs
+# Containers
+/docs/core/containers/ @dotnet/docs
 # Deployment
 /docs/core/deploying/ @adegeo @dotnet/docs
 # Diagnostics
 /docs/core/diagnostics/ @tommcdon @dotnet/docs
-# Extensions
-/docs/core/extensions/ @IEvangelist @dotnet/docs
 # Docker
 /docs/core/docker/ @IEvangelist @dotnet/docs
+# Extensions
+/docs/core/extensions/ @IEvangelist @dotnet/docs
 # Install
 /docs/core/install/ @adegeo @dotnet/docs
-# Breaking changes
-/docs/core/compatibility/ @camsoper @dotnet/docs
 # Project SDKs
 /docs/core/project-sdk/ @gewarren @dotnet/docs
 # Config settings
 /docs/core/runtime-config/ @gewarren @dotnet/docs
 # Testing
 /docs/core/testing/ @IEvangelist @dotnet/docs
 # Tools
-/docs/core/tools/ @tdykstra @dotnet/docs
+/docs/core/tools/ @adegeo @dotnet/docs
 # Tutorials
-/docs/core/tutorials/ @tdykstra @dotnet/docs
+/docs/core/tutorials/ @meaghanlewis @dotnet/docs
+# What's new
+/docs/core/whats-new/ @dotnet/docs
 
 ################### .NET Framework ##################
 # App domains
@@ -150,8 +159,8 @@
 /docs/framework/configure-apps/file-schema/network/ @karelz @dotnet/docs
 /docs/framework/network-programming/ @karelz @dotnet/docs
 # WCF
-/docs/framework/configure-apps/file-schema/wcf/ @HongGit @dotnet/docs
-/docs/framework/wcf/ @HongGit @dotnet/docs
+/docs/framework/configure-apps/file-schema/wcf/ @dotnet/docs
+/docs/framework/wcf/ @dotnet/docs
 
 ################## .NET Standard ##################
 # Analyzers
@@ -170,7 +179,7 @@
 # Collections
 /docs/standard/collections/ @IEvangelist @dotnet/docs
 # System.CommandLine
-/docs/standard/commandline/ @tdykstra @dotnet/docs
+/docs/standard/commandline/ @gewarren @dotnet/docs
 # Data
 /docs/standard/data/ @gewarren @dotnet/docs
 # Data - SQLite
@@ -216,12 +225,13 @@
 # gRPC:
 /docs/architecture/grpc-for-wcf-developers/ @IEvangelist @dotnet/docs
 # Desktop:
-/docs/architecture/modernize-desktop/ @OliaG @IEvangelist @dotnet/docs
+/docs/architecture/modernize-desktop/ @IEvangelist @dotnet/docs
 
 ################# Samples folder ##############
 
 ## These have been pulled directly from the samples repo:
 
+# C# snippets:
 /samples/snippets/csharp/ @BillWagner @IEvangelist @dotnet/docs
 # Visual Basic snippets:
 /samples/snippets/visualbasic/ @BillWagner @dotnet/docs

.github/ISSUE_TEMPLATE/02-breaking-change.yml

@@ -6,7 +6,7 @@ labels:
   - Pri1
   - doc-idea
 assignees:
- - camsoper
+ - gewarren
 body:
   - type: textarea
     id: description
@@ -23,12 +23,15 @@ body:
       options:
         - .NET 8
         - .NET 9
-        - .NET 10 Preview 1
-        - .NET 10 Preview 2
-        - .NET 10 Preview 3
         - .NET 10 Preview 4
         - .NET 10 Preview 5
         - .NET 10 Preview 6
+        - .NET 10 Preview 7
+        - .NET 10 RC 1
+        - .NET 10 RC 2
+        - .NET 10 GA
+        - .NET 11 Preview 1
+        - .NEt 11 Preview 2
         - Other (please put exact version in description textbox)
     validations:
       required: true

.github/copilot-instructions.md

@@ -0,0 +1,78 @@
+# .NET Documentation Guidelines
+
+## Disclosure
+
+For any Markdown files generated by AI, always disclose that they were created with the assistance of AI. Add the following frontmatter key/value pair:
+
+```markdown
+ai-usage: ai-generated
+```
+
+## Terminology
+
+Unless otherwise specified, all .NET content refers to modern .NET (not .NET Framework).
+
+## Writing Style
+
+Follow [Microsoft Writing Style Guide](https://learn.microsoft.com/en-us/style-guide/welcome/) with these specifics:
+
+### Voice and Tone
+
+- Active voice, second person addressing reader directly.
+- Conversational tone with contractions.
+- Present tense for instructions/descriptions.
+- Imperative mood for instructions ("Call the method" not "You should call the method").
+- Use "might" instead of "may" for possibility.
+- Use "can" instead of "may" for permissible actions.
+- Avoid "we"/"our" referring to documentation authors or product teams.
+
+### Structure and Format
+
+- Sentence case headings (no gerunds in titles).
+- Be concise, break up long sentences.
+- Oxford comma in lists.
+- Use bullets for unordered lists.
+- Number all ordered list items as "1." (not sequential numbering like "1.", "2.", "3.", etc.)
+- Ordered and unordered lists should use complete sentences with proper punctuation, ending with a period if it's more than three words.
+- Avoid "etc." or "and so on" - provide complete lists or use "for example".
+- Use "for example" instead of "e.g.".
+- Use "that is" instead of "i.e.".
+- No consecutive headings without content between them.
+
+### Formatting Conventions
+
+- **Bold** for UI elements.
+- `Code style` for file names, folders, custom types, non-localizable text.
+- Raw URLs in angle brackets.
+- Use relative links for files in this repo.
+- Remove `https://learn.microsoft.com/en-us` from learn.microsoft.com links.
+
+## API References
+
+Use cross-references: `<xref:api-doc-ID>`.
+
+To find API doc IDs:
+1. Check XML files in https://github.com/dotnet/dotnet-api-docs.
+2. For types: `Value` attribute of `<TypeSignature>` where `Language="DocId"` (omit first 2 characters).
+3. For members: `Value` attribute of `<MemberSignature>` where `Language="DocId"` (omit first 2 characters).
+
+If unsure, use API browser: `https://learn.microsoft.com/api/apibrowser/dotnet/search?api-version=0.2&locale=en-us&search={API_NAME}&$skip=0&$top=5` and then use the `url` value from the results as a manual link.
+
+## Code Snippets
+
+For snippets >6 lines:
+1. Create `./snippets/my-doc/language` folder in same directory as document (for a document named `my-doc.md`) where language is either vb (for visual basic) or csharp (for c#). Omit the `language` component when the document is in the `docs/visual-basic`, `docs/csharp`, or `docs/fsharp` folders.
+1. Add snippet as separate code file.
+1. Include simple project file targeting latest .NET.
+1. All code should use the latest stable versions/features.
+1. Create examples in both C# and Visual Basic unless the article referencing the snippet resides in the in the `csharp`, `fsharp`, and `visual-basic` language folders.
+1. When you add code, use code comments sparingly because they don't get localized. You can use them to briefly clarify code-specific details (such as logic, parameters, or edge cases). Put any critical information and context in the markdown text of the referencing article.
+
+## File Naming
+
+New Markdown files: lowercase with hyphens, omit filler words (the, a, etc.).
+
+## Special Cases
+
+- Breaking changes: Include directions from `.github/prompts/breaking-change.md`.
+- When you (Copilot) are assigned an issue in GitHub, after you've completed your work and the workflows (status checks) have run, check to make sure there are no build warnings under the OpenPublishing.Build status check. If there are, open the build report (under View Details) and resolve any build warnings you introduced.