From f346e8ffb400f7d7dc2d84dea925d40faed6caba Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 20 Aug 2026 21:18:03 +1000
Subject: [PATCH] Update test packages for VSTest compatibility

Upgrade the shared test package versions and disable Microsoft.Testing.Platform for test projects so `dotnet test` continues to use VSTest, which is required for coverlet coverage and works across SDK versions.
---
 msbuild/props/SixLabors.Tests.props | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/msbuild/props/SixLabors.Tests.props b/msbuild/props/SixLabors.Tests.props
index 3b01238..da5f89a 100644
--- a/msbuild/props/SixLabors.Tests.props
+++ b/msbuild/props/SixLabors.Tests.props
@@ -9,22 +9,33 @@
     <CodeAnalysisRuleSet Condition="'$(CodeAnalysisRuleSet)' == ''">$(MSBuildThisFileDirectory)..\..\sixlabors.tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
+  <!--
+    We run tests with VSTest because coverlet code coverage works only with VSTest.
+    xunit.v3 4.x enables Microsoft.Testing.Platform for test projects by default.
+    When Microsoft.Testing.Platform is enabled, 'dotnet test' fails on the .NET 10 SDK.
+    This property disables Microsoft.Testing.Platform, so 'dotnet test' runs with VSTest
+    on all SDK versions.
+  -->
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+    <IsTestingPlatformApplication Condition="'$(IsTestingPlatformApplication)' == ''">false</IsTestingPlatformApplication>
+  </PropertyGroup>
+
   <!-- Package references and additional files which are consumed by test projects -->
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
-    <PackageReference Include="xunit.v3" Version="3.2.2" IsImplicitlyDefined="true" />
+    <PackageReference Include="xunit.v3" Version="4.0.0" IsImplicitlyDefined="true" />
 
     <PackageReference Include="coverlet.collector"
-                      Version="6.0.0"
+                      Version="10.0.1"
                       PrivateAssets="All"
                       IsImplicitlyDefined="true"
                       Condition="'$(IsCodeCoverage)'=='true'"/>
 
     <PackageReference Include="Microsoft.NET.Test.Sdk"
-                      Version="17.12.0"
+                      Version="18.9.0"
                       IsImplicitlyDefined="true"/>
 
     <PackageReference Include="xunit.runner.visualstudio"
-                      Version="3.1.5"
+                      Version="4.0.0"
                       IsImplicitlyDefined="true" />
 
     <Using Include="Xunit" Condition="'$(ImplicitUsings)'=='enable' OR '$(ImplicitUsings)'=='true'"/>