jodavis · Copilot · Jan 20, 2026 · Jan 20, 2026 · Jan 20, 2026 · Jan 21, 2026
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -7,7 +7,7 @@ AdaptiveRemote is a remote control application for TV and AV equipment designed
 - Support for both touch/mouse and specialized input devices
 
 ## Technology Stack
-- **Platform:** Windows OS only (.NET 8 / net8.0-windows)
+- **Platform:** Windows OS only (.NET 10 / net10.0-windows)
 - **UI Framework:** WPF with Blazor WebView components (Microsoft.AspNetCore.Components.WebView.Wpf)
 - **Language:** C# with nullable reference types enabled
 - **Build System:** .NET SDK, MSBuild
@@ -60,7 +60,7 @@ The AdaptiveRemote.Headless host uses Playwright for cross-platform E2E testing
   ```
 - **Install Playwright Browsers (one-time):**
   ```bash
-  pwsh src/AdaptiveRemote.Headless/bin/Debug/net8.0/playwright.ps1 install chromium
+  pwsh src/AdaptiveRemote.Headless/bin/Debug/net10.0/playwright.ps1 install chromium
   ```
 - **Run Tests:** No special environment needed - fully headless
   ```bash

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
 
     - name: Restore dependencies
       run: dotnet restore
@@ -35,7 +35,7 @@ jobs:
 
     - name: Install Chromium browser for Playwright headless tests
       shell: pwsh
-      run: pwsh ./src/AdaptiveRemote.Headless/bin/Debug/net8.0/playwright.ps1 install chromium
+      run: pwsh ./src/AdaptiveRemote.Headless/bin/Debug/net10.0/playwright.ps1 install chromium
 
     - name: Test
       run: dotnet test --no-build --verbosity normal --logger trx --results-directory "TestResults"

diff --git a/src/AdaptiveRemote.App/AdaptiveRemote.App.csproj b/src/AdaptiveRemote.App/AdaptiveRemote.App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>AdaptiveRemote</RootNamespace>

diff --git a/src/AdaptiveRemote.App/Services/IFileSystemExtensions.cs b/src/AdaptiveRemote.App/Services/IFileSystemExtensions.cs
@@ -23,11 +23,19 @@ public static Stream OpenWrite(this IFileSystem fileSystem, string path, bool cr
     {
         if (createDirectory)
         {
-            CreateDirectory(fileSystem, DirectoryFor(path), recursive: true);
+            string? directory = DirectoryFor(path);
+            if (!string.IsNullOrEmpty(directory))
+            {
+                CreateDirectory(fileSystem, directory, recursive: true);
+            }
         }
 
         return fileSystem.OpenWrite(path);
     }
 
-    private static string DirectoryFor(string path) => Path.GetDirectoryName(path)!;
+    private static string? DirectoryFor(string path)
+    {
+        string? directory = Path.GetDirectoryName(path);
+        return string.IsNullOrEmpty(directory) ? null : directory;
+    }
 }
diff --git a/src/AdaptiveRemote.Console/AdaptiveRemote.Console.csproj b/src/AdaptiveRemote.Console/AdaptiveRemote.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>

diff --git a/src/AdaptiveRemote.Headless/AdaptiveRemote.Headless.csproj b/src/AdaptiveRemote.Headless/AdaptiveRemote.Headless.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/AdaptiveRemote.Headless/Components/App.razor b/src/AdaptiveRemote.Headless/Components/App.razor
@@ -0,0 +1,20 @@
+@using AdaptiveRemote.Components
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <link rel="stylesheet" href="css/app.min.css" />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <HeadOutlet />
+</head>
+
+<body>
+    <Routes />
+    <script src="_framework/blazor.web.js"></script>
+</body>
+
+</html>
diff --git a/src/AdaptiveRemote.Headless/Components/Routes.razor b/src/AdaptiveRemote.Headless/Components/Routes.razor
@@ -0,0 +1,3 @@
+@using AdaptiveRemote.Components
+
+<Root />
diff --git a/src/AdaptiveRemote.Headless/Components/_Imports.razor b/src/AdaptiveRemote.Headless/Components/_Imports.razor
@@ -0,0 +1,10 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using AdaptiveRemote.Headless
+@using AdaptiveRemote.Headless.Components
diff --git a/src/AdaptiveRemote.Headless/Pages/_Host.cshtml b/src/AdaptiveRemote.Headless/Pages/_Host.cshtml
@@ -1,5 +1,6 @@
 @* This page needs to be kept in sync with AdaptiveRemote.App\wwwroot\index.html *@
 @page 
