Merge pull request #43636 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

.github/dependabot.yml

@@ -800,6 +800,28 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/azure/sdk/snippets/aspnetcore-guidance/BlazorSample" #BlazorSample.csproj
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for projects.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/azure/sdk/snippets/aspnetcore-guidance/MinApiSample" #MinApiSample.csproj
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for projects.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
     directory: "/docs/azure/sdk/snippets/logging" #LoggingSampleApp.csproj
     schedule:
@@ -2175,25 +2197,3 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/orleans/deployment/snippets/consul/Silo" #Silo.csproj
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    open-pull-requests-limit: 5
-    groups:
-      # Group .NET updates together for projects.
-      dotnet:
-        patterns:
-          - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/orleans/deployment/snippets/service-fabric/stateless" #Orleans.ServiceFabric.Stateless.csproj
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    open-pull-requests-limit: 5
-    groups:
-      # Group .NET updates together for projects.
-      dotnet:
-        patterns:
-          - "*" # Prefer a single PR per project update.

.github/workflows/markdownlint.yml

@@ -27,7 +27,7 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
+      - uses: DavidAnson/markdownlint-cli2-action@eb5ca3ab411449c66620fe7f1b3c9e10547144b0 # v18.0.0
         with:
           config: ".markdownlint-cli2.jsonc"
           globs: "**/*.md"

.github/workflows/profanity-filter.yml

@@ -25,7 +25,7 @@ jobs:
 
     - name: Profanity filter
       if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'github-actions[bot]'  }}
-      uses: IEvangelist/profanity-filter@840020b719c619d953959e59c47185689e831a27 # main
+      uses: IEvangelist/profanity-filter@39d3039e84ca8c15d36528551149cb9de3046876 # main
       id: profanity-filter
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

.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@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif

.openpublishing.redirection.azure.json

@@ -119,6 +119,10 @@
         {
             "source_path_from_root": "/docs/azure/ai/get-started-app-chat-scaling-with-azure-container-apps.md",
             "redirect_url": "/dotnet/ai/get-started-app-chat-scaling-with-azure-container-apps"
+        },
+        {
+            "source_path_from_root": "/docs/azure/sdk/azure-sdk-configure-proxy.md",
+            "redirect_url": "/dotnet/azure/sdk/configure-proxy"
         }
     ]
 }

docs/ai/conceptual/rag.md

@@ -1,6 +1,6 @@
 ---
 title: "Integrate Your Data into AI Apps with Retrieval-Augmented Generation"
-description: "Learn how retreival-augmented generation lets you use your data with LLMs to generate better completions in .NET."
+description: "Learn how retrieval-augmented generation lets you use your data with LLMs to generate better completions in .NET."
 author: catbutler
 ms.topic: concept-article #Don't change.
 ms.date: 04/15/2024

docs/ai/how-to/snippets/semantic-kernel/semantic-kernel.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.28.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.29.0" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.9.0-alpha" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.9.0-alpha" />
     <PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.9.0-alpha" />

docs/ai/quickstarts/quickstart-local-ai.md

@@ -1,6 +1,6 @@
 ---
 title: Quickstart - Connect to and chat with a local AI using .NET and Semantic Kernel
-description: Set up a local AI model and chat with it using a .NET consle app and the Semantic Kernel SDK
+description: Set up a local AI model and chat with it using a .NET console app and the Semantic Kernel SDK
 ms.date: 06/04/2024
 ms.topic: quickstart
 ms.custom: devx-track-dotnet, devx-track-dotnet-ai

docs/ai/quickstarts/snippets/local-ai/ollama.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.28.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.29.0" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.22.0-alpha" />
   </ItemGroup>
 

docs/ai/tutorials/snippets/llm-eval/llm-eval.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.28.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.29.0" />
   </ItemGroup>
 
 </Project>