From 156d86d6a642cdae50a722e5d4bcd6cb9bd715ed Mon Sep 17 00:00:00 2001
From: Kashif Soofi <kashif.soofi+git@gmail.com>
Date: Fri, 8 Aug 2025 15:22:12 +0100
Subject: [PATCH] #1042: Use MSTest.Sdk

---
 .gitignore                                                   | 1 -
 properties/GirCore.Testing.props                             | 3 ---
 .../DiagnosticAnalyzerTestProject.csproj                     | 2 +-
 src/Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj  | 2 +-
 src/Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj        | 2 +-
 src/Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj          | 2 +-
 .../GObject-2.0.Integration.Tests.csproj                     | 4 ++--
 src/Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj    | 2 +-
 src/Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj            | 2 +-
 src/Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj    | 2 +-
 src/Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj            | 4 ++--
 src/Tests/Shared/PlatformConditionAttribute.cs               | 2 +-
 src/global.json                                              | 5 +++++
 13 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 src/global.json

diff --git a/.gitignore b/.gitignore
index 36e78c9ef..f7760c557 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 **/Generated/*
 
 #.vscode/
-global.json
 coverage.*
 *.Generated.cs
 
diff --git a/properties/GirCore.Testing.props b/properties/GirCore.Testing.props
index 448bdbd85..5f1a96051 100644
--- a/properties/GirCore.Testing.props
+++ b/properties/GirCore.Testing.props
@@ -6,9 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Tests/Data/DiagnosticAnalyzerTestProject/DiagnosticAnalyzerTestProject.csproj b/src/Tests/Data/DiagnosticAnalyzerTestProject/DiagnosticAnalyzerTestProject.csproj
index 4fbfb54cd..0729de3d0 100644
--- a/src/Tests/Data/DiagnosticAnalyzerTestProject/DiagnosticAnalyzerTestProject.csproj
+++ b/src/Tests/Data/DiagnosticAnalyzerTestProject/DiagnosticAnalyzerTestProject.csproj
@@ -8,7 +8,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
-        
+
         <RootNamespace>DiagnosticAnalyzerTestProject</RootNamespace>
     </PropertyGroup>
 
diff --git a/src/Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj b/src/Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj
index 76386f65d..2c31e8798 100644
--- a/src/Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj
+++ b/src/Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
diff --git a/src/Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj b/src/Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj
index e3980d152..9449ffe88 100644
--- a/src/Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj
+++ b/src/Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>Cairo.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/src/Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj b/src/Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj
index e4ad2d6ab..8f61dc30e 100644
--- a/src/Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj
+++ b/src/Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>GLib.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/src/Tests/Libs/GObject-2.0.Integration.Tests/GObject-2.0.Integration.Tests.csproj b/src/Tests/Libs/GObject-2.0.Integration.Tests/GObject-2.0.Integration.Tests.csproj
index 7db60b76d..6215b621e 100644
--- a/src/Tests/Libs/GObject-2.0.Integration.Tests/GObject-2.0.Integration.Tests.csproj
+++ b/src/Tests/Libs/GObject-2.0.Integration.Tests/GObject-2.0.Integration.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>GObject.Integration.Tests</RootNamespace>
   </PropertyGroup>
@@ -6,7 +6,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Extensions\GObject-2.0.Integration\GObject-2.0.Integration.csproj" />
     <ProjectReference Include="..\..\Data\DiagnosticAnalyzerTestProject\DiagnosticAnalyzerTestProject.csproj" />
-    
+
     <PackageReference Include="Buildalyzer" Version="7.1.0" />
     <PackageReference Include="Buildalyzer.Workspaces" Version="7.1.0" />
   </ItemGroup>
diff --git a/src/Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj b/src/Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj
index 83a927093..ccdab22c1 100644
--- a/src/Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj
+++ b/src/Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>GObject.Tests</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj b/src/Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj
index dfc8232f9..c550a4203 100644
--- a/src/Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj
+++ b/src/Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>Gio.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/src/Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj b/src/Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj
index 9dad3b991..bdee2e3a2 100644
--- a/src/Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj
+++ b/src/Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>GirTest.Tests</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj b/src/Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj
index c7b675287..929e14d84 100644
--- a/src/Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj
+++ b/src/Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <RootNamespace>Gtk.Tests</RootNamespace>
   </PropertyGroup>
@@ -8,7 +8,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\Libs\Gtk-4.0\Gtk-4.0.csproj" />
   </ItemGroup>
diff --git a/src/Tests/Shared/PlatformConditionAttribute.cs b/src/Tests/Shared/PlatformConditionAttribute.cs
index c36fa5b58..ed3850b44 100644
--- a/src/Tests/Shared/PlatformConditionAttribute.cs
+++ b/src/Tests/Shared/PlatformConditionAttribute.cs
@@ -76,7 +76,7 @@ public override bool ShouldRun
         }
     }
 
-    public override string IgnoreMessage { get; }
+    public override string? IgnoreMessage { get; set; }
 
     public override string GroupName => nameof(PlatformConditionAttribute);
 }
diff --git a/src/global.json b/src/global.json
new file mode 100644
index 000000000..099e3b022
--- /dev/null
+++ b/src/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "MSTest.Sdk": "3.10.1"
+  }
+}