+@using Microsoft.AspNetCore.Components.Web
 @using AdaptiveRemote.Components
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 <!DOCTYPE html>
@@ -11,17 +12,11 @@
     <base href="~/" />
     <link href="css/app.min.css" rel="stylesheet" />
     <link href="WpfBlazor.styles.css" rel="stylesheet" />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <component type="typeof(HeadOutlet)" render-mode="ServerPrerendered" />
 </head>
 <body>
-    <div id="app">
-        <component type="typeof(Root)" render-mode="Server" />
-    </div>
-
-    <div id="blazor-error-ui" data-nosnippet>
-        An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
+    <component type="typeof(Root)" render-mode="ServerPrerendered" />
     <script src="_framework/blazor.server.js"></script>
 </body>
 </html>
diff --git a/src/AdaptiveRemote.Headless/PlaywrightBrowserLifetimeService.cs b/src/AdaptiveRemote.Headless/PlaywrightBrowserLifetimeService.cs
@@ -1,5 +1,7 @@
 using AdaptiveRemote.Services.Testing;
 using AdaptiveRemote.Utilities;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.Extensions.Options;
 using Microsoft.Playwright;
 
@@ -13,6 +15,7 @@ internal class PlaywrightBrowserLifetimeService : BackgroundService, IBrowserUIA
 {
     private readonly ILogger<PlaywrightBrowserLifetimeService> _logger;
     private readonly IHostApplicationLifetime _lifetime;
+    private readonly IServer _server;
     private readonly PlaywrightSettings _settings;
     private IPlaywright? _playwright;
     private IBrowser? _browser;
@@ -27,10 +30,12 @@ internal class PlaywrightBrowserLifetimeService : BackgroundService, IBrowserUIA
     public PlaywrightBrowserLifetimeService(
         ILogger<PlaywrightBrowserLifetimeService> logger,
         IOptions<PlaywrightSettings> options,
-        IHostApplicationLifetime lifetime)
+        IHostApplicationLifetime lifetime,
+        IServer server)
     {
         _logger = logger;
         _lifetime = lifetime;
+        _server = server;
         _settings = options.Value;
     }
 
@@ -43,8 +48,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         try
         {
-            // Get the port the app is listening on (from configuration or default)
-            string appUrl = "http://localhost:5000"; // Default
+            // Get the actual URL the server is listening on
+            var serverAddressesFeature = _server.Features.Get<IServerAddressesFeature>();
+            string appUrl = serverAddressesFeature?.Addresses.FirstOrDefault() ?? "http://localhost:5000";
 
             _logger.LogInformation("Will navigate to: {AppUrl}", appUrl);
 

diff --git a/src/AdaptiveRemote.Headless/Program.cs b/src/AdaptiveRemote.Headless/Program.cs
@@ -1,4 +1,5 @@
 using AdaptiveRemote.Headless;
+using AdaptiveRemote.Headless.Components;
 using AdaptiveRemote.Services.Conversation;
 using AdaptiveRemote.Services.Lifecycle;
 using AdaptiveRemote.Services.Testing;
@@ -22,9 +23,9 @@
     .AddSingleton<IGrammarProvider, StubGrammarProvider>()
     .AddSingleton<ISpeechRecognitionEngine, StubSpeechRecognition>();
 
-// Add the minimal services for ASP.NET to serve the Blazor UI
-builder.Services.AddRazorPages();
-builder.Services.AddServerSideBlazor();
+// Add services to the container - using the .NET 10 template approach
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
 
 // Register circuit handler for logging
 builder.Services.AddSingleton<CircuitHandler, LoggingCircuitHandler>();
@@ -38,15 +39,16 @@
 
 WebApplication app = builder.Build();
 
+// Configure the HTTP request pipeline - following .NET 10 template pattern
 if (!app.Environment.IsDevelopment())
 {
-    app.UseExceptionHandler("/Error");
+    app.UseExceptionHandler("/Error", createScopeForErrors: true);
 }
 
-app.UseStaticFiles();
-app.UseRouting();
+app.UseAntiforgery();
 
-app.MapBlazorHub();
-app.MapFallbackToPage("/_Host");
+app.MapStaticAssets();
+app.MapRazorComponents<App>()
+    .AddInteractiveServerRenderMode();
 
 app.Run();
diff --git a/src/AdaptiveRemote/AdaptiveRemote.csproj b/src/AdaptiveRemote/AdaptiveRemote.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/test/AdaptiveRemote.App.Tests/AdaptiveRemote.App.Tests.csproj b/test/AdaptiveRemote.App.Tests/AdaptiveRemote.App.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>