From 265fd4773e7055fe6c35dfe0b12aa44c1ff022e8 Mon Sep 17 00:00:00 2001
From: Arnaud Leclerc <aleclerc1@gmail.com>
Date: Tue, 10 Mar 2026 16:33:11 +0100
Subject: [PATCH] Upgrade projects to supported .NET versions (net8.0, net9.0,
 net10.0)

- Drop net6.0 (EOL Nov 2024) and net7.0 (EOL May 2024)
- Add net9.0 and net10.0 target frameworks to library and test projects
- Update sample project to target net10.0
- Add per-TFM package references for net9.0 and net10.0
- Upgrade bunit from 1.26.64 to 1.37.7 for .NET 9/10 compatibility
- Update all CI workflows to set up .NET 8.0, 9.0, and 10.0 SDKs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/build.yml                   | 12 +++++------
 .github/workflows/code-coverage.yml           | 12 +++++------
 .github/workflows/release.yml                 | 16 ++++++---------
 .github/workflows/unit-tests.yml              | 12 +++++------
 .../AzureMapsControl.Sample.csproj            |  2 +-
 .../AzureMapsControl.Components.csproj        | 20 +++++++++----------
 .../AzureMapsControl.Components.Tests.csproj  |  4 ++--
 7 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b8adb68..40dce13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,18 +21,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6.0
+    - name: Setup .NET 8.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET 7.0
+        dotnet-version: 8.0.x
+    - name: Setup .NET 9.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
-    - name: Setup .NET 8.0
+        dotnet-version: 9.0.x
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
     - name: Build
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index 123dac1..28a7edd 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -27,18 +27,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6.0
+    - name: Setup .NET 8.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET 7.0
+        dotnet-version: 8.0.x
+    - name: Setup .NET 9.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
-    - name: Setup .NET 8.0
+        dotnet-version: 9.0.x
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
     - name: Build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b794892..842b048 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,22 +20,18 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET 7.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
     - name: Setup .NET 8.0
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 8.0.x
-    - name: Setup .NET Core 3.1
+    - name: Setup .NET 9.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 9.0.x
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 10.0.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.11
       with:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 678e17e..97f57a9 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -26,18 +26,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6.0
+    - name: Setup .NET 8.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET 7.0
+        dotnet-version: 8.0.x
+    - name: Setup .NET 9.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
-    - name: Setup .NET 8.0
+        dotnet-version: 9.0.x
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
     - name: Build
diff --git a/samples/AzureMapsControl.Sample/AzureMapsControl.Sample.csproj b/samples/AzureMapsControl.Sample/AzureMapsControl.Sample.csproj
index 8768bb9..182c9e5 100644
--- a/samples/AzureMapsControl.Sample/AzureMapsControl.Sample.csproj
+++ b/samples/AzureMapsControl.Sample/AzureMapsControl.Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj b/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
index 13850d4..ae0e999 100644
--- a/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
+++ b/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Authors>Arnaud Leclerc</Authors>
     <Company />
@@ -37,19 +37,19 @@
     <None Include="tsconfig.json" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj b/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj
index d5c783e..cfa3b33 100644
--- a/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj
+++ b/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.26.64" />
+    <PackageReference Include="bunit" Version="1.37.7" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.6.3" />