From 827e7fc9c36b19efb66743089fd522a8ddbbab56 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 27 Nov 2024 20:26:16 +0100
Subject: [PATCH 1/3] Use MSTest.Sdk

---
 global.json                                        | 3 +++
 src/PAModelTests/PAModelTests.csproj               | 6 +-----
 src/Persistence.Tests/Persistence.Tests.csproj     | 6 +-----
 src/Versions.props                                 | 4 ----
 src/YamlValidator.Tests/YamlValidator.Tests.csproj | 7 ++-----
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/global.json b/global.json
index 7900c220..554f4ede 100644
--- a/global.json
+++ b/global.json
@@ -2,5 +2,8 @@
   "sdk": {
     "version": "8.0.0",
     "rollForward": "latestMinor"
+  },
+  "msbuild-sdks": {
+    "MSTest.Sdk": "3.6.3"
   }
 }
diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
index e060d228..dad27661 100644
--- a/src/PAModelTests/PAModelTests.csproj
+++ b/src/PAModelTests/PAModelTests.csproj
@@ -1,7 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <PublicSign>true</PublicSign>
@@ -12,15 +11,12 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <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>
 
   <ItemGroup Label="Global usings">
     <Using Include="FluentAssertions" />
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Persistence.Tests/Persistence.Tests.csproj b/src/Persistence.Tests/Persistence.Tests.csproj
index 215bc194..dc189cd0 100644
--- a/src/Persistence.Tests/Persistence.Tests.csproj
+++ b/src/Persistence.Tests/Persistence.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <PropertyGroup>
         <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
@@ -6,7 +6,6 @@
         <Nullable>enable</Nullable>
         <EnableMSTestRunner>true</EnableMSTestRunner>
         <OutputType>Exe</OutputType>
-        <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
 
         <SignAssembly>true</SignAssembly>
@@ -28,8 +27,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-        <PackageReference Include="MSTest" Version="$(MSTest)" />
         <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
         <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
         <PackageReference Include="Moq" Version="$(MoqVersion)" />
@@ -37,7 +34,6 @@
 
     <ItemGroup Label="Global usings">
         <Using Include="FluentAssertions" />
-        <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
         <Using Include="Persistence.Tests.Extensions" />
         <Using Include="Microsoft.Extensions.DependencyInjection" />
     </ItemGroup>
diff --git a/src/Versions.props b/src/Versions.props
index 1b4a289b..a552e84f 100644
--- a/src/Versions.props
+++ b/src/Versions.props
@@ -2,10 +2,6 @@
     <PropertyGroup>
         <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
         <YamlDotNetVersion>15.1.6</YamlDotNetVersion>
-        <MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
-        <MSTestTestAdapterVersion>3.2.2</MSTestTestAdapterVersion>
-        <MSTestTestFrameworkVersion>3.2.2</MSTestTestFrameworkVersion>
-        <MSTest>3.2.2</MSTest>
         <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
         <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
         <MinVerVersion>4.3.0</MinVerVersion>
diff --git a/src/YamlValidator.Tests/YamlValidator.Tests.csproj b/src/YamlValidator.Tests/YamlValidator.Tests.csproj
index 5cab08d7..77a21bd2 100644
--- a/src/YamlValidator.Tests/YamlValidator.Tests.csproj
+++ b/src/YamlValidator.Tests/YamlValidator.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -6,12 +6,12 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <PublicSign>true</PublicSign>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,13 +21,10 @@
   </ItemGroup>
 
   <ItemGroup>
-     <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-     <PackageReference Include="MSTest" Version="$(MSTest)" />
      <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
   </ItemGroup>
 
   <ItemGroup Label="Global usings">
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
     <Using Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 

From 382b52a2b5b9a7f4bf05a3d825f31657ceb4f291 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 27 Nov 2024 20:33:45 +0100
Subject: [PATCH 2/3] Update STJ to get rid of vulnerability warning

---
 src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj b/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
index 213c4f39..a5b1964c 100644
--- a/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
+++ b/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
@@ -54,7 +54,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="[13.0.1,)" />
-    <PackageReference Include="System.Text.Json" Version="[6.0,)" />
+    <PackageReference Include="System.Text.Json" Version="6.0.10" />
     <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>

