From 3f0a57114d2165a93c66e09b0f2ed0faacb90137 Mon Sep 17 00:00:00 2001
From: Serge K <cmt@phnx47.net>
Date: Sun, 23 Nov 2025 18:05:33 +0700
Subject: [PATCH 1/5] Remove net6.0 target framework

---
 src/Prometheus.Client.DependencyInjection.csproj         | 4 +---
 tests/Prometheus.Client.DependencyInjection.Tests.csproj | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Prometheus.Client.DependencyInjection.csproj b/src/Prometheus.Client.DependencyInjection.csproj
index 4713d29..f4d10fc 100644
--- a/src/Prometheus.Client.DependencyInjection.csproj
+++ b/src/Prometheus.Client.DependencyInjection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
     <Description>Dependency Injection extensions for Prometheus.Client</Description>
     <RepositoryUrl>https://github.com/prom-client-net/prom-client-dependencyinjection</RepositoryUrl>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -9,8 +9,6 @@
     <PackageReference Include="Prometheus.Client" Version="6.1.0" />
     <PackageReference Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0'"
                       Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'"
-                      Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Condition="'$(TargetFramework)' == 'net8.0'"
                       Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
   </ItemGroup>
diff --git a/tests/Prometheus.Client.DependencyInjection.Tests.csproj b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
index 54ffc74..de2462d 100644
--- a/tests/Prometheus.Client.DependencyInjection.Tests.csproj
+++ b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>

From 332f29b4b8d0a70e0fd1e1c4f2a80cb4a6102a1e Mon Sep 17 00:00:00 2001
From: Serge K <cmt@phnx47.net>
Date: Sun, 23 Nov 2025 18:07:11 +0700
Subject: [PATCH 2/5] Bump Microsoft.NET.Test.Sdk to 18.0.1

---
 tests/Prometheus.Client.DependencyInjection.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Prometheus.Client.DependencyInjection.Tests.csproj b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
index de2462d..24796c1 100644
--- a/tests/Prometheus.Client.DependencyInjection.Tests.csproj
+++ b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
@@ -6,7 +6,7 @@
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
       <PrivateAssets>all</PrivateAssets>

From 091846fa80ffad0392d1a486c18c73375d658a10 Mon Sep 17 00:00:00 2001
From: Serge K <cmt@phnx47.net>
Date: Sun, 23 Nov 2025 18:25:49 +0700
Subject: [PATCH 3/5] Use xunit.v3 for modern .NET

---
 ...us.Client.DependencyInjection.Tests.csproj | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/Prometheus.Client.DependencyInjection.Tests.csproj b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
index 24796c1..d8f96ed 100644
--- a/tests/Prometheus.Client.DependencyInjection.Tests.csproj
+++ b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
@@ -7,11 +7,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -22,6 +17,20 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="xunit.v3" Version="3.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Prometheus.Client.DependencyInjection.csproj" />
   </ItemGroup>

From 668ecbe4df54c34bc5a12033b79fc3e897ee5103 Mon Sep 17 00:00:00 2001
From: Serge K <cmt@phnx47.net>
Date: Sun, 23 Nov 2025 18:29:45 +0700
Subject: [PATCH 4/5] Add net10.0 target framework

---
 src/Prometheus.Client.DependencyInjection.csproj         | 4 +++-
 tests/Prometheus.Client.DependencyInjection.Tests.csproj | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Prometheus.Client.DependencyInjection.csproj b/src/Prometheus.Client.DependencyInjection.csproj
index f4d10fc..03a0e1f 100644
--- a/src/Prometheus.Client.DependencyInjection.csproj
+++ b/src/Prometheus.Client.DependencyInjection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net8.0;net10.0</TargetFrameworks>
     <Description>Dependency Injection extensions for Prometheus.Client</Description>
     <RepositoryUrl>https://github.com/prom-client-net/prom-client-dependencyinjection</RepositoryUrl>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -11,5 +11,7 @@
                       Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
     <PackageReference Condition="'$(TargetFramework)' == 'net8.0'"
                       Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net10.0'"
+                      Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
   </ItemGroup>
 </Project>
diff --git a/tests/Prometheus.Client.DependencyInjection.Tests.csproj b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
index d8f96ed..46707f0 100644
--- a/tests/Prometheus.Client.DependencyInjection.Tests.csproj
+++ b/tests/Prometheus.Client.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net8.0;net10.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="xunit" Version="2.9.3" />

From 52debbff2b33f0ad6d7c918dc3a255e8ed8b1d5f Mon Sep 17 00:00:00 2001
From: Serge K <cmt@phnx47.net>
Date: Sun, 23 Nov 2025 18:42:52 +0700
Subject: [PATCH 5/5] Add .NET 10.0.x to workflows

---
 .github/workflows/build-win.yml | 1 +
 .github/workflows/build.yml     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
index 7529b6b..7998d80 100644
--- a/.github/workflows/build-win.yml
+++ b/.github/workflows/build-win.yml
@@ -23,6 +23,7 @@ jobs:
           dotnet-version: |
             6.0.x
             8.0.x
+            10.0.x
 
       - name: Run tests
         run: dotnet test -c Release -p:CollectCoverage=false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3eb1e0f..267ef49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
           dotnet-version: |
             6.0.x
             8.0.x
+            10.0.x
 
       - name: Build
         run: dotnet build -c Release