From 1f2d8fb3f19d0ae20f56fe08a3278d6b0fbadb97 Mon Sep 17 00:00:00 2001
From: stan-sz <37585349+stan-sz@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:20:22 +0200
Subject: [PATCH 1/2] Use MSTest.SDK

https://aka.ms/mstest/sdk
---
 Directory.Packages.props                                    | 1 -
 global.json                                                 | 5 +++++
 src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj | 3 +--
 src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj | 3 +--
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 global.json

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 25f974f..09a58eb 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -29,7 +29,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Services.BlobStore.Client" Version="$(ArtifactsPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Services.BlobStore.Client.Cache" Version="$(ArtifactsPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Services.PipelineCache.WebApi" Version="$(ArtifactsPackageVersion)" />
-    <PackageVersion Include="MSTest" Version="3.5.0" />
     <!--
       An indirect dependency of BXL (Minimatch) depends on a very old and non-existing version of NETStandard.Library (>= 1.0.0-rc2-23910).
       This forces a good version of NETStandard.Library to mitigate.
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..d4a075c
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "MSTest.Sdk": "3.6.1"
+  }
+}
\ No newline at end of file
diff --git a/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj b/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
index 98a64f8..d376764 100644
--- a/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
+++ b/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
@@ -11,7 +11,6 @@
     <NoWarn>$(NoWarn);CA1034</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest" />
     <PackageReference Include="morelinq" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj b/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
index ed74e09..b95d649 100644
--- a/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
+++ b/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
@@ -11,7 +11,6 @@
     <NoWarn>$(NoWarn);CA1034</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest" />
     <PackageReference Include="morelinq" />
   </ItemGroup>
   <ItemGroup>

From 139edc706329ef9ae31b9ee2280175cad41ab7c8 Mon Sep 17 00:00:00 2001
From: stan-sz <37585349+stan-sz@users.noreply.github.com>
Date: Tue, 26 Nov 2024 09:26:28 +0100
Subject: [PATCH 2/2] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index d4a075c..9c122c6 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.6.1"
+    "MSTest.Sdk": "3.6.3"
   }
-}
\ No newline at end of file
+}