From 7f35931286623008e1f4c2e5e51f22954e4c9eaf Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 27 Nov 2024 21:15:01 +0100
Subject: [PATCH 3/3] Fix build

---
 src/PAModelTests/AppTestsTest.cs                            | 1 -
 src/PAModelTests/ChecksumTests.cs                           | 1 -
 src/PAModelTests/DataSourceTests.cs                         | 2 --
 src/PAModelTests/DefaultValuesTransformTests.cs             | 1 -
 src/PAModelTests/EditorStateTests.cs                        | 1 -
 src/PAModelTests/EntropyTests.cs                            | 1 -
 src/PAModelTests/ErrorTests.cs                              | 1 -
 src/PAModelTests/GroupControlRecreationTest.cs              | 2 --
 src/PAModelTests/NameCollisionTests.cs                      | 2 --
 src/PAModelTests/PAModelTests.csproj                        | 1 +
 src/PAModelTests/PublicSurfaceTests.cs                      | 1 -
 src/PAModelTests/ReadTransformTests.cs                      | 1 -
 src/PAModelTests/RoundtripTests.cs                          | 2 --
 src/PAModelTests/SmartMergeTests.cs                         | 2 --
 src/PAModelTests/SourceDecoderTests.cs                      | 1 -
 src/PAModelTests/TemplateParserTests.cs                     | 1 -
 src/PAModelTests/TemplateStoreTests.cs                      | 2 --
 src/PAModelTests/UtilityTests.cs                            | 1 -
 src/PAModelTests/WriteTransformTests.cs                     | 2 --
 src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs | 1 -
 src/PAModelTests/YamlTest.cs                                | 1 -
 21 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/PAModelTests/AppTestsTest.cs b/src/PAModelTests/AppTestsTest.cs
index 523ca9a8..85201421 100644
--- a/src/PAModelTests/AppTestsTest.cs
+++ b/src/PAModelTests/AppTestsTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/ChecksumTests.cs b/src/PAModelTests/ChecksumTests.cs
index b0ec7e91..c4277872 100644
--- a/src/PAModelTests/ChecksumTests.cs
+++ b/src/PAModelTests/ChecksumTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using System.Reflection;
 using System.Text;
 using Microsoft.PowerPlatform.Formulas.Tools;
diff --git a/src/PAModelTests/DataSourceTests.cs b/src/PAModelTests/DataSourceTests.cs
index e22f8783..7a5f5b16 100644
--- a/src/PAModelTests/DataSourceTests.cs
+++ b/src/PAModelTests/DataSourceTests.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Data;
-using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Extensions;
diff --git a/src/PAModelTests/DefaultValuesTransformTests.cs b/src/PAModelTests/DefaultValuesTransformTests.cs
index 05eb263d..46fb2a81 100644
--- a/src/PAModelTests/DefaultValuesTransformTests.cs
+++ b/src/PAModelTests/DefaultValuesTransformTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
diff --git a/src/PAModelTests/EditorStateTests.cs b/src/PAModelTests/EditorStateTests.cs
index 56934f19..8f58b0bb 100644
--- a/src/PAModelTests/EditorStateTests.cs
+++ b/src/PAModelTests/EditorStateTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
diff --git a/src/PAModelTests/EntropyTests.cs b/src/PAModelTests/EntropyTests.cs
index e9097ef0..f5a35d5c 100644
--- a/src/PAModelTests/EntropyTests.cs
+++ b/src/PAModelTests/EntropyTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/ErrorTests.cs b/src/PAModelTests/ErrorTests.cs
index f37d38e6..1ff564d3 100644
--- a/src/PAModelTests/ErrorTests.cs
+++ b/src/PAModelTests/ErrorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/GroupControlRecreationTest.cs b/src/PAModelTests/GroupControlRecreationTest.cs
index e4650873..c430ea82 100644
--- a/src/PAModelTests/GroupControlRecreationTest.cs
+++ b/src/PAModelTests/GroupControlRecreationTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
 
