From badb029bcfb6a3dd8f9890ead6334a71011986b4 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Mon, 14 Apr 2025 17:01:37 +0000
Subject: [PATCH] Upgrading some of the Testing framework items (#38779)

* starting to get some of the baseline

* Update NOTICE.md

* Upgrading streamjson gets the others on same version of newtonsoft.json

* Update PowerToys.Settings.csproj

* Update NOTICE.md
---
 Directory.Packages.props                             | 10 +++++-----
 NOTICE.md                                            | 12 ++++++------
 .../Programs/Win32Program.cs                         |  2 +-
 .../Settings.UI/PowerToys.Settings.csproj            |  2 ++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index f4cfe643e9..12909c4be4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -29,7 +29,7 @@
     <PackageVersion Include="Mages" Version="3.0.0" />
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageVersion Include="MessagePack" Version="2.5.187" />
+    <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
@@ -61,7 +61,7 @@
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.6.3" />
+    <PackageVersion Include="MSTest" Version="3.8.3" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -69,7 +69,7 @@
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="System.CodeDom" Version="9.0.4" />
@@ -84,8 +84,8 @@
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
-    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
+    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
     <PackageVersion Include="System.Management" Version="9.0.4" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
diff --git a/NOTICE.md b/NOTICE.md
index 15693c9590..f11a2b2259 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1393,7 +1393,6 @@ SOFTWARE.
 
 ## NuGet Packages used by PowerToys
 
-
 - AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
 - AdaptiveCards.Rendering.WinUI3 2.1.0-beta
 - AdaptiveCards.Templating 2.0.2
@@ -1419,7 +1418,7 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
-- MessagePack 2.5.187
+- MessagePack 3.1.3
 - Microsoft.Bcl.AsyncInterfaces 9.0.4
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
 - Microsoft.Data.Sqlite 9.0.4
@@ -1445,14 +1444,14 @@ SOFTWARE.
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
-- MSTest 3.6.3
+- MSTest 3.8.3
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - OpenAI 2.0.0
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
-- StreamJsonRpc 2.19.27
+- StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
 - System.CodeDom 9.0.4
 - System.CommandLine 2.0.0-beta4.22272.1
@@ -1463,8 +1462,8 @@ SOFTWARE.
 - System.Diagnostics.EventLog 9.0.4
 - System.Diagnostics.PerformanceCounter 9.0.4
 - System.Drawing.Common 9.0.4
-- System.IO.Abstractions 21.0.29
-- System.IO.Abstractions.TestingHelpers 21.0.29
+- System.IO.Abstractions 22.0.13
+- System.IO.Abstractions.TestingHelpers 22.0.13
 - System.Management 9.0.4
 - System.Reactive 6.0.1
 - System.Runtime.Caching 9.0.4
@@ -1477,3 +1476,4 @@ SOFTWARE.
 - WinUIEx 2.2.0
 - WPF-UI 3.0.5
 - WyHash 1.0.5
+
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs
index 56fd4d894d..4169a5769b 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs
@@ -82,7 +82,7 @@ namespace Microsoft.Plugin.Program.Programs
         public ApplicationType AppType { get; set; }
 
         // Wrappers for File Operations
-        public static IFileVersionInfoWrapper FileVersionInfoWrapper { get; set; } = new FileVersionInfoWrapper();
+        public static IFileVersionInfoWrapper FileVersionInfoWrapper { get; set; } = new Wox.Infrastructure.FileSystemHelper.FileVersionInfoWrapper();
 
         public static IFile FileWrapper { get; set; } = new FileSystem().File;
 
diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
index 9d71b62de7..5a69d8beea 100644
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -75,6 +75,8 @@
     <PackageReference Include="Microsoft.Web.WebView2" />
     <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
     <PackageReference Include="CommunityToolkit.Common" />
+    <!-- HACK: MWB and Advanced Paste. Align the version.  got flagged when https://github.com/microsoft/PowerToys/pull/38779 was done -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
   <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging