From ad4a5cdfe71490cb4767ec4e7fdf84650805ed92 Mon Sep 17 00:00:00 2001
From: "Shawn Yuan (from Dev Box)" <shuaiyuan@microsoft.com>
Date: Wed, 11 Feb 2026 14:54:03 +0800
Subject: [PATCH] fix compiling issue

---
 src/common/UITestAutomation/ScreenRecording.cs           | 2 +-
 src/common/UITestAutomation/UITestAutomation.csproj      | 3 +++
 .../ext/SamplePagesExtension/SamplePagesExtension.csproj | 9 +++++----
 .../MonacoPreviewHandler/MonacoPreviewHandler.csproj     | 7 +++++++
 .../SvgPreviewHandler/SvgPreviewHandler.csproj           | 7 +++++++
 .../Preview.SvgPreviewHandler.UnitTests.csproj           | 6 ++++++
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/common/UITestAutomation/ScreenRecording.cs b/src/common/UITestAutomation/ScreenRecording.cs
index 57e844936d..efd7a2b62d 100644
--- a/src/common/UITestAutomation/ScreenRecording.cs
+++ b/src/common/UITestAutomation/ScreenRecording.cs
@@ -216,7 +216,7 @@ namespace Microsoft.PowerToys.UITest
             Rectangle bounds = new Rectangle(0, 0, screenWidth, screenHeight);
             using (Bitmap bitmap = new Bitmap(bounds.Width, bounds.Height, PixelFormat.Format24bppRgb))
             {
-                using (Graphics g = Graphics.FromImage(bitmap))
+                using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
                 {
                     g.CopyFromScreen(bounds.Location, Point.Empty, bounds.Size);
 
diff --git a/src/common/UITestAutomation/UITestAutomation.csproj b/src/common/UITestAutomation/UITestAutomation.csproj
index b4e8831a98..2da1ee398e 100644
--- a/src/common/UITestAutomation/UITestAutomation.csproj
+++ b/src/common/UITestAutomation/UITestAutomation.csproj
@@ -12,6 +12,8 @@
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
+    <!-- Suppress code analysis warnings for test library -->
+    <NoWarn>$(NoWarn);CA1305;CA1310;CA2101</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,6 +22,7 @@
     <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
+    <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj b/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
index b9a8acc29d..f0fd46bea2 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
@@ -62,11 +62,12 @@
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
 
-  <!-- Only enable Native AOT for Release builds to avoid System.Private.CoreLib.dll version conflicts during development -->
+  <!-- Temporarily disable Native AOT until C++ Desktop Development workload is installed -->
+  <!-- TODO: Re-enable after installing Desktop Development for C++ in Visual Studio -->
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishAot>true</PublishAot>
+    <PublishTrimmed>false</PublishTrimmed>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishAot>false</PublishAot>
   </PropertyGroup>
 
   <!-- For Debug builds, use standard JIT compilation -->
diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj
index adc89ae1f6..84002ab103 100644
--- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj
+++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj
@@ -3,6 +3,13 @@
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
   <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
 
+  <!-- Force WebView2 to use Win32/WinForms mode instead of WinRT mode -->
+  <!-- Required because Settings.UI.Library has UseWinUI=true which triggers WebView2UseWinRT -->
+  <PropertyGroup>
+    <WebView2UseWinRT>false</WebView2UseWinRT>
+    <WebView2EnableCsWinRTProjection>false</WebView2EnableCsWinRTProjection>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
index 40ff418d99..7a4ff68bd3 100644
--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
@@ -3,6 +3,13 @@
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
   <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
 
+  <!-- Force WebView2 to use Win32/WinForms mode instead of WinRT mode -->
+  <!-- Required because Settings.UI.Library has UseWinUI=true which triggers WebView2UseWinRT -->
+  <PropertyGroup>
+    <WebView2UseWinRT>false</WebView2UseWinRT>
+    <WebView2EnableCsWinRTProjection>false</WebView2EnableCsWinRTProjection>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj
index ba5997925f..64d0150b9d 100644
--- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj
+++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj
@@ -2,6 +2,12 @@
   <!-- Look at Directory.Build.props in root for common stuff as well -->
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
+  <!-- Force WebView2 to use Win32/WinForms mode for unit tests -->
+  <PropertyGroup>
+    <WebView2UseWinRT>false</WebView2UseWinRT>
+    <WebView2EnableCsWinRTProjection>false</WebView2EnableCsWinRTProjection>
+  </PropertyGroup>
+
   <PropertyGroup>
     <AssemblyTitle>UnitTests-SvgPreviewHandler</AssemblyTitle>
     <AssemblyDescription>PowerToys UnitTests-SvgPreviewHandler</AssemblyDescription>