Merge main into live

.github/prompts/error-consolidation.md

@@ -0,0 +1,23 @@
+# Copilot prompts to consolidate error codes.
+
+## Add a single existing file into the new consolidated article. 
+
+Add the contents of cs1027.md to the preprocessor-errors.md file, sort that file by 'source_path_from_root'. Add a redirection for cs1027.md to point to preprocessor-errors.md, add "cs1027: to the list of display names in the TOC for preprocessor-errors.md. Finally, delete cs1027.md
+
+## Search for other related articles that may be missed.
+
+Search all files in the docs/csharp/language-reference/compiler-messages and the docs/csharp/misc folder for any other errors and warnings that involve preprocessor tokens. Give me a list to review for possible additional consolidation.
+
+## Final search in roslyn source
+
+To make sure you've found all related errors, we'll check the source.  Look in `CSharpResources.resx` for any elements where the `<value>` element is a message related to preprocessor tokens. The symbolic constant for that value is in the `name` attribute on the parent `data` element. Find that value in `ErrorCodes.cs`. It will map to the compiler error code, where the code is "CS" followed by the number as a four digit number. Build a list of any not already added to preprocessor-errors.md
+
+## Build consolidated sections
+
+Examine the highlighted section. Other H2s with similar themes should be combined in a similar format. The recommendations to fix the errors should point to language reference articles that explain the impacted syntax.
+
+To do that, make a new H2 section for the theme. Remove all the H2s for the individual error codes that are part of that theme. Where applicable, the new H2 can include text or examples from the H2s you remove.
+
+The list of errors at the top of the file should remain in numerical order, so it's easy for readers to scan. Each impacted error code should now have a link to the anchor tag for the new section. Repeat the list in the new section, but without the anchors, as shown in the highlighted text.
+
+Start with CS1024 and other errors that indicate "Not a valid preprocessor directive"

.github/workflows/scorecards.yml

@@ -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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
+        uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/stale.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         egress-policy: audit
 
-    - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f
+    - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008
       with:
         start-date: '2022-03-01T00:00:00Z' # ISO 8601 or RFC 2822
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.openpublishing.redirection.csharp.json

@@ -363,6 +363,10 @@
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1683.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/assembly-references"
         },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1691.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0270.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
@@ -1834,6 +1838,70 @@
             "source_path_from_root": "/docs/csharp/misc/cs1020.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
         },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1024.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1025.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1027.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1028.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1029.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1030.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1032.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1038.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1040.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1517.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1560.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1576.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1578.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1633.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1634.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1635.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/misc/cs1100.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/extension-declarations"
@@ -1994,10 +2062,30 @@
             "source_path_from_root": "/docs/csharp/misc/cs1686.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
         },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1692.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1694.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1695.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1696.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/misc/cs1706.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
         },
+        {
+            "source_path_from_root": "/docs/csharp/misc/cs1709.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/preprocessor-errors"
+        },
         {
             "source_path_from_root": "/docs/csharp/misc/cs1714.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/assembly-references"

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

@@ -10,16 +10,16 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
-    <PackageReference Include="Azure.Identity" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
+    <PackageReference Include="Azure.Identity" Version="1.17.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.1" />
     <PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.9.0" />
     <PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="9.9.0" />
     <PackageReference Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="9.5.0-preview.1.25265.7" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest" Version="3.10.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="MSTest" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/quickstarts/snippets/mcp-client/MinimalMCPClient.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
-    <PackageReference Include="Azure.Identity" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
+    <PackageReference Include="Azure.Identity" Version="1.17.0" />
+    <PackageReference Include="Microsoft.Extensions.AI" Version="9.9.1" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.3-preview.1.25230.7" />
     <PackageReference Include="ModelContextProtocol" Version="0.1.0-preview.14" />
   </ItemGroup>

docs/ai/quickstarts/snippets/prompt-completion/openai/ExtensionsOpenAI.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
   </ItemGroup>
 
 </Project>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.ConsumeRateLimitingEmbedding/ConsoleAI.ConsumeRateLimitingEmbedding.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OllamaSharp" Version="5.3.6" />
+    <PackageReference Include="OllamaSharp" Version="5.4.7" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
-    <PackageReference Include="OllamaSharp" Version="5.4.4" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
+    <PackageReference Include="OllamaSharp" Version="5.4.7" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.13.0" />
     <ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
   </ItemGroup>
 

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
-    <PackageReference Include="OllamaSharp" Version="5.4.6" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
+    <PackageReference Include="OllamaSharp" Version="5.4.7" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.13.0" />
   </ItemGroup>
 
   <ItemGroup>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI/ConsoleAI.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
-    <PackageReference Include="OllamaSharp" Version="5.4.2" />
+    <PackageReference Include="Microsoft.Extensions.AI" Version="9.9.1" />
+    <PackageReference Include="OllamaSharp" Version="5.4.7" />
   </ItemGroup>
 
   <ItemGroup>