From 77a6788fe3214da383783b920e9525bb42f4a9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Wed, 15 Jan 2025 10:54:49 +0100
Subject: [PATCH 1/2] Drop package ref to System.Memory

---
 Directory.Packages.props                                      | 4 ++++
 .../MSTestAdapter.PlatformServices.UnitTests.csproj           | 3 +--
 .../MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj    | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 048c85c94a..243b4ff284 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -78,8 +78,12 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+<<<<<<< HEAD
     <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="System.Memory" Version="4.6.0" />
+=======
+    <PackageVersion Include="System.Management" Version="9.0.1" />
+>>>>>>> Drop package ref to System.Memory
   </ItemGroup>
   <!--
     Declare below packages that we will be referenced through MSTest.Sdk but don't have direct reference.
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
index 404e5c61dc..5d06169a6b 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
@@ -39,9 +39,8 @@
   <ItemGroup>
     <PackageReference Include="Moq" />
     <PackageReference Include="StrongNamer" />
-    <PackageReference Include="System.Memory" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Content Include="DataTestSourceFile.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
index 39f86c94d3..41e859407b 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
@@ -31,7 +31,6 @@
   <ItemGroup>
     <PackageReference Include="Moq" />
     <PackageReference Include="StrongNamer" />
-    <PackageReference Include="System.Memory" />
   </ItemGroup>
 
 </Project>

From 043a3bd08b22283408cb8bb37f09be2a19b9874c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Wed, 15 Jan 2025 11:12:00 +0100
Subject: [PATCH 2/2] Update Directory.Packages.props

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
---
 Directory.Packages.props | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 243b4ff284..a22ceb49e6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -78,12 +78,7 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-<<<<<<< HEAD
     <PackageVersion Include="System.Management" Version="9.0.0" />
-    <PackageVersion Include="System.Memory" Version="4.6.0" />
-=======
-    <PackageVersion Include="System.Management" Version="9.0.1" />
->>>>>>> Drop package ref to System.Memory
   </ItemGroup>
   <!--
     Declare below packages that we will be referenced through MSTest.Sdk but don't have direct reference.