Merge main into live

.github/CODEOWNERS

@@ -1 +1,245 @@
-# This file is intentionally empty in the live branch to avoid pinging everyone for reviews on main to live PRs.
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# More details are here: https://help.github.com/articles/about-codeowners/
+
+# The '*' pattern is global owners.
+
+*    @dotnet/docs
+
+.github/ @dotnet/docs
+
+# Order is important. The last matching pattern has the most precedence.
+# The folders are ordered as follows:
+# . Guides
+# . .NET Core sections
+# . .NET Framework sections
+# . .NET Standard
+# . Architecture e-books
+
+# In each subsection, folders are order first by depth, then alphabetically.
+# This should make it easy to add new rules without breaking existing ones.
+
+######## API landing page ###########
+/api/ @gewarren @dotnet/docs
+
+######## Includes files ###########
+/includes/ @dotnet/docs
+
+############ What's new ###############
+/docs/whats-new/ @gewarren @dotnet/docs
+
+############ Guides ################
+# .NET Core
+/docs/core/ @dotnet/docs
+
+# .NET fundamentals
+/docs/fundamentals/ @dotnet/docs
+
+# .NET Framework
+/docs/framework/ @dotnet/docs
+
+# .NET Standard
+/docs/standard/ @gewarren @dotnet/docs
+
+# The C# Guide:
+/docs/csharp/ @BillWagner @dotnet/docs
+
+# The F# Guide:
+/docs/fsharp/ @BillWagner @dotnet/fsharp-team-msft @dotnet/docs
+
+# The Visual Basic Guide:
+/docs/visual-basic/ @BillWagner @dotnet/docs
+
+# The ML.NET Guide:
+/docs/machine-learning/ @gewarren @luisquintanilla @JakeRadMSFT @dotnet/docs
+
+# The .NET Architecture Guide:
+/docs/architecture/ @dotnet/docs
+
+# .NET Orleans
+/docs/orleans/ @meaghanlewis @ReubenBond
+
+# IoT Guide
+/docs/iot/ @dotnet/docs
+
+############### AI ################
+
+/docs/ai/ @gewarren @dotnet/docs
+
+############### Azure ################
+
+# Azure Guide
+/docs/azure/  @dotnet/docs
+
+# Azure SDK package list
+/docs/azure/includes/ @dotnet/docs
+
+# Azure SDK catch-all entry
+/docs/azure/sdk/ @JonathanGiles @dotnet/docs
+
+# Azure SDK authentication topics
+/docs/azure/sdk/authentication/ @JonathanCrd @dotnet/docs
+
+# Azure SDK miscellaneous topics
+/docs/azure/sdk/azure-sdk-configure-proxy.md @JoshLove-msft @JonathanGiles @dotnet/docs
+/docs/azure/sdk/azure-sdk-for-net.md @JonathanGiles @dotnet/docs
+/docs/azure/sdk/dependency-injection.md @JoshLove-msft @JonathanGiles @m-nash @dotnet/docs
+/docs/azure/sdk/logging.md @JoshLove-msft @JonathanGiles @dotnet/docs
+/docs/azure/sdk/packages.md @JonathanGiles @dotnet/docs
+/docs/azure/sdk/pagination.md @JoshLove-msft @JonathanGiles @dotnet/docs
+/docs/azure/sdk/protocol-convenience-methods.md @JonathanGiles @dotnet/docs
+/docs/azure/sdk/resource-management.md @ArthurMa1978 @m-nash @dotnet/docs
+/docs/azure/sdk/thread-safety.md @JoshLove-msft @JonathanGiles @dotnet/docs
+/docs/azure/sdk/unit-testing-mocking.md @JoshLove-msft @JonathanGiles @dotnet/docs
+
+############### Fundamentals ################
+
+# Code analysis
+/docs/fundamentals/code-analysis/ @gewarren @dotnet/docs
+
+############### .NET Core ########################
+# 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
+# Docker
+/docs/core/docker/ @adegeo @dotnet/docs
+# Extensions
+/docs/core/extensions/ @gewarren @dotnet/docs
+# Install
+/docs/core/install/ @adegeo @dotnet/docs
+# Project SDKs
+/docs/core/project-sdk/ @gewarren @dotnet/docs
+# Config settings
+/docs/core/runtime-config/ @gewarren @dotnet/docs
+# Testing
+/docs/core/testing/ @meaghanlewis @dotnet/dotnet-testing
+# Tools
+/docs/core/tools/ @meaghanlewis @dotnet/docs
+# Tutorials
+/docs/core/tutorials/ @meaghanlewis @dotnet/docs
+# What's new
+/docs/core/whats-new/ @dotnet/docs
+
+################### .NET Framework ##################
+# App domains
+/docs/framework/app-domains/ @gewarren @dotnet/docs
+# Config - WinForms
+/docs/framework/configure-apps/file-schema/winforms/ @adegeo @dotnet/docs
+# Deployment
+/docs/framework/deployment/ @adegeo @dotnet/docs
+# Installation
+/docs/framework/install/ @adegeo @dotnet/docs
+# Migration guide
+/docs/framework/migration-guide/ @gewarren @dotnet/docs
+# Reflection
+/docs/framework/reflection-and-codedom/ @adegeo @dotnet/docs
+# Resources
+/docs/framework/resources/ @adegeo @dotnet/docs
+# Tools
+/docs/framework/tools/ @gewarren @dotnet/docs
+# UI Automation
+/docs/framework/ui-automation/ @adegeo @dotnet/docs
+# What's New
+/docs/framework/whats-new/ @gewarren @dotnet/docs
+# Winforms
+/docs/framework/winforms/ @adegeo @dotnet/docs
+# WPF
+/docs/framework/wpf/ @adegeo @dotnet/docs
+# XAML Services
+/docs/framework/xaml-services/ @adegeo @dotnet/docs
+# ADO.NET
+/docs/framework/data/ @dotnet/docs
+# NCL
+/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/ @dotnet/docs
+/docs/framework/wcf/ @dotnet/docs
+
+################## .NET Standard ##################
+# Analyzers
+/docs/standard/analyzers/ @gewarren @dotnet/docs
+# Assembly
+/docs/standard/assembly/ @gewarren @dotnet/docs
+# Asynchronous Programming Patterns
+/docs/standard/asynchronous-programming-patterns/ @BillWagner @dotnet/docs
+# Attributes
+/docs/standard/attributes/ @gewarren @dotnet/docs
+# Character encoding
+/docs/standard/base-types/character-encoding/ @gewarren @dotnet/docs
+/docs/standard/base-types/character-encoding-introduction/ @gewarren @dotnet/docs
+# Base types
+/docs/standard/base-types/ @adegeo @dotnet/docs
+# Collections
+/docs/standard/collections/ @adegeo @dotnet/docs
+# System.CommandLine
+/docs/standard/commandline/ @gewarren @dotnet/docs
+# Data
+/docs/standard/data/ @gewarren @dotnet/docs
+# Data - SQLite
+/docs/standard/data/sqlite/ @dotnet/docs
+# Datetime
+/docs/standard/datetime/ @adegeo @dotnet/docs
+# Design guidelines
+/docs/standard/design-guidelines/ @BillWagner @dotnet/docs
+# Events
+/docs/standard/events/ @adegeo @dotnet/docs
+# Exceptions
+/docs/standard/exceptions/ @gewarren @dotnet/docs
+# GC
+/docs/standard/garbage-collection/ @gewarren @dotnet/docs
+# Generics
+/docs/standard/generics/ @adegeo @dotnet/docs
+# Globalization
+/docs/standard/globalization-localization/ @dotnet/docs @dotnet/docs
+# I/O
+/docs/standard/io/ @adegeo @dotnet/docs
+# Library guidance
+/docs/standard/library-guidance/ @jamesnk @dotnet/docs
+# LINQ
+/docs/standard/linq/ @dotnet/docs
+# Memory and spans
+/docs/standard/memory-and-spans/ @gewarren @dotnet/docs
+# Native Interop
+/docs/standard/native-interop/ @jkoritzinsky @dotnet/docs
+# Parallel programming
+/docs/standard/parallel-programming/ @adegeo @dotnet/docs
+# Security
+/docs/standard/security/ @BillWagner @dotnet/docs
+# Serialization
+/docs/standard/serialization/ @gewarren @dotnet/docs
+# Threading
+/docs/standard/threading/ @BillWagner @dotnet/docs
+# What's New
+/docs/standard/whats-new/ @dotnet/docs
+
+################## E-books ##################
+# Blazor:
+/docs/architecture/blazor-for-web-forms-developers/ @danroth27 @dotnet/docs
+# Desktop:
+/docs/architecture/modernize-desktop/ @adegeo @dotnet/docs
+
+################# Samples folder ##############
+
+## These have been pulled directly from the samples repo:
+
+# C# snippets:
+/samples/snippets/csharp/ @BillWagner @dotnet/docs
+# Visual Basic snippets:
+/samples/snippets/visualbasic/ @BillWagner @dotnet/docs
+# F# Snippets:
+/samples/snippets/fsharp/ @dotnet/docs
+
+# WPF folders:
+/samples/snippets/xaml/wpf/   @adegeo @dotnet/docs
+/samples/snippets/csharp/wpf/   @adegeo @dotnet/docs
+/samples/snippets/visualbasic/wpf/   @adegeo @dotnet/docs
+/samples/snippets/desktop-guide/wpf/   @adegeo @dotnet/docs
+
+/samples/snippets/winforms/  @adegeo @dotnet/docs

