From ea03e1a4bcdb64ff0d8fed09a3864f532d0e3adf Mon Sep 17 00:00:00 2001
From: Tim Moore <tim.moore@ae35.co.uk>
Date: Thu, 13 Nov 2025 14:04:51 +0000
Subject: [PATCH 1/3] Update to .NET 10

---
 README.md                                        |  7 +++----
 src/ImageMapper.Api/ImageMapper.Api.csproj       |  6 +++---
 .../ImageMapper.AppHost.csproj                   |  2 +-
 src/ImageMapper.Models/ImageMapper.Models.csproj |  2 +-
 .../ImageMapper.ServiceDefaults.csproj           | 16 ++++++++--------
 src/ImageMapper.Tests/ImageMapper.Tests.csproj   |  4 ++--
 src/ImageMapper.Web/ImageMapper.Web.csproj       |  2 +-
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index b3f814b..c5cb4c6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This application is built using .NET and leverages the Leaflet.js library for ma
 
 ## Dependencies
 
-- .NET 9
+- .NET 10 (likely will work with .NET 8+)
 - [MetadataExtractor](https://github.com/drewnoakes/metadata-extractor-dotnet)
 - [Leaflet.js](https://leafletjs.com/)
 - [openstreetmap.org](https://www.openstreetmap.org/)
@@ -52,12 +52,11 @@ The folder for images can be configured via `appsettings.json` file in ImageMapp
 
 ## TODO
 
-- Unit tests
+- Further unit tests
 - Optimise image processing for large number of images and folders
 - Caching (minimally in-memory/redis etc, future database caching of metadata. With detection of image file changes)
 - Configure map tile provider options
 - UI improvements, filtering etc
-- Optimise image loading via JS interop instead of API call
-- or Blazor component library for map display? - BlazorLeaflet or similar wrapper package
+- Optimise Leaflet rendering from back-end images especially to handle large numbers of images
 - Error handling and logging improvements
 - Container support
diff --git a/src/ImageMapper.Api/ImageMapper.Api.csproj b/src/ImageMapper.Api/ImageMapper.Api.csproj
index ea5887a..e95e900 100644
--- a/src/ImageMapper.Api/ImageMapper.Api.csproj
+++ b/src/ImageMapper.Api/ImageMapper.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -9,10 +9,10 @@
     
   <ItemGroup>
     <PackageReference Include="MetadataExtractor" Version="2.9.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
     <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
   </ItemGroup>
     
   <ItemGroup>
diff --git a/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj b/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
index 947469e..3dcf2a2 100644
--- a/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
+++ b/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>caf43e96-984e-4473-9d9d-48f525e8cfd1</UserSecretsId>
diff --git a/src/ImageMapper.Models/ImageMapper.Models.csproj b/src/ImageMapper.Models/ImageMapper.Models.csproj
index 125f4c9..b760144 100644
--- a/src/ImageMapper.Models/ImageMapper.Models.csproj
+++ b/src/ImageMapper.Models/ImageMapper.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/ImageMapper.ServiceDefaults/ImageMapper.ServiceDefaults.csproj b/src/ImageMapper.ServiceDefaults/ImageMapper.ServiceDefaults.csproj
index 233173d..1aa2ba9 100644
--- a/src/ImageMapper.ServiceDefaults/ImageMapper.ServiceDefaults.csproj
+++ b/src/ImageMapper.ServiceDefaults/ImageMapper.ServiceDefaults.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
@@ -10,13 +10,13 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ImageMapper.Tests/ImageMapper.Tests.csproj b/src/ImageMapper.Tests/ImageMapper.Tests.csproj
index 67a1ead..84206ab 100644
--- a/src/ImageMapper.Tests/ImageMapper.Tests.csproj
+++ b/src/ImageMapper.Tests/ImageMapper.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.Testing" Version="9.5.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/ImageMapper.Web/ImageMapper.Web.csproj b/src/ImageMapper.Web/ImageMapper.Web.csproj
index 36dffd6..6d35f2a 100644
--- a/src/ImageMapper.Web/ImageMapper.Web.csproj
+++ b/src/ImageMapper.Web/ImageMapper.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

From a1083d27bbda6c5e2cf8c33c234424dced980a16 Mon Sep 17 00:00:00 2001
From: Tim Moore <tim.moore@ae35.co.uk>
Date: Thu, 13 Nov 2025 16:04:54 +0000
Subject: [PATCH 2/3] Update GitHub Action to .NET 10

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 686f377..2ad5953 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Restore dependencies
       run: dotnet restore

From 6bc21e5796504099e1ddc63bc9edce22524047de Mon Sep 17 00:00:00 2001
From: Tim Moore <tim.moore@ae35.co.uk>
Date: Thu, 13 Nov 2025 16:05:34 +0000
Subject: [PATCH 3/3] Update Aspire to 13

---
 src/ImageMapper.AppHost/ImageMapper.AppHost.csproj | 5 ++---
 src/ImageMapper.Tests/ImageMapper.Tests.csproj     | 4 ++--
 src/ImageMapper.Web/ImageMapper.Web.csproj         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj b/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
index 3dcf2a2..0775447 100644
--- a/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
+++ b/src/ImageMapper.AppHost/ImageMapper.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,8 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
-    <PackageReference Include="Aspire.Hosting.Redis" Version="9.5.2" />
+      <PackageReference Include="Aspire.Hosting.Redis" Version="13.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageMapper.Tests/ImageMapper.Tests.csproj b/src/ImageMapper.Tests/ImageMapper.Tests.csproj
index 84206ab..7af7997 100644
--- a/src/ImageMapper.Tests/ImageMapper.Tests.csproj
+++ b/src/ImageMapper.Tests/ImageMapper.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.Testing" Version="9.5.2" />
+    <PackageReference Include="Aspire.Hosting.Testing" Version="13.0.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NUnit" Version="4.4.0" />
diff --git a/src/ImageMapper.Web/ImageMapper.Web.csproj b/src/ImageMapper.Web/ImageMapper.Web.csproj
index 6d35f2a..0cdaeee 100644
--- a/src/ImageMapper.Web/ImageMapper.Web.csproj
+++ b/src/ImageMapper.Web/ImageMapper.Web.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
     
   <ItemGroup>
-    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.5.2" />
+    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="13.0.0" />
     <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
   </ItemGroup>