Merge branch 'main' into agents/tunit-aspnetcore-integration-tests

Author: BenjaminMichaelis

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "10.0.7",
+      "version": "10.0.8",
       "commands": [
         "dotnet-ef"
       ],

.github/dependabot.yml

@@ -26,6 +26,11 @@ updates:
           patterns:
             - "ContentFeedNuget"
             - "EssentialCSharp.Shared.Models"
+       ef-core:
+          applies-to: version-updates
+          patterns:
+            - "Microsoft.EntityFrameworkCore*"
+            - "dotnet-ef"
 
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests

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

@@ -63,17 +63,6 @@ jobs:
       - name: Set up Docker Buildx
         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@v7
-        with:
-          push: false
-          tags: temp-pr-validation
-          file: ./EssentialCSharp.Web/Dockerfile
-          context: .
-          build-args: ACCESS_TO_NUGET_FEED=false
-
       # Only build for dev registry — prod gets the image via az acr import in deploy-production
       - name: Build Container Image
         if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
@@ -189,7 +178,6 @@ jobs:
           az acr import \
             --name "${PROD_ACR%.azurecr.io}" \
             --source "${DEV_ACR}/essentialcsharpweb:${{ github.sha }}" \
-            --registry "${DEV_ACR%.azurecr.io}" \
             --image "essentialcsharpweb:${{ github.sha }}" \
             --image "essentialcsharpweb:latest" \
             --force

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

@@ -3,9 +3,30 @@ name: PR Build and Test EssentialCSharp.Web
 on:
   pull_request:
     branches: ["main"]
+  merge_group:
   workflow_dispatch:
 
 jobs:
+  frontend-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '26'
+          cache: npm
+          cache-dependency-path: EssentialCSharp.Web/package-lock.json
+
+      - name: Install npm dependencies
+        working-directory: EssentialCSharp.Web
+        run: npm ci
+
+      - name: Build frontend
+        working-directory: EssentialCSharp.Web
+        run: npm run build
+
   build-and-test:
     runs-on: ubuntu-latest
     steps:
@@ -67,7 +88,7 @@ jobs:
         with:
           file: ./EssentialCSharp.Web/Dockerfile
           context: .
-          outputs: type=docker,dest=${{ github.workspace }}/essentialcsharpwebimage.tar
+          push: false
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: ACCESS_TO_NUGET_FEED=false

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <ToolingPackagesVersion>1.1.1.19025</ToolingPackagesVersion>
+    <ToolingPackagesVersion>1.1.1.19044</ToolingPackagesVersion>
     <AccessToNugetFeed Condition="'$(AccessToNugetFeed)' == ''">false</AccessToNugetFeed>
     <!-- Disable NuGet vulnerability audit when the private feed is unavailable (e.g. CI without credentials).
          NuGet audit queries all sources in nuget.config regardless of RestoreSources, causing NU1900 which is
@@ -26,18 +26,18 @@
     <PackageVersion Include="TUnit.AspNetCore" Version="1.40.5" />
     <PackageVersion Include="EssentialCSharp.Shared.Models" Version="$(ToolingPackagesVersion)" />
     <PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
-    <PackageVersion Include="IntelliTect.Multitool" Version="2.0.0" />
+    <PackageVersion Include="IntelliTect.Multitool" Version="2.1.0" />
     <PackageVersion Include="Mailjet.Api" Version="4.0.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.8" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.PgVector" Version="$(SemanticKernelVersion)-preview" />
@@ -50,7 +50,7 @@
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.1-preview.1.25571.5" />
     <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
     <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Moq.AutoMock" Version="4.0.2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.7" />

EssentialCSharp.Web/Dockerfile

@@ -5,14 +5,14 @@ WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM node:24-bookworm-slim AS frontend-build
+FROM node:26-bookworm-slim AS frontend-build
 WORKDIR /frontend/EssentialCSharp.Web
 COPY EssentialCSharp.Web/package.json EssentialCSharp.Web/package-lock.json ./
 RUN npm ci
 COPY EssentialCSharp.Web/ ./
 RUN npm run build
 
-FROM mcr.microsoft.com/dotnet/sdk:10.0.203 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0.300 AS build
 ARG ACCESS_TO_NUGET_FEED=true
 ENV ACCESS_TO_NUGET_FEED=$ACCESS_TO_NUGET_FEED
 WORKDIR /src