From 127e8581ce9d52c36401f6c72aa4cd99bc380151 Mon Sep 17 00:00:00 2001
From: "Andrew Petrochuk (from Dev Box)" <anpetroc@microsoft.com>
Date: Sun, 28 Jan 2024 18:12:55 -0800
Subject: [PATCH] Run tests in CI

---
 .github/workflows/CI.yml                       |  6 ++++++
 src/PAModel/packages.lock.json                 | 10 +++++-----
 src/PAModelTests/PAModelTests.csproj           |  7 ++++---
 src/Persistence.Tests/Persistence.Tests.csproj |  8 ++++----
 src/Versions.props                             |  5 +++--
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c40d525e..325ab763 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -38,6 +38,12 @@ jobs:
       shell: cmd
       if: ${{ runner.os == 'Windows' }}
 
+    - name: Test - Persistence
+      run: bin/Debug/Persistence.Tests/Persistence.Tests.exe
+
+    - name: Test - PAModel
+      run: bin/Debug/PAModelTests/PAModelTests.exe
+
       ## Only difference here is not forcing cmd
     - name: Build and test (!win)
       run: ./build ci
diff --git a/src/PAModel/packages.lock.json b/src/PAModel/packages.lock.json
index ae72a3de..e8310562 100644
--- a/src/PAModel/packages.lock.json
+++ b/src/PAModel/packages.lock.json
@@ -5,8 +5,8 @@
       "Newtonsoft.Json": {
         "type": "Direct",
         "requested": "[13.0.1, )",
-        "resolved": "13.0.3",
-        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+        "resolved": "13.0.1",
+        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
       "System.Text.Encodings.Web": {
         "type": "Direct",
@@ -20,8 +20,8 @@
       "System.Text.Json": {
         "type": "Direct",
         "requested": "[6.0.0, )",
-        "resolved": "6.0.9",
-        "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==",
+        "resolved": "6.0.0",
+        "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "6.0.0",
           "System.Text.Encodings.Web": "6.0.0"
@@ -119,4 +119,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
index b9525695..e060d228 100644
--- a/src/PAModelTests/PAModelTests.csproj
+++ b/src/PAModelTests/PAModelTests.csproj
@@ -5,14 +5,15 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <PublicSign>true</PublicSign>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest" Version="$(MSTest)" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
diff --git a/src/Persistence.Tests/Persistence.Tests.csproj b/src/Persistence.Tests/Persistence.Tests.csproj
index 494e525e..78360dbe 100644
--- a/src/Persistence.Tests/Persistence.Tests.csproj
+++ b/src/Persistence.Tests/Persistence.Tests.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
+        <EnableMSTestRunner>true</EnableMSTestRunner>
+        <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
         <SignAssembly>false</SignAssembly>
@@ -17,9 +18,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
         <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-        <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+        <PackageReference Include="MSTest" Version="$(MSTest)" />
         <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
         <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     </ItemGroup>
diff --git a/src/Versions.props b/src/Versions.props
index ad84c3d2..5bbeaf71 100644
--- a/src/Versions.props
+++ b/src/Versions.props
@@ -3,8 +3,9 @@
         <TargetFrameworkVersion>net7.0</TargetFrameworkVersion>
         <YamlDotNetVersion>15.1.0</YamlDotNetVersion>
         <MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
-        <MSTestTestAdapterVersion>2.2.10</MSTestTestAdapterVersion>
-        <MSTestTestFrameworkVersion>2.2.10</MSTestTestFrameworkVersion>
+        <MSTestTestAdapterVersion>3.2.0</MSTestTestAdapterVersion>
+        <MSTestTestFrameworkVersion>3.2.0</MSTestTestFrameworkVersion>
+        <MSTest>3.2.0</MSTest>
         <CoverletCollectorVersion>3.2.0</CoverletCollectorVersion>
         <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
         <MinVerVersion>4.3.0</MinVerVersion>