.github/workflows/dependabot-approve-merge.yml

@@ -11,7 +11,7 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' && github.repository_owner == 'dotnet' && github.base_ref == 'main' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@ccd8616d44fd3846e67624a50d5aad6d37bf2d25 # v2.22.1
         with:
           egress-policy: audit
 

.github/workflows/scorecards.yml

@@ -41,7 +41,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
+        uses: ossf/scorecard-action@fa7117db83c52d787ae5a89f350999701505d78e # v2.5.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
         with:
           sarif_file: results.sarif

.openpublishing.redirection.csharp.json

@@ -88,6 +88,22 @@
       "source_path_from_root": "/docs/csharp/fundamentals/functional/discards.md",
       "redirect_url": "/dotnet/csharp/fundamentals/patterns/discards"
     },
+    {
+      "source_path_from_root": "/docs/csharp/fundamentals/functional/index.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/index"
+    },
+    {
+      "source_path_from_root": "/docs/csharp/fundamentals/functional/iterators.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/iterators"
+    },
+    {
+      "source_path_from_root": "/docs/csharp/fundamentals/functional/lambdas.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/lambdas"
+    },
+    {
+      "source_path_from_root": "/docs/csharp/fundamentals/functional/local-functions.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/local-functions"
+    },
     {
       "source_path_from_root": "/docs/csharp/fundamentals/functional/pattern-matching.md",
       "redirect_url": "/dotnet/csharp/fundamentals/patterns/pattern-matching"
@@ -242,6 +258,10 @@
       "source_path_from_root": "/docs/csharp/interop.md",
       "redirect_url": "/dotnet/csharp/advanced-topics/interop/index"
     },
