resolve merge conflicts

Author: gewarren

.github/dependabot.yml

@@ -822,6 +822,28 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/ai/quickstarts/snippets/image-generation/azure-openai" #ImagesAzureOpenAI.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/ai/quickstarts/snippets/image-generation/openai" #ImagesOpenAI.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/ai/quickstarts/snippets/local-ai" #ollama.csproj
     schedule:
@@ -1020,17 +1042,6 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/core/docker/snippets/7.0/Worker" #DotNet.ContainerImage.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/core/docker/snippets/8.0/Worker" #DotNet.ContainerImage.csproj
     schedule:
@@ -1790,6 +1801,17 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/core/testing/snippets/testcontext/csharp" #project.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/core/testing/snippets/unit-testing-using-mstest/csharp/PrimeService.Tests" #PrimeService.Tests.csproj
     schedule:
@@ -2175,25 +2197,3 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/machine-learning/tutorials/snippets/image-classification/csharp" #TransferLearningTF.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/machine-learning/tutorials/snippets/iris-clustering/csharp" #IrisFlowerClustering.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/policies/close-issues.yml

@@ -1,5 +1,5 @@
-name: Stale issues
-description: Close needs-more-info issues that haven't had a response in 14 days
+name: Close issues
+description: Close issues based on label
 resource: repository
 where:
 configuration:

.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@39d3039e84ca8c15d36528551149cb9de3046876 # main
+      uses: IEvangelist/profanity-filter@8ed64a0b6652c314f0e2519a86ae234c6df63698 # main
       id: profanity-filter
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

docfx.json

@@ -325,7 +325,7 @@
                 "docs/architecture/grpc-for-wcf-developers/**/**.md": "JamesNK",
                 "docs/architecture/modernize-desktop/**/**.md": "OliaG",
                 "docs/core/**/**.md": "gewarren",
-                "docs/core/compatibility/**/**.md": "gewarren",
+                "docs/core/compatibility/**/**.md": "camsoper",
                 "docs/core/deploying/**/**.md": "adegeo",
                 "docs/core/diagnostics/**/**.md": "tommcdon",
                 "docs/core/extensions/**/**.md": "IEvangelist",
@@ -338,7 +338,7 @@
                 "docs/core/tools/**/**.md": "tdykstra",
                 "docs/core/tutorials/**/**.md": "tdykstra",
                 "docs/core/versions/**/**.md": "billwagner",
-                "docs/core/whats-new/**/**.md": "gewarren",
+                "docs/core/whats-new/**/**.md": "camsoper",
                 "docs/csharp/**/*.*": "billwagner",
                 "docs/framework/**/**.md": "gewarren",
                 "docs/framework/additional-apis/pos-for-net/**/**.md": "TerryWarwick",
@@ -417,7 +417,7 @@
                 "docs/azure/**/*.*": "alexwolf",
                 "docs/orleans/**/*.*": "dapine",
                 "docs/core/**/**.md": "dotnetcontent",
-                "docs/core/compatibility/**/**.md": "gewarren",
+                "docs/core/compatibility/**/**.md": "casoper",
                 "docs/core/deploying/**/**.md": "adegeo",
                 "docs/core/diagnostics/**/**.md": "tommcdon",
                 "docs/core/extensions/**/**.md": "dapine",
@@ -431,7 +431,7 @@
                 "docs/core/tools/**/**.md": "tdykstra",
                 "docs/core/tutorials/**/**.md": "tdykstra",
                 "docs/core/versions/**/**.md": "wiwagn",
-                "docs/core/whats-new/**/**.md": "gewarren",
+                "docs/core/whats-new/**/**.md": "casoper",
                 "docs/csharp/**/*.*": "wiwagn",
                 "docs/framework/**/**.md": "dotnetcontent",
                 "docs/framework/app-domains/**/**.md": "gewarren",

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

@@ -28,6 +28,14 @@ Complete the following steps to configure and run a local AI Model on your devic
     ollama
     ```
 
+    If Ollama is available, it displays a list of available commands.
+
+1. Start Ollama:
+
+    ```bash
+    ollama serve
+    ```
+
     If Ollama is running, it displays a list of available commands.
 
 1. Pull the `phi3:mini` model from the Ollama registry and wait for it to download:

docs/ai/quickstarts/snippets/build-chat-app/azure-openai/ChatAppAI.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />

docs/ai/quickstarts/snippets/function-calling/azure-openai/FunctionCallingAI.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.AI" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />

docs/ai/quickstarts/snippets/image-generation/azure-openai/ImagesAzureOpenAI.csproj

@@ -9,9 +9,9 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
 
   </ItemGroup>
 

docs/ai/quickstarts/snippets/image-generation/openai/ImagesOpenAI.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenAI" Version="2.1.0-beta.1" />
+    <PackageReference Include="OpenAI" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />

docs/ai/quickstarts/snippets/prompt-completion/azure-openai/ExtensionsAzureOpenAI.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />