Merge branch 'main' into jlester/try-net-2

Author: Joshua-Lester3

.github/workflows/Build-Test-And-Deploy.yml

@@ -43,24 +43,31 @@ jobs:
       - name: Build with dotnet
         run: dotnet build -p:ContinuousIntegrationBuild=True -p:ReleaseDateAttribute=True --configuration Release --no-restore
 
+      - name: Expose GitHub Actions Runtime
+        uses: actions/github-script@v8
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN']);
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env['ACTIONS_RESULTS_URL']);
+
       - name: Run .NET Tests
         run: dotnet test --no-build --configuration Release
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
 # Build but no push with a PR
       - name: Docker build (no push)
         if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           push: false
           tags: temp-pr-validation
           file: ./EssentialCSharp.Web/Dockerfile
 
       - name: Build Container Image
         if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           tags: ${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:${{ github.sha }},${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:latest,${{ vars.PRODCONTAINER_REGISTRY }}/essentialcsharpweb:${{ github.sha }},${{ vars.PRODCONTAINER_REGISTRY }}/essentialcsharpweb:latest
           file: ./EssentialCSharp.Web/Dockerfile
@@ -106,7 +113,7 @@ jobs:
           docker image ls -a
 
       - name: Log in to container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.DEVCONTAINER_REGISTRY }}
           username: ${{ secrets.ESSENTIALCSHARP_ACR_USERNAME }}
@@ -179,7 +186,7 @@ jobs:
     needs: [deploy-development]
     concurrency:
       group: deploy-production
-      cancel-in-progress: false
+      cancel-in-progress: true
     environment:
       name: "Production"
 
@@ -203,7 +210,7 @@ jobs:
           docker image ls -a
 
       - name: Log in to container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.PRODCONTAINER_REGISTRY }}
           username: ${{ secrets.ESSENTIALCSHARP_ACR_USERNAME }}

.github/workflows/PR-Build-And-Test.yml

@@ -34,6 +34,13 @@ jobs:
       - name: Build with dotnet
         run: dotnet build --configuration Release --no-restore /p:AccessToNugetFeed=false
 
+      - name: Expose GitHub Actions Runtime
+        uses: actions/github-script@v8
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN']);
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env['ACTIONS_RESULTS_URL']);
+
       - name: Run .NET Tests
         run: dotnet test --no-build --configuration Release --report-trx --coverage --results-directory ${{ runner.temp }}
 
@@ -45,10 +52,10 @@ jobs:
           output-directory: '${{ runner.temp }}/vsplaylists'
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build Container Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           file: ./EssentialCSharp.Web/Dockerfile
           context: .

.github/workflows/copilot-setup-steps.yml

@@ -50,7 +50,7 @@ jobs:
         run: dotnet test --no-build --configuration Release
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Set up Node.js for frontend development
         uses: actions/setup-node@v6

.gitignore

@@ -6,6 +6,7 @@ EssentialCSharpManuscript.[0-9]
 .vs/
 obj
 bin
+TestResults/
 ~$*.do[ct]x
 ~*.tmp
 ~$*.dotm

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <ToolingPackagesVersion>1.1.1.18791</ToolingPackagesVersion>
+    <ToolingPackagesVersion>1.1.1.18848</ToolingPackagesVersion>
     <AccessToNugetFeed>false</AccessToNugetFeed>
     <RestoreSources>
       https://api.nuget.org/v3/index.json;
@@ -12,6 +12,9 @@
       https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
+  <PropertyGroup>
+    <SemanticKernelVersion>1.72.0</SemanticKernelVersion>
+  </PropertyGroup>
   <ItemGroup Condition="$(AccessToNugetFeed)">
     <PackageVersion Include="ContentFeedNuget" Version="$(ToolingPackagesVersion)" />
   </ItemGroup>
@@ -21,7 +24,7 @@
     <PackageVersion Include="Azure.Identity" Version="1.18.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.4.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" Version="3.0.1" />
-    <PackageVersion Include="TUnit" Version="1.18.21" />
+    <PackageVersion Include="TUnit" Version="1.19.16" />
     <PackageVersion Include="EssentialCSharp.Shared.Models" Version="$(ToolingPackagesVersion)" />
     <PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
     <PackageVersion Include="IntelliTect.Multitool" Version="2.0.0" />
@@ -36,8 +39,8 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.72.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.PgVector" Version="1.70.0-preview" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.PgVector" Version="$(SemanticKernelVersion)-preview" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />

EssentialCSharp.Chat.Tests/PgVectorConnectorTests.cs

@@ -0,0 +1,28 @@
+using EssentialCSharp.Chat.Common.Models;
+using Microsoft.SemanticKernel.Connectors.PgVector;
+
+namespace EssentialCSharp.Chat.Tests;
+
+public class PgVectorConnectorTests
+{
+    /// <summary>
+    /// Verifies that PostgresVectorStore.GetCollection does not throw a TypeLoadException,
+    /// which would indicate a version mismatch between Microsoft.SemanticKernel core and
+    /// Microsoft.SemanticKernel.Connectors.PgVector (e.g., missing vtable slots on
+    /// internal types like PostgresModelBuilder).
+    /// </summary>
+    [Test]
+    public async Task GetCollection_WithBookContentChunk_DoesNotThrowTypeLoadException()
+    {
+        // Arrange — no real DB connection is needed; connections are only opened for actual queries
+#pragma warning disable SKEXP0010 // PostgresVectorStore is experimental
+        using var store = new PostgresVectorStore("Host=localhost;Database=test;Username=test;Password=test");
+
+        // Act — this triggers loading internal PostgresModelBuilder via PostgresCollection ctor
+        var collection = store.GetCollection<string, BookContentChunk>("test-collection");
+#pragma warning restore SKEXP0010
+
+        // Assert
+        await Assert.That(collection).IsNotNull();
+    }
+}

EssentialCSharp.Web/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:10.0.103 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0.200 AS build
 ARG ACCESS_TO_NUGET_FEED=true
 ENV ACCESS_TO_NUGET_FEED=$ACCESS_TO_NUGET_FEED
 RUN sh -c "$(curl -fsSL https://aka.ms/install-artifacts-credprovider.sh)"

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.103",
+    "version": "10.0.200",
     "rollForward": "latestMinor"
   },
   "test": {