+    {
+      "source_path_from_root": "/docs/csharp/iterators.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/iterators"
+    },
     {
       "source_path_from_root": "/docs/csharp/lambda-expressions.md",
       "redirect_url": "/dotnet/csharp/language-reference/operators/lambda-expressions"
@@ -1822,7 +1842,7 @@
     },
     {
       "source_path_from_root": "/docs/csharp/local-functions-vs-lambdas.md",
-      "redirect_url": "/dotnet/csharp/programming-guide/classes-and-structs/local-functions"
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/local-functions"
     },
     {
       "source_path_from_root": "/docs/csharp/methods-lambda-expressions.md",
@@ -3472,6 +3492,10 @@
       "source_path_from_root": "/docs/csharp/programming-guide/classes-and-structs/inheritance.md",
       "redirect_url": "/dotnet/csharp/fundamentals/object-oriented/inheritance"
     },
+    {
+      "source_path_from_root": "/docs/csharp/programming-guide/classes-and-structs/local-functions.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/local-functions"
+    },
     {
       "source_path_from_root": "/docs/csharp/programming-guide/classes-and-structs/objects.md",
       "redirect_url": "/dotnet/csharp/fundamentals/object-oriented/objects"
@@ -3667,6 +3691,10 @@
       "source_path_from_root": "/docs/csharp/programming-guide/concepts/expression-trees/index.md",
       "redirect_url": "/dotnet/csharp/advanced-topics/expression-trees/index"
     },
+    {
+      "source_path_from_root": "/docs/csharp/programming-guide/concepts/iterators.md",
+      "redirect_url": "/dotnet/csharp/fundamentals/building-software/iterators"
+    },
     {
       "source_path_from_root": "/docs/csharp/programming-guide/concepts/linq/adding-elements-attributes-and-nodes-to-an-xml-tree.md",
       "redirect_url": "/dotnet/standard/linq/add-elements-attributes-nodes-xml-tree",

docs/ai/evaluation/snippets/evaluate-ai-responses/TestAI.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
-    <PackageReference Include="MSTest" Version="4.4.1" />
+    <PackageReference Include="MSTest" Version="4.5.1" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/evaluation/snippets/evaluate-safety/EvaluateResponseSafety.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
-    <PackageReference Include="MSTest" Version="4.4.1" />
+    <PackageReference Include="MSTest" Version="4.5.1" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/evaluation/snippets/evaluate-with-reporting/TestAIWithReporting.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="microsoft.extensions.configuration" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
-    <PackageReference Include="MSTest" Version="4.4.1" />
+    <PackageReference Include="MSTest" Version="4.5.1" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/snippets/prompt-engineering/multi-turn-chat.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
-    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.23.0" />
+    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.24.0" />
     <!--
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />