Net10 branch merge conflict fix

.github/prompts/error-consolidation.md

@@ -12,8 +12,8 @@ Overall steps:
 
 We're going to work through a series of files consolidating errors and warnings.
 
-- For the duration of this chat, all references to "destination file" refer to `using-statement-declaration-errors.md.
-- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to `using` statements and `using` variable declarations. Note that the `using` keyword can also be used for a `using` directive. Don't include those error messages.
+- For the duration of this chat, all references to "destination file" refer to `async-await-errors.md.
+- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to `async` function declarations and `await` expressions.
 
 The destination file already contains a skeleton for the final output.
 

.openpublishing.redirection.csharp.json

@@ -471,6 +471,26 @@
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1946.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/expression-tree-restrictions"
         },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1983.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1986.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1994.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1996.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1997.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1988.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/ref-modifiers-errors"
@@ -479,6 +499,26 @@
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs4004.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"
         },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs4008.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs4014.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs4032.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs4033.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/CS4009.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/async-await-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs3007.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"

.openpublishing.redirection.fundamentals.json

@@ -249,22 +249,6 @@
             "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1004.md",
             "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"
         },
-        {
-            "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1024.md",
-            "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"
-        },
-        {
-            "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1025.md",
-            "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"
-        },
-        {
-            "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1026.md",
-            "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"
-        },
-        {
-            "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1027.md",
-            "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"
-        },
         {
             "source_path_from_root": "/docs/fundamentals/syslib-diagnostics/syslib1028.md",
             "redirect_url": "/dotnet/fundamentals/syslib-diagnostics/source-generator-overview"

docs/ai/dotnet-ai-ecosystem.md

@@ -1,7 +1,7 @@
 ---
 title: .NET + AI ecosystem tools and SDKs
 description: This article provides an overview of the ecosystem of SDKs and tools available to .NET developers integrating AI into their applications.
-ms.date: 05/29/2025
+ms.date: 11/04/2025
 ms.topic: overview
 ---
 
@@ -18,19 +18,26 @@ The .NET ecosystem provides many powerful tools, libraries, and services to deve
 
 `Microsoft.Extensions.AI` provides abstractions that can be implemented by various services, all adhering to the same core concepts. This library is not intended to provide APIs tailored to any specific provider's services. The goal of `Microsoft.Extensions.AI` is to act as a unifying layer within the .NET ecosystem, enabling developers to choose their preferred frameworks and libraries while ensuring seamless integration and collaboration across the ecosystem.
 
-## Semantic Kernel for .NET
+## Microsoft Agent Framework
+
+If you want to use low-level services, such as <xref:Microsoft.Extensions.AI.IChatClient> and <xref:Microsoft.Extensions.AI.IEmbeddingGenerator`2>, you can reference the `Microsoft.Extensions.AI.Abstractions` package directly from your app. However, if you want to build agentic AI applications with higher-level orchestration capabilities, you should use [Microsoft Agent Framework](/agent-framework/overview/agent-framework-overview). Agent Framework builds on the `Microsoft.Extensions.AI.Abstractions` package and provides concrete implementations of <xref:Microsoft.Extensions.AI.IChatClient> for different services, including OpenAI, Azure OpenAI, Azure AI Foundry, and more.
+
+This framework is the recommended approach for .NET apps that need to build agentic AI systems with advanced orchestration, multi-agent collaboration, and enterprise-grade security and observability.
 
-If you just want to use the low-level services, such as <xref:Microsoft.Extensions.AI.IChatClient> and <xref:Microsoft.Extensions.AI.IEmbeddingGenerator`2>, you can reference the `Microsoft.Extensions.AI.Abstractions` package directly from your app. However, if you want to use higher-level, more opinionated approaches to AI, then you should use [Semantic Kernel](/semantic-kernel/overview/).
+Agent Framework is a production-ready, open-source framework that brings together the best capabilities of Semantic Kernel and Microsoft Research's AutoGen. Agent Framework provides:
 
-Semantic Kernel, which has a dependency on the `Microsoft.Extensions.AI.Abstractions` package, is an open-source library that enables AI integration and orchestration capabilities in your .NET apps. Its connectors provides concrete implementations of <xref:Microsoft.Extensions.AI.IChatClient> and <xref:Microsoft.Extensions.AI.IEmbeddingGenerator`2> for different services, including OpenAI, Amazon Bedrock, and Google Gemini.
+- **Multi-agent orchestration**: Support for sequential, concurrent, group chat, handoff, and *magentic* (where a lead agent directs other agents) orchestration patterns.
+- **Cloud and provider flexibility**: Cloud-agnostic (containers, on-premises, or multi-cloud) and provider-agnostic (for example, OpenAI or Azure AI Foundry) using plugin and connector models.
+- **Enterprise-grade features**: Built-in observability (OpenTelemetry), Microsoft Entra security integration, and responsible AI features including prompt injection protection and task adherence monitoring.
+- **Standards-based interoperability**: Integration with open standards like Agent-to-Agent (A2A) protocol and Model Context Protocol (MCP) for agent discovery and tool interaction.
 
-The Semantic Kernel SDK is generally the recommended AI orchestration tool for .NET apps that use one or more AI services in combination with other APIs or web services, data stores, and custom code. Semantic Kernel benefits enterprise developers in the following ways:
+For more information, see the [Microsoft Agent Framework documentation](/agent-framework/overview/agent-framework-overview).
+
+## Semantic Kernel for .NET
 
-- Streamlines integration of AI capabilities into existing applications to enable a cohesive solution for enterprise products.
-- Minimizes the learning curve of working with different AI models or services by providing abstractions that reduce complexity.
-- Improves reliability by reducing the unpredictable behavior of prompts and responses from AI models. You can fine-tune prompts and plan tasks to create a controlled and predictable user experience.
+[Semantic Kernel](/semantic-kernel/overview/) is an open-source library that enables AI integration and orchestration capabilities in your .NET apps. Semantic Kernel has a dependency on the `Microsoft.Extensions.AI.Abstractions` package and provides connectors with concrete implementations of <xref:Microsoft.Extensions.AI.IChatClient> and <xref:Microsoft.Extensions.AI.IEmbeddingGenerator`2> for different services, including OpenAI, Amazon Bedrock, and Google Gemini.
 
-For more information, see the [Semantic Kernel documentation](/semantic-kernel/overview/).
+However, for new applications that require agentic capabilities, multi-agent orchestration, or enterprise-grade observability and security, the recommended framework is [Microsoft Agent Framework](/agent-framework/overview/agent-framework-overview).
 
 ## .NET SDKs for building AI apps
 
@@ -40,6 +47,7 @@ Many different SDKs are available to build .NET apps with AI capabilities depend
 
 | NuGet package | Supported models | Maintainer or vendor | Documentation |
 |---------------|------------------|----------------------|--------------|
+| [Microsoft.Agents.AI.OpenAI](https://www.nuget.org/packages/Microsoft.Agents.AI.OpenAI/) | [OpenAI models](https://platform.openai.com/docs/models/overview)<br/>[Azure OpenAI supported models](/azure/ai-services/openai/concepts/models) | [Microsoft Agent Framework](https://github.com/microsoft/agent-framework) (Microsoft) | [Agent Framework documentation](/agent-framework/overview/agent-framework-overview) |
 | [Microsoft.SemanticKernel](https://www.nuget.org/packages/Microsoft.SemanticKernel/) | [OpenAI models](https://platform.openai.com/docs/models/overview)<br/>[Azure OpenAI supported models](/azure/ai-services/openai/concepts/models) | [Semantic Kernel](https://github.com/microsoft/semantic-kernel) (Microsoft) | [Semantic Kernel documentation](/semantic-kernel/) |
 | [Azure OpenAI SDK](https://www.nuget.org/packages/Azure.AI.OpenAI/) | [Azure OpenAI supported models](/azure/ai-services/openai/concepts/models) | [Azure SDK for .NET](https://github.com/Azure/azure-sdk-for-net) (Microsoft) | [Azure OpenAI services documentation](/azure/ai-services/openai/) |
 | [OpenAI SDK](https://www.nuget.org/packages/OpenAI/) | [OpenAI supported models](https://platform.openai.com/docs/models) | [OpenAI SDK for .NET](https://github.com/openai/openai-dotnet) (OpenAI) | [OpenAI services documentation](https://platform.openai.com/docs/overview) |
@@ -60,7 +68,7 @@ Azure offers many other AI services to build specific application capabilities a
 
 ## Develop with local AI models
 
-.NET apps can also connect to local AI models for many different development scenarios. [Semantic Kernel](https://github.com/microsoft/semantic-kernel) is the recommended tool to connect to local models using .NET. Semantic Kernel can connect to many different models hosted across a variety of platforms and abstracts away lower-level implementation details.
+.NET apps can also connect to local AI models for many different development scenarios. [Microsoft Agent Framework](https://github.com/microsoft/agent-framework) is the recommended tool to connect to local models using .NET. This framework can connect to many different models hosted across a variety of platforms and abstracts away lower-level implementation details.
 
 For example, you can use [Ollama](https://ollama.com/) to [connect to local AI models with .NET](quickstarts/chat-local-model.md), including several small language models (SLMs) developed by Microsoft:
 
@@ -78,6 +86,7 @@ For example, you can use [Ollama](https://ollama.com/) to [connect to local AI m
 
 ## Next steps
 
+- [What is Microsoft Agent Framework?](/agent-framework/overview/agent-framework-overview)
 - [What is Semantic Kernel?](/semantic-kernel/overview/)
 - [Quickstart - Summarize text using Azure AI chat app with .NET](quickstarts/prompt-model.md)