From 14f0fa71cd8d9ea7904e518d0750fa379e5ea97a Mon Sep 17 00:00:00 2001
From: David Federman <david.federman@outlook.com>
Date: Wed, 30 Oct 2024 12:05:18 -0700
Subject: [PATCH] Revert "Migrate test projects to MSTest.Sdk (#99)"

This reverts commit cca3dae1a462f143a68513faff9183a94c9c5274.
---
 Directory.Packages.props                                    | 1 +
 global.json                                                 | 5 -----
 src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj | 3 ++-
 src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj | 5 +++--
 4 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 global.json

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 09a58eb..25f974f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -29,6 +29,7 @@
     <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
deleted file mode 100644
index eebcd46..0000000
--- a/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "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 d376764..98a64f8 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="MSTest.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
@@ -11,6 +11,7 @@
     <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 33fbef8..ed74e09 100644
--- a/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
+++ b/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="MSTest.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
-    <Platforms>$(Platform)</Platforms>
+    <Platforms>AnyCPU;x64</Platforms>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <RootNamespace>Microsoft.MSBuildCache.Repack.Tests</RootNamespace>
     <!-- Suppress "Avoid constant arrays as arguments". UTs have many one-off test data arrays. -->
@@ -11,6 +11,7 @@
     <NoWarn>$(NoWarn);CA1034</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="MSTest" />
     <PackageReference Include="morelinq" />
   </ItemGroup>
   <ItemGroup>