Merging from main.

Author: alliscode

.github/_typos.toml

@@ -23,7 +23,7 @@ extend-exclude = [
     "PopulationByCountry.csv",
     "PopulationByAdmin1.csv",
     "WomensSuffrage.txt",
-    "SK-dotnet.sln.DotSettings",
+    "SK-dotnet.slnx.DotSettings",
     "**/azure_ai_search_hotel_samples/README.md",
     "**/Demos/ProcessFrameworkWithAspire/ProcessFramework.Aspire/ProcessFramework.Aspire.ProcessOrchestrator/Program.cs",
     "**/Demos/ProcessFrameworkWithAspire/**/*.http",

.github/dependabot.yml

@@ -9,8 +9,8 @@ updates:
   - package-ecosystem: "nuget"
     directory: "dotnet/"
     schedule:
-      interval: "weekly"
-      day: "monday"
+      interval: "cron"
+      cronjob: "0 8 * * 4,0" # Every Thursday(4) and Sunday(0) at 8:00 UTC
     ignore:
       # For all System.* and Microsoft.Extensions/Bcl.* packages, ignore all major version updates
       - dependency-name: "System.*"
@@ -24,20 +24,6 @@ updates:
       - ".NET"
       - "dependencies"
 
-  # Maintain dependencies for nuget
-  - package-ecosystem: "nuget"
-    directory: "samples/dotnet"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-
-  # Maintain dependencies for npm
-  - package-ecosystem: "npm"
-    directory: "samples/apps"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-
   # Maintain dependencies for pip
   - package-ecosystem: "pip"
     directory: "python/"
@@ -55,4 +41,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-      day: "monday"
+      day: "tuesday"

.github/workflows/dotnet-build-and-test.yml

@@ -72,28 +72,43 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - name: Setup dotnet ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v3
+
+      - name: Setup dotnet
+        uses: actions/[email protected]
         with:
-          dotnet-version: ${{ matrix.dotnet }}
+          global-json-file: ${{ github.workspace }}/dotnet/global.json
+
       - name: Build dotnet solutions
         shell: bash
         run: |
-          export SOLUTIONS=$(find ./dotnet/ -type f -name "*.sln" | tr '\n' ' ')
+          export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
           for solution in $SOLUTIONS; do
             dotnet build $solution -c ${{ matrix.configuration }} --warnaserror
           done
+
       - name: Package install check
         shell: bash
-        if: matrix.os == 'ubuntu-latest'
         run: |
-          export SOLUTIONS=$(find ./dotnet/ -type f -name "*.sln" | tr '\n' ' ')
+          export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
           for solution in $SOLUTIONS; do
             dotnet pack $solution -c ${{ matrix.configuration }} --no-build --no-restore --output ./artifacts
           done
           dotnet new console --name packcheck --output consoleapp
-          dotnet add consoleapp/packcheck.csproj package Microsoft.SemanticKernel --source ./artifacts
-          dotnet build consoleapp/packcheck.csproj
+
+          # Create minimal nuget.config and use only dotnet nuget commands
+          echo '<?xml version="1.0" encoding="utf-8"?><configuration><packageSources><clear /></packageSources></configuration>' > consoleapp/nuget.config
+
+          # Add sources with local first using dotnet nuget commands
+          dotnet nuget add source ../artifacts --name local --configfile consoleapp/nuget.config
+          dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org --configfile consoleapp/nuget.config
+
+          # Change to project directory to ensure local nuget.config is used
+          cd consoleapp
+          dotnet add packcheck.csproj package Microsoft.SemanticKernel
+          dotnet build -c ${{ matrix.configuration }} packcheck.csproj
+          cd ..
+
+          # Clean up
           rm -rf ./artifacts
           rm -rf ./consoleapp
 
@@ -169,7 +184,7 @@ jobs:
 
       # Generate test reports and check coverage
       - name: Generate test reports
-        uses: danielpalme/[email protected].4
+        uses: danielpalme/[email protected].7
         with:
           reports: "./TestResults/Coverage/**/coverage.cobertura.xml"
           targetdir: "./TestResults/Reports"

.github/workflows/dotnet-ci.yml

@@ -31,7 +31,7 @@ jobs:
 
     - name: Find solutions
       shell: bash
-      run: echo "solutions=$(find ./ -type f -name "*.sln" | tr '\n' ' ')" >> $GITHUB_ENV
+      run: echo "solutions=$(find ./ -type f -name "*.slnx" | tr '\n' ' ')" >> $GITHUB_ENV
 
     - name: Pull container dotnet/sdk:${{ matrix.dotnet }}
       run: |
@@ -94,7 +94,7 @@ jobs:
 
     - name: Find solutions
       shell: bash
-      run: echo "solutions=$(find ./dotnet -type f -name "*.sln" | tr '\n' ' ')" >> $GITHUB_ENV
+      run: echo "solutions=$(find ./dotnet -type f -name "*.slnx" | tr '\n' ' ')" >> $GITHUB_ENV
 
     - name: Restore dependencies
       shell: bash

.github/workflows/dotnet-format.yml

@@ -73,11 +73,11 @@ jobs:
               done
             done
           else
-            # if the changed-files step failed, run dotnet on the whole sln instead of specific projects
-            csproj_files=$(find ./ -type f -name "*.sln" | tr '\n' ' ');
+            # if the changed-files step failed, run dotnet on the whole slnx instead of specific projects
+            csproj_files=$(find ./ -type f -name "*.slnx" | tr '\n' ' ');
           fi
           csproj_files=($(printf "%s\n" "${csproj_files[@]}" | sort -u))
-          echo "Found ${#csproj_files[@]} unique csproj/sln files: ${csproj_files[*]}"
+          echo "Found ${#csproj_files[@]} unique csproj/slnx files: ${csproj_files[*]}"
           echo "::set-output name=csproj_files::${csproj_files[*]}"
 
       - name: Pull container dotnet/sdk:${{ matrix.dotnet }}

.github/workflows/python-test-coverage-report.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           issue-number: ${{ env.PR_NUMBER }}
-          pytest-coverage-path: python/python-coverage.txt
+          pytest-xml-coverage-path: python/python-coverage.xml
           title: "Python Test Coverage Report"
           badge-title: "Python Test Coverage"
           junitxml-title: "Python Unit Test Overview"

.github/workflows/python-test-coverage.yml

@@ -36,12 +36,12 @@ jobs:
       - name: Install the project
         run: uv sync --all-extras --dev
       - name: Test with pytest
-        run: uv run --frozen pytest -q --junitxml=pytest.xml --cov=semantic_kernel --cov-report=term-missing:skip-covered ./tests/unit | tee python-coverage.txt
+        run: uv run --frozen pytest -q --junitxml=pytest.xml --cov=semantic_kernel --cov-report=term-missing:skip-covered --cov-report=xml:python-coverage.xml ./tests/unit
       - name: Upload coverage report
         uses: actions/upload-artifact@v4
         with:
           path: |
-            python/python-coverage.txt
+            python/python-coverage.xml
             python/pytest.xml
             python/pr_number
           overwrite: true

.github/workflows/python-unit-tests.yml

@@ -48,7 +48,7 @@ jobs:
         run: uv run --frozen pytest --junitxml=pytest.xml ./tests/unit
       - name: Surface failing tests
         if: ${{ !matrix.experimental }}
-        uses: pmeier/[email protected].1
+        uses: pmeier/[email protected].2
         with:
           path: python/pytest.xml
           summary: true

.gitignore

@@ -439,7 +439,6 @@ __pycache__/
 .mypy_cache/
 __pypackages__/
 .pdm.toml
-global.json
 
 # doxfx
 **/DROP/
@@ -499,4 +498,4 @@ swa-cli.config.json
 **/.kiota
 
 # dapr extension files
-**/dapr.yaml
+**/dapr.yaml

README.md

@@ -239,7 +239,7 @@ Build a system of specialized agents that can collaborate:
 
 ```python
 import asyncio
-from semantic_kernel.agents import ChatCompletionAgent
+from semantic_kernel.agents import ChatCompletionAgent, ChatHistoryAgentThread
 from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion, OpenAIChatCompletion
 
 billing_agent = ChatCompletionAgent(
@@ -262,7 +262,7 @@ triage_agent = ChatCompletionAgent(
     plugins=[billing_agent, refund_agent],
 )
 
-thread: None
+thread: ChatHistoryAgentThread = None
 
 async def main() -> None:
     print("Welcome to the chat bot!\n  Type 'exit' to exit.\n  Try to get some billing or refund help.")