diff --git a/src/PAModelTests/NameCollisionTests.cs b/src/PAModelTests/NameCollisionTests.cs
index e6246eb8..729b95a3 100644
--- a/src/PAModelTests/NameCollisionTests.cs
+++ b/src/PAModelTests/NameCollisionTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
index dad27661..c440969a 100644
--- a/src/PAModelTests/PAModelTests.csproj
+++ b/src/PAModelTests/PAModelTests.csproj
@@ -6,6 +6,7 @@
     <PublicSign>true</PublicSign>
     <EnableMSTestRunner>true</EnableMSTestRunner>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/PAModelTests/PublicSurfaceTests.cs b/src/PAModelTests/PublicSurfaceTests.cs
index 3abf4851..ad368b16 100644
--- a/src/PAModelTests/PublicSurfaceTests.cs
+++ b/src/PAModelTests/PublicSurfaceTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Linq;
 using System.Text;
 using Microsoft.PowerPlatform.Formulas.Tools;
 
diff --git a/src/PAModelTests/ReadTransformTests.cs b/src/PAModelTests/ReadTransformTests.cs
index ceff8c14..126ae083 100644
--- a/src/PAModelTests/ReadTransformTests.cs
+++ b/src/PAModelTests/ReadTransformTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
diff --git a/src/PAModelTests/RoundtripTests.cs b/src/PAModelTests/RoundtripTests.cs
index 297f0df7..0ef963d8 100644
--- a/src/PAModelTests/RoundtripTests.cs
+++ b/src/PAModelTests/RoundtripTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 
 namespace PAModelTests;
diff --git a/src/PAModelTests/SmartMergeTests.cs b/src/PAModelTests/SmartMergeTests.cs
index 019e315e..1dd9aa80 100644
--- a/src/PAModelTests/SmartMergeTests.cs
+++ b/src/PAModelTests/SmartMergeTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
diff --git a/src/PAModelTests/SourceDecoderTests.cs b/src/PAModelTests/SourceDecoderTests.cs
index 4ac35f28..63b5ca55 100644
--- a/src/PAModelTests/SourceDecoderTests.cs
+++ b/src/PAModelTests/SourceDecoderTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
diff --git a/src/PAModelTests/TemplateParserTests.cs b/src/PAModelTests/TemplateParserTests.cs
index 6471ec3d..789cc2db 100644
--- a/src/PAModelTests/TemplateParserTests.cs
+++ b/src/PAModelTests/TemplateParserTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.AppMagic.Authoring.Persistence;
 using Microsoft.PowerPlatform.Formulas.Tools.ControlTemplates;
 using Microsoft.PowerPlatform.Formulas.Tools.EditorState;
diff --git a/src/PAModelTests/TemplateStoreTests.cs b/src/PAModelTests/TemplateStoreTests.cs
index b7be16db..138a7d1f 100644
--- a/src/PAModelTests/TemplateStoreTests.cs
+++ b/src/PAModelTests/TemplateStoreTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.IR;
diff --git a/src/PAModelTests/UtilityTests.cs b/src/PAModelTests/UtilityTests.cs
index 77bd6d31..0c3ddcf9 100644
--- a/src/PAModelTests/UtilityTests.cs
+++ b/src/PAModelTests/UtilityTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 
 namespace PAModelTests;
diff --git a/src/PAModelTests/WriteTransformTests.cs b/src/PAModelTests/WriteTransformTests.cs
index 88c62b8c..319238e2 100644
--- a/src/PAModelTests/WriteTransformTests.cs
+++ b/src/PAModelTests/WriteTransformTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
-using System.Linq;
 using Microsoft.PowerPlatform.Formulas.Tools;
 using Microsoft.PowerPlatform.Formulas.Tools.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Schemas;
diff --git a/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs b/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
index 1debc79a..6996028c 100644
--- a/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
+++ b/src/PAModelTests/YamlSerializerTests/YamlSerializerTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Yaml;
 
 namespace PAModelTests.YamlSerializerTests;
diff --git a/src/PAModelTests/YamlTest.cs b/src/PAModelTests/YamlTest.cs
index eaf9b290..f5ac542f 100644
--- a/src/PAModelTests/YamlTest.cs
+++ b/src/PAModelTests/YamlTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.IO;
 using Microsoft.PowerPlatform.Formulas.Tools.Yaml;
 using YamlDotNet.Serialization;