From a1f7c97c5933bf99f1af30a4e520cee1ba3475e2 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <48363984+kythant@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:52:36 -0700
Subject: [PATCH] Revert "The Test App for Microsoft.Windows.Storage.Pickers
 (#6195)"

This reverts commit 6c48c726d3e0e33b7782bc4ce2b9c70a64ba4919.
---
 WindowsAppRuntime.sln                         |  27 -
 test/TestApps/StoragePickersTestApp/App.xaml  |  16 -
 .../StoragePickersTestApp/App.xaml.cpp        |  42 -
 .../TestApps/StoragePickersTestApp/App.xaml.h |  19 -
 .../Assets/LockScreenLogo.scale-200.png       | Bin 432 -> 0 bytes
 .../Assets/SplashScreen.scale-200.png         | Bin 5372 -> 0 bytes
 .../Assets/Square150x150Logo.scale-200.png    | Bin 1755 -> 0 bytes
 .../Assets/Square44x44Logo.scale-200.png      | Bin 637 -> 0 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 283 -> 0 bytes
 .../Assets/StoreLogo.png                      | Bin 456 -> 0 bytes
 .../Assets/Wide310x150Logo.scale-200.png      | Bin 2097 -> 0 bytes
 .../Directory.Build.props                     |  10 -
 .../Directory.Build.targets                   |   8 -
 .../StoragePickersTestApp/MainWindow.idl      |  11 -
 .../StoragePickersTestApp/MainWindow.xaml     | 271 ------
 .../StoragePickersTestApp/MainWindow.xaml.cpp | 797 ------------------
 .../StoragePickersTestApp/MainWindow.xaml.h   |  65 --
 .../Package.appxmanifest                      |  51 --
 .../StoragePickersTestApp.exe.manifest        |  29 -
 .../StoragePickersTestApp.vcxproj             | 285 -------
 .../StoragePickersTestApp.vcxproj.filters     |  59 --
 .../StoragePickersTestApp/app.manifest        |  16 -
 test/TestApps/StoragePickersTestApp/main.cpp  |  21 -
 .../StoragePickersTestApp/packages.config     |   8 -
 test/TestApps/StoragePickersTestApp/pch.cpp   |   4 -
 test/TestApps/StoragePickersTestApp/pch.h     |  37 -
 26 files changed, 1776 deletions(-)
 delete mode 100644 test/TestApps/StoragePickersTestApp/App.xaml
 delete mode 100644 test/TestApps/StoragePickersTestApp/App.xaml.cpp
 delete mode 100644 test/TestApps/StoragePickersTestApp/App.xaml.h
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/LockScreenLogo.scale-200.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/SplashScreen.scale-200.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/Square150x150Logo.scale-200.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.scale-200.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/StoreLogo.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Assets/Wide310x150Logo.scale-200.png
 delete mode 100644 test/TestApps/StoragePickersTestApp/Directory.Build.props
 delete mode 100644 test/TestApps/StoragePickersTestApp/Directory.Build.targets
 delete mode 100644 test/TestApps/StoragePickersTestApp/MainWindow.idl
 delete mode 100644 test/TestApps/StoragePickersTestApp/MainWindow.xaml
 delete mode 100644 test/TestApps/StoragePickersTestApp/MainWindow.xaml.cpp
 delete mode 100644 test/TestApps/StoragePickersTestApp/MainWindow.xaml.h
 delete mode 100644 test/TestApps/StoragePickersTestApp/Package.appxmanifest
 delete mode 100644 test/TestApps/StoragePickersTestApp/StoragePickersTestApp.exe.manifest
 delete mode 100644 test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj
 delete mode 100644 test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj.filters
 delete mode 100644 test/TestApps/StoragePickersTestApp/app.manifest
 delete mode 100644 test/TestApps/StoragePickersTestApp/main.cpp
 delete mode 100644 test/TestApps/StoragePickersTestApp/packages.config
 delete mode 100644 test/TestApps/StoragePickersTestApp/pch.cpp
 delete mode 100644 test/TestApps/StoragePickersTestApp/pch.h

diff --git a/WindowsAppRuntime.sln b/WindowsAppRuntime.sln
index 30cd8eb7d5..d36b1388a6 100644
--- a/WindowsAppRuntime.sln
+++ b/WindowsAppRuntime.sln
@@ -755,8 +755,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntim
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntime.Test.SingletonLowerVersion", "test\Deployment\data\WindowsAppRuntime.Test.SingletonLowerVersion\WindowsAppRuntime.Test.SingletonLowerVersion.vcxproj", "{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StoragePickersTestApp", "test\TestApps\StoragePickersTestApp\StoragePickersTestApp.vcxproj", "{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2667,30 +2665,6 @@ Global
 		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x64.Build.0 = Release|x64
 		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.ActiveCfg = Release|Win32
 		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.Build.0 = Release|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.Build.0 = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.ActiveCfg = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.Build.0 = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.Deploy.0 = Debug|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.ActiveCfg = Debug|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.Build.0 = Debug|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.Deploy.0 = Debug|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.ActiveCfg = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.Build.0 = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.Deploy.0 = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.Build.0 = Release|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.Deploy.0 = Release|ARM64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.ActiveCfg = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.Build.0 = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.Deploy.0 = Release|x64
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.ActiveCfg = Release|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.Build.0 = Release|Win32
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2919,7 +2893,6 @@ Global
 		{06AA7FD7-36BE-41AC-9008-56919D1612C6} = {3B706C5C-55E0-4B76-BF59-89E20FE46795}
 		{462CF10A-E6B5-4005-8E25-132D1DE589B7} = {2B653A15-2482-40E5-9509-C531E69D0749}
 		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D} = {2B653A15-2482-40E5-9509-C531E69D0749}
-		{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
diff --git a/test/TestApps/StoragePickersTestApp/App.xaml b/test/TestApps/StoragePickersTestApp/App.xaml
deleted file mode 100644
index 400df8963b..0000000000
--- a/test/TestApps/StoragePickersTestApp/App.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Application
-    x:Class="StoragePickersTestApp.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:StoragePickersTestApp">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
-            </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/test/TestApps/StoragePickersTestApp/App.xaml.cpp b/test/TestApps/StoragePickersTestApp/App.xaml.cpp
deleted file mode 100644
index 6c5316458a..0000000000
--- a/test/TestApps/StoragePickersTestApp/App.xaml.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "App.xaml.h"
-#include "MainWindow.xaml.h"
-
-#include <winrt/Microsoft.UI.Windowing.h>
-#include <winrt/Windows.Graphics.h>
-
-using namespace winrt;
-using namespace Microsoft::UI::Xaml;
-
-namespace winrt::StoragePickersTestApp::implementation
-{
-    App::App()
-    {
-#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
-        UnhandledException([](IInspectable const&, UnhandledExceptionEventArgs const& e)
-        {
-            if (IsDebuggerPresent())
-            {
-                auto errorMessage = e.Message();
-                __debugbreak();
-            }
-        });
-#endif
-    }
-
-    void App::OnLaunched([[maybe_unused]] LaunchActivatedEventArgs const& e)
-    {
-        window = make<MainWindow>();
-        window.as<MainWindow>()->InitializeDefaults();
-
-        if (auto appWindow = window.AppWindow())
-        {
-            appWindow.Resize(winrt::Windows::Graphics::SizeInt32{ 1800, 1220 });
-        }
-
-        window.Activate();
-    }
-}
diff --git a/test/TestApps/StoragePickersTestApp/App.xaml.h b/test/TestApps/StoragePickersTestApp/App.xaml.h
deleted file mode 100644
index b8ddc37cb9..0000000000
--- a/test/TestApps/StoragePickersTestApp/App.xaml.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "App.xaml.g.h"
-
-namespace winrt::StoragePickersTestApp::implementation
-{
-    struct App : AppT<App>
-    {
-        App();
-
-        void OnLaunched(Microsoft::UI::Xaml::LaunchActivatedEventArgs const&);
-
-    private:
-        winrt::Microsoft::UI::Xaml::Window window{ nullptr };
-    };
-}
diff --git a/test/TestApps/StoragePickersTestApp/Assets/LockScreenLogo.scale-200.png b/test/TestApps/StoragePickersTestApp/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 7440f0d4bf7c7e26e4e36328738c68e624ee851e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FqV6|IEGZ*x-#9g>~Mkr+x6^F
zy~CDX2QIMs&Gcs3RnRBoxBA!*(Mfw0KTCYuYk0Wl<A3kFdDp`#?}XI|oqqQ0*|D%p
zsa`i8jb+)Z4OKr{E6gsxDCoZ^_q1W^M*Wx^PHB+~V!M-K=X6~WvlcB>EIV>qBmPl!
zq4ukrvfADX@#p8fbLY(H47N+k`FZ(FZh?cDro7>{8mkBO3>^oaIx`3!Jl)Qq)HI!+
z(S=1{o~eT)&W^=Ea8C`-17(Jv5(nHFJ{dOjGdxLVkY_y6&S1whfuFI4MM0kF0f&cO
zPDVpV%nz;Id$>+0Ga5e9625-JcI)oq=#Pa3p^>8BB}21BUw@eN!-6@w%X+^`+Vn?!
zryu|3T>kVWNBYyBc=7Y6H#s1<v*REmr-J?Jj+807siAL#J{jLg-rpk>Ah!OI_nezW
zXTqOdkv2Az6KKBV=$yHdF^R3Fqw(TZEoNSZX>reXJ#bwX42%f|Pgg&ebxsLQ010xn
AssI20

diff --git a/test/TestApps/StoragePickersTestApp/Assets/SplashScreen.scale-200.png b/test/TestApps/StoragePickersTestApp/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 32f486a86792a5e34cd9a8261b394c49b48f86be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5372
zcmd5=Z){Ul6u)iv53sCbIJKLzl(EF%0tzcEY@|pLrfgF~2Dk$KFtU+$kbYqDN5W%7
z>?DBo!@y06eh{Oux>brrNT^{MO(tkiC@nH(2}}G_1|uvcMD(0{?|W<a-a0~n*biHG
zf9L+rIlpu6dH1dP^~%NC@%r(E5N-Jq%bSFxTp~ohA|nk}Ixf~6BxLgGa?65cn<BBx
z(>^Gxo!tG~hW2Rn&7%b`-Kd_^`BCrb>XVtRKONoEw6%NswzMxk+kbocuk&}kJ#hSP
z>8uR{r%LJ?I#)aaWW;uEixz+DzyTp<n+AXFpi3#HQI?o(f|bH{g{8;N$n#--6#`ON
z8Y9NX&lrr4ess~}tsYJpA3mcgo#b_dR&Q+}f$h#K8$()bySabmT)V0fe4SsBn?`JT
zqRz#ih7J|{6av`ud?~|$-xZb;Y?)QU(in_^{=cV@zO#`s-@utQs=lVkPT#EV8Pt(=
z)rrH6b+Hq-7L!Y!vgbYjJVQ>p)MTEo&R%nEA92~g{^eXQwKV1m{xl5K<@k3FacT+Z
zrwfy=VocIptI>t%@p5a;Rt=WXVnU;2SUdr7Yk>gw_2z_ICK^23$|Cg7{3Eg5j@N*F
zetT?>30(*S_7ld-Yt&u7<vX3R{>T{(hEjjM#vPlXibjrq?;pBBx3*>_2~VFGdsH5L
zQKme_LAe<h!eZii1Fy3}l)!Aw9wE!2W(SGt2^7)bZFX=;4PF(jK}m&RONz@*d&8J(
z@Ti#Hn-$E`<z{9LBNl>bV}aOX#+rQafZtp+4jK}V!>pn1?+eUH$0%6}z(Kul9!^2z
zXi+d@jnx)RW7!j9uFEdv5N&1sCW#Z6Ej5Y7<kmvx;UKV>c;o28Q7i%U0(2v5J>o9P
zl$#C8&9r)nL;?J65^GIeSOHYr3B7}}R~}@2Tx_xo5<y?a$o$OKo{{+tbGWrUXN#$;
zSWI6_TQOb|VI7K0g?BlOxm<Xc1J+m>*YdU#g1bO}95cq69J!efdlE+x<zPjYI5xf;
z4<bjLgW^$k_B;!UVem9<T^K7uBVPzrt<OycX30S>j1qG#ZUqh~1Sn#dBsZfDvcupM
zXOFoyJ0$s+RHQKpzr#T>c&EUbq)lGvZDxuI!9unMI=#;ob2&gT)WqOjt6<h5H@jmL
zN!k>^X`_N21r`&eh6h0xpT!n6Z9rvE&+bF<pl_}u09Bp1E3nzHi4)99$2L1qAW9P`
z02W44*epsivm8XGK7?|knC#L?V(_*PgF_!n65L*&#cbguS8=NNcv#tldy*doaBnj3
z9WfY8n1#CJm0?9!KfQ9`!hF!{2rArnK5~8PpWTsfeC;Y?z6SLTG{!DON~Uh8d(z0B
zk_OKw^9C)@aoA1Pp2hGD`_EZX%gDQm-Mm^MZYA7H2398nYpr*W4tay@l>U$vTJO2?
z#^tBNOx*2N)~(+TH8d>ep6``8V=3JEfdUUahVZ-xN+k#V&32x|%qnX(XBii5<@`%^
zV#Ky4f1!6RJqJXBU3M4~tmj2;;r`8_j&w?h5g35uMH(QI$Xpe<SoDfuyBvJ$AWs6K
z6zg=ID-g$VpJuH=3<<;&{JVg6CeE#{VqQ)i3=pm|43N08<5$`WT7dCf(JjIzJh>sb
zG|*XRT?kh6M(jj0Y&vF^M*9g-iDMW%G%9%Pa}6ERQ9b0%6z1v}Ja=|L@G#5ZI>JS9
z*(K12nMvS?oyG8s9|q~{w`ajtI`KSHSiJ;)%X@M&eCE(VqI#F(XL?L@A$TUT?6av5
zkPWIR391XjSC%d6L}7F71Qpw(;c_~)mSZo-&Fm^FHlPX|Fu}1B3E+9j0}o1a(4HFS
zUItE22CC%XZi!b4%~vWn>rpV9&CUEvt!?Q{Pr*L~51&(0Sz{VJJFrJtWw2PwXd|J{
zgH%3vAY$flodH=4&ruCHX;(3t;o}n?!0~3EE|5qRz$!VIkphxa4@_jyfiE9<B@ip?
z)JovR1W?*3um<3*q6-Zsm{E?ROduKC3|v9dEPGw}5LGFvN0rp@as&5IxNxF!c>m;0
zjcYJ2;26N&MTB8X4joZ&?SUe|VS$^I%dt{!c2O;%3SdqW@K_14r8eyC1s&VcU5+2~
z_O1Cc*w|aIA=VC6AT_EFoL}W#Rl;7CZe)e}RS*e;8CVyM6i8a(yO@|S709VYY(y2g
zc+QxB>Bw^B^2Db~*o)=i$m-aUNQFkYy5(eJW$cez>C{POds*p3cy#tHnvActP;dBP
zdEf)C;lq}&#PE?XCD<~ngrzYUg|nS`#MS`Rd7cT>xlR19P#~4Qg5!J}@glCUq)z_2
zj<XRy%t~Rq!qTH+WUjDx6$5&J82?9%V~F+uSwAX9-8kA;fhtqag;&?-m-?|B<%=pU
Jo|kP+{{fTh%QOH0

diff --git a/test/TestApps/StoragePickersTestApp/Assets/Square150x150Logo.scale-200.png b/test/TestApps/StoragePickersTestApp/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index 53ee3777ea27e31b260014cf4074099874ff933a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1755
zcmZvde@q)?7{{+i3tS0qt7{iJ0{^s_^@sZdMMEaBz#P|xjghsxG)6Bvp>vyv%aSq0
z)njao1dV0XNw&c@qmj1e*jgQ$l@_urW5G4RSY#rT1z`#%3;{EB`aJK|TH^lb_3nAT
z-_Q4X-(K&IS8UyqsnjYdippfmN-HT!X2MT;Dpcy~-#<W6spr^I%Z`I%bK{M*>$k6V
z|M<iW^=g++e@Rx7_LHHnqU2;@`i?tCD}@7f%KSi0pe1~`>R4vU#O&p7TC46pTflb3
zoUJ;ZRf#&8&EwXy5s%!&(q6cN62swD#FH%O-RJsjWPZN3^^@FCIQ&MxXIFo7!I#VI
zkpIstuWqUV5uhgs07?k$*!`uiZ=5b#$lI|0c+XJv<J{p}RUOaNKQ<im@QX7O-EXm%
zZcW#Y{k<Xj`b3r{sN?i*g_&_g1h3pjaUinim|Uz#k6!n{*P)(fetc%Zzt*YppIPkb
zZsrI7$ZjjP2{*TQ)Rl{qr%&KH`*A*c407bjGC(`YTWo?_?9@jM>j(}zSE3MN#EyOK
zql(#yA}~Ibl*r(s1}Z^5mmn*-n93g?-ccM+^PN?6HH~h0hjy6@XY*^i<-V)+OZ;p7
z7j`p_sT55xnYsedNIIel^QIIg7i@`2Qi}x5$!t<wREe9#D@+!fNFxx26>k29$2OQI
zs^kQXAKE}5ZJu$)2@Dxn?}}O@f@6@^!%9Tj+o>=jd!^ZuvBE4jb4g}Z5WMBtcmy^~
zoFGVS5|0FA!(1Q%fL?Bj*L+9ZL<k)9Dx8*ddZZzsW5_{0!wC)<wtN(l?357%26r2H
z)e$Rfj*{dnkRG6kTutOTQgC@J7A}iDXxc^vHXjS@l%c&nv^>{mjSO8lzqrQ0UCZ)X
zPwk$1HNFgaK%NxGpuXz}#ywXvf2JQ?BQ5uOZM2up4S#ieaxS$<UJ>!o9o6<b*PRMe
zw2N}mUfxcbWj4{^_PX_)#THTdzfHx$q43G!7i`-0rv|IVjoNMZ?s})oX>Z=czNQb}
zwAh|xLZ>+WyN%o?^uCAQw&&4o?S$DJ`WP(Hr*grL*qNXlqU0osCQ(Up<yn-Y+UUBH
z0`~|C21=1cK(XdDQ&fpwMc`nfH~_za8nMvP_<v3_Cm2%+xmlLs@U08}yC|SVtuf?a
zLlnGjh0&5BVK|8+M~tFDgR?Lk+<}n5F-|E}GV5KkJ@<Jy+C)_l2)JQFTPN%#u<<5B
zxPSy;gG2(fZvqUoAprgg&;|koNCXG~f;64RuX7>5F(^$Z5;n&oJIO4uF`k&QL*j{f
zU=;#MZ5{@b%qMbjTB3dh-5#mqY><S4qcBmkQW*|18RL|}ppv?cijSrWPC^)2g5{Tu
zT0W#@oVoK%XJ|$oIjS&T`!v+Nezc|NwrKchuXB25ZNFe2+%-J5#HIKRux*I`4`57B
zQ0dHlb#ISPztmwXuXHRwcyab3<L}+G@K@Q;cQ31~kA4Gu{(I}M7xUNx6YKkaZ}wGk
s29I{~!hlCRd13tTX`du`*!lx~{^^p-x%)@fz)Oo_H*YQdqL>%{0jgS+WdHyG

diff --git a/test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.scale-200.png b/test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index f713bba67f551ef91020b75716a4dc8ebd744b1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8kjIJFu8cTIEGZ*dUI*J;2{SImxtDO
zm%3!R$UazoY}x{$j0P5ABYXWr(l=jxJ6ps1W{tV=^>{Dl><3nv3A}sm=EZ)#l3`NR
zpZda3^rNox*D1%NC98Z~L*6zipLw~Gxn&(Y-;KmJ+aR6eLabU-L#y8HW%7P<VMos8
zqX*Kbh`RaZ-Vu7P$7Xg$t7p!w9mNuLWx4O|3Z&Q;DexQ@4z03gU_T+dV)?TB4XaLx
zKHv%Qc0OMANu|zE*>-E_-<YK1`Q@gsru}A0v3eK#yt;t5sDM}IiBJqP`%aeY2ORYd
znig=vgoGzD?qE|>VlLqIabbHPHKT*)fT@9iWJ7iWgOT9%0}Lrj>lztPxWq6sPw3pi
z#-<=#$jjrP_DD*i!RLsn0mIA=><W)5lpnuqp4YHjx%_x(aT1U|479<C?V*%JOU*Sg
z#_I<Zo_I#HfQ-%GC$U@ez*0u_CX-g5eG;<;W<|4PbM4IJzI;b1;`rIJXmOF0#Dc%g
zZLbuBxUL^m=x+0N7USD){mHGN{Xv<#-5>4~N)IMYWIf=j%-zuKCdMG%tHYot70D1|
zvWa0wMhauW#S>1CnI_;>!1Q3zMA17@DOVq{MQ+{U7^a&yA+%dMCG;WNPV0i;w$tu;
zX^b}UKziPM)(<;)ruW;-`)bBN+rQNM*Zs_>?n$|FVFo-e*PZb*@U7VAd+tHb4e<vm
d2N?b27$xG?o#1Ly5CkSG22WQ%mvv4FO#oV^_;~;T

diff --git a/test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/test/TestApps/StoragePickersTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index dc9f5bea0c3b191b5e9e13e92fcb488a8a766bd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002uNkl<Zc-pm;
z$63TM6bA9G*Xc}XfD+UJ=|T=ys-PH76hMXs+<+P&S3!<LhDZG6)%(7=&RDjelDe*Y
zVonR9P71Gc1N(5+&{@F%lu&&PoInMO-~;6j)?f@)>?=Blc~}S6K)wL}r*Gf`BM#QB
z+y>N$mCswb4d{^{<t89R6uAiq5i9?54}{1(JkAEp8F^U1M0O#83GgwliUjUs+(iyH
zU;-wUJ!uK@Iq>S9v_!eQj4fTRMOwOCi?lSk9%<=vAz}jM-*PQtH@Odn1LZcd^j#o>
hW$4xn+CT+ep9lJ{OAO?njobhL002ovPDHLkV1nYebbkN<

diff --git a/test/TestApps/StoragePickersTestApp/Assets/StoreLogo.png b/test/TestApps/StoragePickersTestApp/Assets/StoreLogo.png
deleted file mode 100644
index a4586f26bdf7841cad10f39cdffe2aca3af252c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 456
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fF!p=8IEGZ*dUM0H=rDtTTVkd2
z(%lbKn@VS_lUaADVB&;Z6F#LM+mPsa?e>FnHo;HND^!P`-lX%BH~FOg%y&x+t*x!?
zg$#_1A1kgsSvO(fw`bOmo;lrJX<ItGX8p^+)vNqf=Q|piE^xcD$ZJ36qIG6c9Wn9W
zgiF^fyRvIlz4DPIUZ0)bU14fm$xyiFTenPIFjFvNlH=XI+>8byO1j^gf7qohR%mmt
z@L)WX;>gqgK|tWJvQ5j;4;=gt4HXVKSMYRv5RhY5vS~TqfK_NAP*r{h!!g^BZ;w4r
z7CGdsai)y<gGsuj!2jo4dH!kJEjuUGJ5jrV^^fTM+?I6=Vq5$l{O<YKaqNHux6=a&
zZkGiT+-?aH-R=fh@nb<l3GD`pLjs}+YZ#IQokJQ7861;$eO|ZgF2kZz#SEEoCmzcz
z2tM$>;fJQc`7{Zc2b==h%o`Op$|bg6a&nL{*m7-=0>k4M4-PXlU;G-?%*(*g>iFt^
U$m#7DfHB12>FVdQ&MBb@0G`#n8vp<R

diff --git a/test/TestApps/StoragePickersTestApp/Assets/Wide310x150Logo.scale-200.png b/test/TestApps/StoragePickersTestApp/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 8b4a5d0dd5f6c6ab408e1edf04a07888859a9eab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2097
zcmc&$ZA@EL7(Q+3r2+3&!t4k)FxZ4;Vj0QoMdu<_3Kciz7YR4=A(qT^w)Jxi;?x!9
zuyq6dMF?b>c0sq%A~kJcD9FY~qQRMt?ZR3YyDZt}Od;|mgpc{2dv9AHF){kXU%k({
z=Y8JidEayHTkG@twPZ|U3_^%3ct-OgLSiFAqDN!|tbCX@c@?4P`2x*TMK!+Q4b?k0
ziW7!!KF6dPWcF<%I|iznM~`QJ_V7sHGV_D`dhgpA9Vd@&X}ErK+j~_rdv;Bp?OA@a
zFXOk7eWOJe5NcK;6h$FaM<R8n2&If8B!^r8(M2K*Wi$uP6%uY2h7c5jIOy*=@GeaG
zk2zK+7IduRP}>&7JxNc#-@QTwzW6x#d_z<n*&H+f#4hRlvzx*`m}NokI(>mQNkz5)
zPI;kh;3d;5UCJU+9a(cOxX(|edWoOiAEdGU#kPJ&xnc2||3vDbuhBCkj-pb0as$Zl
z5;}4n=**n6(1g`JEtSy;SG6X;#-F~Oz3lESG2b5`j<s|Qk9||T+vZq0?LoR=o9C9a
zyR%`V_x2UfL94qBs88m)Qdw|qBL@>@wAwY4Yp<=4Xeb>iH=6aicF?DxD&q{`!&}ct
zBI)aycwuobQAf&678Uf+Mmh-@9RUhyH~>?w0dixO0#jZjEc9R^=5NZw=|a(kcB?9^
zfnTiEFXp-q#B;Tn>(O%$A*ud^Rg&eVH6Y_5Y%!E39RR&s?XpG`gKwU!6<ah5%>FE1
z7X)DC7)*(5g}lh`4`{i~DZcWupZI`K)_4P)VE{@gc7@Xsd^86zl~_mOYH?I4!aGeX
z^E(_=L6?PgveDQ+r%P@UISEXrkn`LHJZ##+!-anV>6h)Ik<DtItE{23QQzKv`Y4^v
z8=ZLL+Z^FB*^&Mzi<UM}f$ETGCC%@es^mN<bJoD1diHUjr;FVL=e5QYT)8(ruH3ox
zkOXdF(#8wbdn$2F#5!fF57(5PI)h1c%A7SYSn6N-MGrA%=E%9A)svHNrOgZCgbcRn
z-X~*U=P_DW+2T?W$~2<(Btuu9C2$3fow=WhZKQFd-2p!Mzrc7CIFL1}yqGz_a8Pcr
zIbuP-Go6>Kp;E@p8+3&(5%kS2)ld*J*rJccZM0iyaAx7+F~GW1UWFK&3X$PE1^}NH
zgAG9ck5<?(B)~qL97!mF)l<VKz}JwKV}X!OlArx6Y&~U))tQoP!Ph^k(v*}fFBO?%
zsjN)rZCn|(9m<XQu5IUjRaiLZ0*m5-LhHhp&tSo_amEO6e5w~R{(;|-xFiDQslh}n
z+|1<SfCv~8MVRaL_>K!{07OwU@j@Do>TbH=CDEo#4m0cEyAuXy_<&jlzJVcKweSJ5
z&=q~iIn18$w8yb=rmEmHxVEUA^?RwnB?6Qlp1os8@*dWTGL2bhzZ!s*xqScR?EPL`
zo(JwNdKUUYy7GtvZ3asXm)cgFvCx9EmAi;|w=a0iGiv%%VYKh`P0Wma4y`Xyx|T~(
zAmfGbgbEEC7)j8b@WA@+5W3a61HJXC1dX@6_T|Czk0I0zBk%tnW~()VWITGI!`$c<
gARL?UBrYYkwoDw4eo*CrzXGTrZ@;GF>596)00d&n@&Et;

diff --git a/test/TestApps/StoragePickersTestApp/Directory.Build.props b/test/TestApps/StoragePickersTestApp/Directory.Build.props
deleted file mode 100644
index d68fb6cd6c..0000000000
--- a/test/TestApps/StoragePickersTestApp/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
-<!-- 
-  This file stops MSBuild from searching for and importing parent Directory.Build.props files.
-  This is necessary because the WindowsAppSDK repo's build system conflicts with consuming 
-  the shipped WindowsAppSDK NuGet package that this WinUI test app requires.
--->
-<Project>
-  <!-- Empty file - stops inheritance from parent Directory.Build.props -->
-</Project>
diff --git a/test/TestApps/StoragePickersTestApp/Directory.Build.targets b/test/TestApps/StoragePickersTestApp/Directory.Build.targets
deleted file mode 100644
index 69059f309f..0000000000
--- a/test/TestApps/StoragePickersTestApp/Directory.Build.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
-<!-- 
-  This file stops MSBuild from searching for and importing parent Directory.Build.targets files.
--->
-<Project>
-  <!-- Empty file - stops inheritance from parent Directory.Build.targets -->
-</Project>
diff --git a/test/TestApps/StoragePickersTestApp/MainWindow.idl b/test/TestApps/StoragePickersTestApp/MainWindow.idl
deleted file mode 100644
index bf53253266..0000000000
--- a/test/TestApps/StoragePickersTestApp/MainWindow.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-namespace StoragePickersTestApp
-{
-    [default_interface]
-    runtimeclass MainWindow : Microsoft.UI.Xaml.Window
-    {
-        MainWindow();
-    }
-}
diff --git a/test/TestApps/StoragePickersTestApp/MainWindow.xaml b/test/TestApps/StoragePickersTestApp/MainWindow.xaml
deleted file mode 100644
index 8e211b041c..0000000000
--- a/test/TestApps/StoragePickersTestApp/MainWindow.xaml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
-<Window
-    x:Class="StoragePickersTestApp.MainWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:StoragePickersTestApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Title="Storage Pickers Test App">
-
-    <Grid Padding="12">
-        <Grid.Resources>
-            <!-- Shared style for new API option checkboxes -->
-            <Style x:Key="NewApiCheckBoxStyle" TargetType="CheckBox">
-                <Setter Property="Padding" Value="4"/>
-                <Setter Property="ContentTemplate">
-                    <Setter.Value>
-                        <DataTemplate>
-                            <Border Background="#b9e1f1" Padding="4" CornerRadius="4">
-                                <TextBlock Text="{Binding}"/>
-                            </Border>
-                        </DataTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-        </Grid.Resources>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-
-        <!-- Left Column: Controls and Tabs -->
-        <Grid Grid.Column="0" RowSpacing="12">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
-            <!-- Header and Shared Controls -->
-            <StackPanel Grid.Row="0" Spacing="8" BorderThickness="0,0,0,1" BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" Padding="0,0,0,12">
-                <TextBlock Text="Storage Pickers Test App" FontSize="24" FontWeight="Bold" Margin="0,0,0,8"/>
-                
-                <TextBlock Text="Shared Attributes (all pickers)" FontWeight="SemiBold" Margin="0,12,0,0"/>
-                
-                <Grid ColumnSpacing="16">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <!-- SuggestedStartLocation -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Grid.Column="0">
-                        <CheckBox x:Name="SuggestedStartLocationCheckBox" Content="SuggestedStartLocation"/>
-                        <ComboBox x:Name="StartLocationComboBox" SelectedIndex="2" HorizontalAlignment="Stretch">
-                            <ComboBoxItem Content="DocumentsLibrary"/>
-                            <ComboBoxItem Content="ComputerFolder"/>
-                            <ComboBoxItem Content="Desktop"/>
-                            <ComboBoxItem Content="Downloads"/>
-                            <ComboBoxItem Content="HomeGroup (UWP only)"/>
-                            <ComboBoxItem Content="MusicLibrary"/>
-                            <ComboBoxItem Content="PicturesLibrary"/>
-                            <ComboBoxItem Content="VideosLibrary"/>
-                            <ComboBoxItem Content="Objects3D"/>
-                            <ComboBoxItem Content="Unspecified"/>
-                        </ComboBox>
-                    </StackPanel>
-
-                    <!-- SuggestedStartFolder (new API only) -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Grid.Column="1">
-                        <CheckBox x:Name="SuggestedStartFolderCheckBox" Content="SuggestedStartFolder (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                        <TextBox x:Name="SuggestedStartFolderInput" PlaceholderText="Try to this location on first launch after installation" HorizontalAlignment="Stretch"/>
-                    </StackPanel>
-                </Grid>
-
-                <Grid ColumnSpacing="16" Margin="0,8,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <!-- SettingsIdentifier -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Grid.Column="0">
-                        <CheckBox x:Name="SettingsIdCheckBox" Content="SettingsIdentifier"/>
-                        <TextBox x:Name="SettingsIdInput" PlaceholderText="Settings ID" Text="TestSettings1"/>
-                    </StackPanel>
-
-                    <!-- SuggestedFolder (new API only) -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Grid.Column="1">
-                        <CheckBox x:Name="SuggestedFolderCheckBox" Content="SuggestedFolder (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                        <TextBox x:Name="SuggestedFolderInput" PlaceholderText="Always try to open this location" HorizontalAlignment="Stretch"/>
-                    </StackPanel>
-                </Grid>
-                <StackPanel Orientation="Horizontal" Spacing="16">
-                    <!-- Title (new API only) -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Width="200">
-                        <CheckBox x:Name="TitleCheckBox" Content="Title (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                        <TextBox x:Name="TitleInput" PlaceholderText="Picker title" Text="Pick a file"/>
-                    </StackPanel>
-
-                    <!-- CommitButtonText -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Width="200">
-                        <CheckBox x:Name="CommitButtonCheckBox" Content="CommitButtonText"/>
-                        <TextBox x:Name="CommitButtonTextInput" PlaceholderText="Button text" Text="Select"/>
-                    </StackPanel>
-
-                    <!-- ViewMode -->
-                    <StackPanel Orientation="Vertical" Spacing="4" Width="200">
-                        <CheckBox x:Name="ViewModeCheckBox" Content="ViewMode"/>
-                        <ComboBox x:Name="ViewModeComboBox" SelectedIndex="0" HorizontalAlignment="Stretch">
-                            <ComboBoxItem Content="List"/>
-                            <ComboBoxItem Content="Thumbnail"/>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-
-            </StackPanel>
-
-            <!-- Tab View for Picker Types -->
-            <TabView Grid.Row="1" IsAddTabButtonVisible="False" TabWidthMode="Equal">
-                <TabView.TabItems>
-
-                    <!-- FileOpenPicker Tab -->
-                    <TabViewItem Header="FileOpenPicker" IsClosable="False">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="12">
-                            <StackPanel Spacing="12">
-                                <!-- FileTypeFilter -->
-                                <StackPanel Spacing="4">
-                                    <CheckBox x:Name="FileTypeFilterCheckBox" Content="FileTypeFilter" />
-                                    <TextBox x:Name="FileTypeFilterInput" PlaceholderText="e.g., .jpg,.png,.txt" />
-                                </StackPanel>
-
-                                <!-- FileTypeChoices (new API) -->
-                                <StackPanel Spacing="4">
-                                    <CheckBox x:Name="OpenPickerFileTypeChoicesCheckBox" Content="FileTypeChoices (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                                    <TextBox x:Name="OpenPickerFileTypeChoicesInput" 
-                                             PlaceholderText="JSON format"
-                                             TextWrapping="Wrap" Height="50"/>
-                                </StackPanel>
-
-                                <StackPanel Orientation="Horizontal" Spacing="16">
-                                    <!-- InitialFileTypeIndex (new API only) -->
-                                    <StackPanel Spacing="4" Width="300">
-                                        <CheckBox x:Name="OpenInitialFileTypeIndexCheckBox" Content="InitialFileTypeIndex (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                                        <TextBox x:Name="OpenInitialFileTypeIndexInput" Text="0" InputScope="Number"/>
-                                    </StackPanel>
-                                </StackPanel>
-
-                                <StackPanel Orientation="Horizontal" Spacing="16">
-                                    <StackPanel Orientation="Vertical" Spacing="16">
-                                        <TextBlock Text="Pick Single File" FontWeight="SemiBold" Margin="0,8,0,0"/>
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Button Content="UWP Picker" Click="UwpPickSingleFile_Click" Width="150"/>
-                                            <Button Content="New Picker" Click="NewPickSingleFile_Click" Width="150" Style="{ThemeResource AccentButtonStyle}"/>
-                                        </StackPanel>
-                                    </StackPanel>
-
-                                    <!--a vertical line-->
-                                    <Rectangle Width="1" Fill="{ThemeResource DividerStrokeColorDefaultBrush}" Margin="16,0"/>
-
-                                    <StackPanel Orientation="Vertical" Spacing="16">
-                                        <TextBlock Text="Pick Multiple Files" FontWeight="SemiBold" Margin="0,8,0,0"/>
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Button Content="UWP Picker" Click="UwpPickMultipleFiles_Click" Width="150"/>
-                                            <Button Content="New Picker" Click="NewPickMultipleFiles_Click" Width="150" Style="{ThemeResource AccentButtonStyle}"/>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </StackPanel>
-                            </StackPanel>
-                        </ScrollViewer>
-                    </TabViewItem>
-
-                    <!-- FileSavePicker Tab -->
-                    <TabViewItem Header="FileSavePicker" IsClosable="False">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="12">
-                            <StackPanel Spacing="12">
-
-                                <StackPanel Orientation="Horizontal" Spacing="16">
-                                    <!-- SuggestedFileName -->
-                                    <StackPanel Spacing="4" Width="200">
-                                        <CheckBox x:Name="SuggestedFileNameCheckBox" Content="SuggestedFileName" />
-                                        <TextBox x:Name="SuggestedFileNameInput" Text="MyDocument" />
-                                    </StackPanel>
-
-                                    <!-- DefaultFileExtension -->
-                                    <StackPanel Spacing="4" Width="200">
-                                        <CheckBox x:Name="DefaultFileExtensionCheckBox" Content="DefaultFileExtension"/>
-                                        <TextBox x:Name="DefaultFileExtensionInput" Text=".txt"/>
-                                    </StackPanel>
-                                </StackPanel>
-
-                                <!-- FileTypeChoices -->
-                                <StackPanel Spacing="4">
-                                    <CheckBox x:Name="SavePickerFileTypeChoicesCheckBox" Content="FileTypeChoices" />
-                                    <TextBox x:Name="SavePickerFileTypeChoicesInput" 
-                                             PlaceholderText="JSON format"
-                                             TextWrapping="Wrap" Height="50"/>
-                                </StackPanel>
-
-                                <StackPanel Orientation="Horizontal" Spacing="16">
-                                    <!-- InitialFileTypeIndex (new API only) -->
-                                    <StackPanel Spacing="4" Width="300">
-                                        <CheckBox x:Name="SaveInitialFileTypeIndexCheckBox" Content="InitialFileTypeIndex (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                                        <TextBox x:Name="SaveInitialFileTypeIndexInput" Text="0" InputScope="Number"/>
-                                    </StackPanel>
-
-                                    <!-- ShowOverwritePrompt (new API only) -->
-                                    <StackPanel Spacing="4" Width="300">
-                                        <CheckBox x:Name="ShowOverwritePromptCheckBox" Content="ShowOverwritePrompt (new API)" Style="{StaticResource NewApiCheckBoxStyle}"/>
-                                        <ComboBox x:Name="ShowOverwritePromptComboBox" SelectedIndex="0">
-                                            <ComboBoxItem Content="True"/>
-                                            <ComboBoxItem Content="False"/>
-                                        </ComboBox>
-                                    </StackPanel>
-                                </StackPanel>
-
-                                <!-- Test Buttons -->
-                                <TextBlock Text="Pick Save File" FontWeight="SemiBold" Margin="0,8,0,0"/>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button Content="UWP Picker" Click="UwpPickSaveFile_Click" Width="150"/>
-                                    <Button Content="New Picker" Click="NewPickSaveFile_Click" Width="150" Style="{ThemeResource AccentButtonStyle}"/>
-                                </StackPanel>
-                            </StackPanel>
-                        </ScrollViewer>
-                    </TabViewItem>
-
-                    <!-- FolderPicker Tab -->
-                    <TabViewItem Header="FolderPicker" IsClosable="False">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="12">
-                            <StackPanel Spacing="12">
-
-                                <!-- Test Buttons -->
-                                <TextBlock Text="Pick Single Folder" FontWeight="SemiBold" Margin="0,8,0,0"/>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button Content="UWP Picker" Click="UwpPickFolder_Click" Width="150"/>
-                                    <Button Content="New Picker" Click="NewPickFolder_Click" Width="150" Style="{ThemeResource AccentButtonStyle}"/>
-                                </StackPanel>
-
-                                <TextBlock Text="Pick Multiple Folders (new API only)" FontWeight="SemiBold" Margin="0,8,0,0"/>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button Content="New Picker" Click="NewPickMultipleFolders_Click" Width="150" Style="{ThemeResource AccentButtonStyle}"/>
-                                </StackPanel>
-                            </StackPanel>
-                        </ScrollViewer>
-                    </TabViewItem>
-
-                </TabView.TabItems>
-            </TabView>
-        </Grid>
-
-        <!-- Right Column: Results Log -->
-        <Grid Grid.Column="1" Padding="12,0,0,0" RowSpacing="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
-            <StackPanel Orientation="Horizontal" Spacing="8" Grid.Row="0">
-                <TextBlock Text="Results Log" FontSize="20" FontWeight="SemiBold" VerticalAlignment="Center"/>
-                <Button Content="Clear" Click="ClearLog_Click" VerticalAlignment="Center"/>
-            </StackPanel>
-
-            <Border Grid.Row="1" BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4">
-                <ScrollViewer VerticalScrollBarVisibility="Visible" Padding="8">
-                    <TextBlock x:Name="ResultsTextBlock" TextWrapping="Wrap" IsTextSelectionEnabled="True"/>
-                </ScrollViewer>
-            </Border>
-        </Grid>
-    </Grid>
-</Window>
diff --git a/test/TestApps/StoragePickersTestApp/MainWindow.xaml.cpp b/test/TestApps/StoragePickersTestApp/MainWindow.xaml.cpp
deleted file mode 100644
index 4e829d868e..0000000000
--- a/test/TestApps/StoragePickersTestApp/MainWindow.xaml.cpp
+++ /dev/null
@@ -1,797 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "MainWindow.xaml.h"
-#if __has_include("MainWindow.g.cpp")
-#include "MainWindow.g.cpp"
-#endif
-
-#include <microsoft.ui.xaml.window.h>
-
-using namespace winrt;
-using namespace Microsoft::UI::Xaml;
-using namespace winrt::Microsoft::Windows::Storage::Pickers;
-
-namespace winrt::StoragePickersTestApp::implementation
-{
-    // ==========================================================================
-    // Helper Methods
-    // ==========================================================================
-
-    void MainWindow::LogResult(hstring const& message)
-    {
-        // Add timestamp
-        auto now = std::chrono::system_clock::now();
-        auto time = std::chrono::system_clock::to_time_t(now);
-        std::tm localTime;
-        localtime_s(&localTime, &time);
-
-        std::wstringstream timestamp;
-        timestamp << L"[" << std::put_time(&localTime, L"%H:%M:%S") << L"] ";
-
-        hstring currentText = ResultsTextBlock().Text();
-        ResultsTextBlock().Text(timestamp.str() + message + L"\n" + currentText);
-    }
-
-    HWND MainWindow::GetWindowHandle()
-    {
-        HWND hwnd = nullptr;
-        auto windowNative = this->m_inner.as<IWindowNative>();
-        if (windowNative)
-        {
-            check_hresult(windowNative->get_WindowHandle(&hwnd));
-        }
-        return hwnd;
-    }
-
-    winrt::Windows::Storage::Pickers::PickerLocationId MainWindow::GetUwpLocationId()
-    {
-        switch (StartLocationComboBox().SelectedIndex())
-        {
-        case 0: return winrt::Windows::Storage::Pickers::PickerLocationId::DocumentsLibrary;
-        case 1: return winrt::Windows::Storage::Pickers::PickerLocationId::ComputerFolder;
-        case 2: return winrt::Windows::Storage::Pickers::PickerLocationId::Desktop;
-        case 3: return winrt::Windows::Storage::Pickers::PickerLocationId::Downloads;
-        case 4: return winrt::Windows::Storage::Pickers::PickerLocationId::HomeGroup;
-        case 5: return winrt::Windows::Storage::Pickers::PickerLocationId::MusicLibrary;
-        case 6: return winrt::Windows::Storage::Pickers::PickerLocationId::PicturesLibrary;
-        case 7: return winrt::Windows::Storage::Pickers::PickerLocationId::VideosLibrary;
-        case 8: return winrt::Windows::Storage::Pickers::PickerLocationId::Objects3D;
-        default: return winrt::Windows::Storage::Pickers::PickerLocationId::Unspecified;
-        }
-    }
-
-    winrt::Microsoft::Windows::Storage::Pickers::PickerLocationId MainWindow::GetNewLocationId()
-    {
-        switch (StartLocationComboBox().SelectedIndex())
-        {
-        case 0: return PickerLocationId::DocumentsLibrary;
-        case 1: return PickerLocationId::ComputerFolder;
-        case 2: return PickerLocationId::Desktop;
-        case 3: return PickerLocationId::Downloads;
-        // case 4: HomeGroup is not supported in new API - will throw at runtime
-        case 5: return PickerLocationId::MusicLibrary;
-        case 6: return PickerLocationId::PicturesLibrary;
-        case 7: return PickerLocationId::VideosLibrary;
-        case 8: return PickerLocationId::Objects3D;
-        default: return PickerLocationId::Unspecified;
-        }
-    }
-
-    winrt::Windows::Storage::Pickers::PickerViewMode MainWindow::GetUwpViewMode()
-    {
-        return ViewModeComboBox().SelectedIndex() == 0
-            ? winrt::Windows::Storage::Pickers::PickerViewMode::List
-            : winrt::Windows::Storage::Pickers::PickerViewMode::Thumbnail;
-    }
-
-    winrt::Microsoft::Windows::Storage::Pickers::PickerViewMode MainWindow::GetNewViewMode()
-    {
-        return ViewModeComboBox().SelectedIndex() == 0
-            ? PickerViewMode::List
-            : PickerViewMode::Thumbnail;
-    }
-
-    std::vector<hstring> MainWindow::ParseFileTypeFilter()
-    {
-        std::vector<hstring> filters;
-        hstring input = FileTypeFilterInput().Text();
-
-        if (input.empty())
-        {
-            filters.push_back(L"*");
-            return filters;
-        }
-
-        std::wstring inputStr{ input };
-        std::wstringstream ss(inputStr);
-        std::wstring filter;
-        while (std::getline(ss, filter, L','))
-        {
-            // Trim whitespace
-            filter.erase(0, filter.find_first_not_of(L' '));
-            filter.erase(filter.find_last_not_of(L' ') + 1);
-            if (!filter.empty())
-            {
-                filters.push_back(hstring{ filter });
-            }
-        }
-
-        if (filters.empty())
-        {
-            filters.push_back(L"*");
-        }
-        return filters;
-    }
-
-    std::vector<std::pair<std::wstring, std::vector<std::wstring>>> MainWindow::ParseFileTypeChoices(hstring const& json)
-    {
-        std::vector<std::pair<std::wstring, std::vector<std::wstring>>> choices;
-        if (json.empty()) return choices;
-
-        std::wstring jsonStr{ json };
-
-        // Find opening and closing braces
-        size_t start = jsonStr.find(L'{');
-        size_t end = jsonStr.rfind(L'}');
-        if (start == std::wstring::npos || end == std::wstring::npos || start >= end)
-            return choices;
-
-        jsonStr = jsonStr.substr(start + 1, end - start - 1);
-
-        // Parse key-value pairs (simple JSON parser)
-        size_t pos = 0;
-        int bracketDepth = 0;
-        size_t lastPos = 0;
-
-        auto processPair = [&](const std::wstring& pair) {
-            size_t colonPos = pair.find(L':');
-            if (colonPos == std::wstring::npos) return;
-
-            std::wstring key = pair.substr(0, colonPos);
-            std::wstring valueStr = pair.substr(colonPos + 1);
-
-            // Clean key
-            key.erase(0, key.find_first_not_of(L" \t\n\r\""));
-            key.erase(key.find_last_not_of(L" \t\n\r\"") + 1);
-
-            // Parse array
-            std::vector<std::wstring> values;
-            size_t arrStart = valueStr.find(L'[');
-            size_t arrEnd = valueStr.rfind(L']');
-            if (arrStart != std::wstring::npos && arrEnd != std::wstring::npos && arrStart < arrEnd)
-            {
-                std::wstring arrayContent = valueStr.substr(arrStart + 1, arrEnd - arrStart - 1);
-                std::wstringstream ss(arrayContent);
-                std::wstring item;
-                while (std::getline(ss, item, L','))
-                {
-                    item.erase(0, item.find_first_not_of(L" \t\n\r\""));
-                    item.erase(item.find_last_not_of(L" \t\n\r\"") + 1);
-                    if (!item.empty())
-                    {
-                        values.push_back(item);
-                    }
-                }
-            }
-
-            if (!key.empty())
-            {
-                choices.emplace_back(key, values);
-            }
-        };
-
-        while (pos < jsonStr.length())
-        {
-            wchar_t ch = jsonStr[pos];
-            if (ch == L'[') bracketDepth++;
-            else if (ch == L']') bracketDepth--;
-            else if (ch == L',' && bracketDepth == 0)
-            {
-                processPair(jsonStr.substr(lastPos, pos - lastPos));
-                lastPos = pos + 1;
-            }
-            pos++;
-        }
-
-        // Process last pair
-        if (lastPos < jsonStr.length())
-        {
-            processPair(jsonStr.substr(lastPos));
-        }
-
-        return choices;
-    }
-
-    void MainWindow::ClearLog_Click(Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        ResultsTextBlock().Text(L"");
-    }
-
-    // ==========================================================================
-    // FileOpenPicker - UWP
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::UwpPickSingleFile_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            winrt::Windows::Storage::Pickers::FileOpenPicker picker;
-
-            // Initialize with window handle (required for desktop apps)
-            auto initializeWithWindow = picker.as<::IInitializeWithWindow>();
-            initializeWithWindow->Initialize(GetWindowHandle());
-
-            // Apply settings
-            if (FileTypeFilterCheckBox().IsChecked().Value())
-            {
-                for (const auto& filter : ParseFileTypeFilter())
-                {
-                    picker.FileTypeFilter().Append(filter);
-                }
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetUwpLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetUwpViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-
-            auto file = co_await picker.PickSingleFileAsync();
-
-            if (file)
-            {
-                std::wstringstream ss;
-                ss << L"[UWP] PickSingleFileAsync:\n  File: " << file.Name().c_str()
-                   << L"\n  Path: " << file.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[UWP] PickSingleFileAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[UWP] Error: " + ex.message());
-        }
-    }
-
-    // ==========================================================================
-    // FileOpenPicker - New API
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::NewPickSingleFile_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            auto picker = FileOpenPicker{ this->AppWindow().Id() };
-
-            // Apply settings
-            if (FileTypeFilterCheckBox().IsChecked().Value())
-            {
-                for (const auto& filter : ParseFileTypeFilter())
-                {
-                    picker.FileTypeFilter().Append(filter);
-                }
-            }
-
-            if (OpenPickerFileTypeChoicesCheckBox().IsChecked().Value())
-            {
-                auto choices = ParseFileTypeChoices(OpenPickerFileTypeChoicesInput().Text());
-                for (const auto& choice : choices)
-                {
-                    auto extensions = winrt::single_threaded_vector<hstring>();
-                    for (const auto& ext : choice.second)
-                    {
-                        extensions.Append(hstring{ ext });
-                    }
-                    picker.FileTypeChoices().Insert(hstring{ choice.first }, extensions);
-                }
-            }
-
-            if (OpenInitialFileTypeIndexCheckBox().IsChecked().Value())
-            {
-                try
-                {
-                    std::wstring indexText{ OpenInitialFileTypeIndexInput().Text() };
-                    int index = std::stoi(indexText);
-                    picker.InitialFileTypeIndex(index);
-                }
-                catch (...)
-                {
-                    LogResult(L"[NEW] InitialFileTypeIndex (open) parse error; using default");
-                }
-            }
-
-            if (SuggestedFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedFolder(SuggestedFolderInput().Text());
-            }
-
-            if (SuggestedStartFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedStartFolder(SuggestedStartFolderInput().Text());
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetNewLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetNewViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-            if (TitleCheckBox().IsChecked().Value())
-                picker.Title(TitleInput().Text());
-
-            auto result = co_await picker.PickSingleFileAsync();
-
-            if (result)
-            {
-                std::wstringstream ss;
-                ss << L"[NEW] PickSingleFileAsync:\n  File: "
-                   << std::filesystem::path(result.Path().c_str()).filename().c_str()
-                   << L"\n  Path: " << result.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[NEW] PickSingleFileAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[NEW] Error: " + ex.message());
-        }
-    }
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::UwpPickMultipleFiles_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            winrt::Windows::Storage::Pickers::FileOpenPicker picker;
-            auto initializeWithWindow = picker.as<::IInitializeWithWindow>();
-            initializeWithWindow->Initialize(GetWindowHandle());
-
-            if (FileTypeFilterCheckBox().IsChecked().Value())
-            {
-                for (const auto& filter : ParseFileTypeFilter())
-                {
-                    picker.FileTypeFilter().Append(filter);
-                }
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetUwpLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetUwpViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-
-            auto files = co_await picker.PickMultipleFilesAsync();
-
-            if (files && files.Size() > 0)
-            {
-                std::wstringstream ss;
-                ss << L"[UWP] PickMultipleFilesAsync: " << files.Size() << L" files\n";
-                for (const auto& file : files)
-                {
-                    ss << L"  - " << file.Name().c_str() << L"\n";
-                }
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[UWP] PickMultipleFilesAsync: Cancelled or no files");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[UWP] Error: " + ex.message());
-        }
-    }
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::NewPickMultipleFiles_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            auto picker = FileOpenPicker{ this->AppWindow().Id() };
-
-            if (FileTypeFilterCheckBox().IsChecked().Value())
-            {
-                for (const auto& filter : ParseFileTypeFilter())
-                {
-                    picker.FileTypeFilter().Append(filter);
-                }
-            }
-
-            if (OpenPickerFileTypeChoicesCheckBox().IsChecked().Value())
-            {
-                auto choices = ParseFileTypeChoices(OpenPickerFileTypeChoicesInput().Text());
-                for (const auto& choice : choices)
-                {
-                    auto extensions = winrt::single_threaded_vector<hstring>();
-                    for (const auto& ext : choice.second)
-                    {
-                        extensions.Append(hstring{ ext });
-                    }
-                    picker.FileTypeChoices().Insert(hstring{ choice.first }, extensions);
-                }
-            }
-
-            if (OpenInitialFileTypeIndexCheckBox().IsChecked().Value())
-            {
-                try
-                {
-                    std::wstring indexText{ OpenInitialFileTypeIndexInput().Text() };
-                    int index = std::stoi(indexText);
-                    picker.InitialFileTypeIndex(index);
-                }
-                catch (...)
-                {
-                    LogResult(L"[NEW] InitialFileTypeIndex (open multi) parse error; using default");
-                }
-            }
-
-            if (SuggestedFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedFolder(SuggestedFolderInput().Text());
-            }
-
-            if (SuggestedStartFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedStartFolder(SuggestedStartFolderInput().Text());
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetNewLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetNewViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-            if (TitleCheckBox().IsChecked().Value())
-                picker.Title(TitleInput().Text());
-
-            auto results = co_await picker.PickMultipleFilesAsync();
-
-            if (results && results.Size() > 0)
-            {
-                std::wstringstream ss;
-                ss << L"[NEW] PickMultipleFilesAsync: " << results.Size() << L" files\n";
-                for (const auto& result : results)
-                {
-                    ss << L"  - " << std::filesystem::path(result.Path().c_str()).filename().c_str() << L"\n";
-                }
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[NEW] PickMultipleFilesAsync: Cancelled or no files");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[NEW] Error: " + ex.message());
-        }
-    }
-
-    // ==========================================================================
-    // FileSavePicker - UWP
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::UwpPickSaveFile_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            winrt::Windows::Storage::Pickers::FileSavePicker picker;
-            auto initializeWithWindow = picker.as<::IInitializeWithWindow>();
-            initializeWithWindow->Initialize(GetWindowHandle());
-
-            if (SuggestedFileNameCheckBox().IsChecked().Value())
-                picker.SuggestedFileName(SuggestedFileNameInput().Text());
-            if (DefaultFileExtensionCheckBox().IsChecked().Value())
-                picker.DefaultFileExtension(DefaultFileExtensionInput().Text());
-
-            if (SavePickerFileTypeChoicesCheckBox().IsChecked().Value())
-            {
-                auto choices = ParseFileTypeChoices(SavePickerFileTypeChoicesInput().Text());
-                for (const auto& choice : choices)
-                {
-                    auto extensions = winrt::single_threaded_vector<hstring>();
-                    for (const auto& ext : choice.second)
-                    {
-                        extensions.Append(hstring{ ext });
-                    }
-                    picker.FileTypeChoices().Insert(hstring{ choice.first }, extensions);
-                }
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetUwpLocationId());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-
-            auto file = co_await picker.PickSaveFileAsync();
-
-            if (file)
-            {
-                std::wstringstream ss;
-                ss << L"[UWP] PickSaveFileAsync:\n  File: " << file.Name().c_str()
-                   << L"\n  Path: " << file.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[UWP] PickSaveFileAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[UWP] Error: " + ex.message());
-        }
-    }
-
-    // ==========================================================================
-    // FileSavePicker - New API
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::NewPickSaveFile_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            auto picker = FileSavePicker{ this->AppWindow().Id() };
-
-            if (SuggestedFileNameCheckBox().IsChecked().Value())
-                picker.SuggestedFileName(SuggestedFileNameInput().Text());
-            if (DefaultFileExtensionCheckBox().IsChecked().Value())
-                picker.DefaultFileExtension(DefaultFileExtensionInput().Text());
-
-            if (SavePickerFileTypeChoicesCheckBox().IsChecked().Value())
-            {
-                auto choices = ParseFileTypeChoices(SavePickerFileTypeChoicesInput().Text());
-                for (const auto& choice : choices)
-                {
-                    auto extensions = winrt::single_threaded_vector<hstring>();
-                    for (const auto& ext : choice.second)
-                    {
-                        extensions.Append(hstring{ ext });
-                    }
-                    picker.FileTypeChoices().Insert(hstring{ choice.first }, extensions);
-                }
-            }
-
-            if (SaveInitialFileTypeIndexCheckBox().IsChecked().Value())
-            {
-                try
-                {
-                    std::wstring indexText{ SaveInitialFileTypeIndexInput().Text() };
-                    int index = std::stoi(indexText);
-                    picker.InitialFileTypeIndex(index);
-                }
-                catch (...)
-                {
-                    LogResult(L"[NEW] InitialFileTypeIndex parse error; using default");
-                }
-            }
-
-            if (ShowOverwritePromptCheckBox().IsChecked().Value())
-            {
-                bool overwrite = ShowOverwritePromptComboBox().SelectedIndex() == 0;
-                picker.ShowOverwritePrompt(overwrite);
-            }
-
-            if (SuggestedFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedFolder(SuggestedFolderInput().Text());
-            }
-
-            if (SuggestedStartFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedStartFolder(SuggestedStartFolderInput().Text());
-            }
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetNewLocationId());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-            if (TitleCheckBox().IsChecked().Value())
-                picker.Title(TitleInput().Text());
-
-            auto result = co_await picker.PickSaveFileAsync();
-
-            if (result)
-            {
-                std::wstringstream ss;
-                ss << L"[NEW] PickSaveFileAsync:\n  File: "
-                   << std::filesystem::path(result.Path().c_str()).filename().c_str()
-                   << L"\n  Path: " << result.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[NEW] PickSaveFileAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[NEW] Error: " + ex.message());
-        }
-    }
-
-    // ==========================================================================
-    // FolderPicker - UWP
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::UwpPickFolder_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            winrt::Windows::Storage::Pickers::FolderPicker picker;
-            auto initializeWithWindow = picker.as<::IInitializeWithWindow>();
-            initializeWithWindow->Initialize(GetWindowHandle());
-
-            // FolderPicker requires at least one filter
-            picker.FileTypeFilter().Append(L"*");
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetUwpLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetUwpViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-
-            auto folder = co_await picker.PickSingleFolderAsync();
-
-            if (folder)
-            {
-                std::wstringstream ss;
-                ss << L"[UWP] PickSingleFolderAsync:\n  Folder: " << folder.Name().c_str()
-                   << L"\n  Path: " << folder.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[UWP] PickSingleFolderAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[UWP] Error: " + ex.message());
-        }
-    }
-
-    // ==========================================================================
-    // FolderPicker - New API
-    // ==========================================================================
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::NewPickFolder_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            auto picker = FolderPicker{ this->AppWindow().Id() };
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetNewLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetNewViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-            if (TitleCheckBox().IsChecked().Value())
-                picker.Title(TitleInput().Text());
-
-            if (SuggestedFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedFolder(SuggestedFolderInput().Text());
-            }
-
-            if (SuggestedStartFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedStartFolder(SuggestedStartFolderInput().Text());
-            }
-
-            auto result = co_await picker.PickSingleFolderAsync();
-
-            if (result)
-            {
-                std::wstringstream ss;
-                ss << L"[NEW] PickSingleFolderAsync:\n  Folder: "
-                   << std::filesystem::path(result.Path().c_str()).filename().c_str()
-                   << L"\n  Path: " << result.Path().c_str();
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[NEW] PickSingleFolderAsync: Cancelled");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[NEW] Error: " + ex.message());
-        }
-    }
-
-    winrt::Windows::Foundation::IAsyncAction MainWindow::NewPickMultipleFolders_Click(
-        Windows::Foundation::IInspectable const&, RoutedEventArgs const&)
-    {
-        auto lifetime = get_strong();
-        try
-        {
-            auto picker = FolderPicker{ this->AppWindow().Id() };
-
-            if (SuggestedStartLocationCheckBox().IsChecked().Value())
-                picker.SuggestedStartLocation(GetNewLocationId());
-            if (ViewModeCheckBox().IsChecked().Value())
-                picker.ViewMode(GetNewViewMode());
-            if (CommitButtonCheckBox().IsChecked().Value())
-                picker.CommitButtonText(CommitButtonTextInput().Text());
-            if (SettingsIdCheckBox().IsChecked().Value())
-                picker.SettingsIdentifier(SettingsIdInput().Text());
-            if (TitleCheckBox().IsChecked().Value())
-                picker.Title(TitleInput().Text());
-
-            if (SuggestedFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedFolder(SuggestedFolderInput().Text());
-            }
-
-            if (SuggestedStartFolderCheckBox().IsChecked().Value())
-            {
-                picker.SuggestedStartFolder(SuggestedStartFolderInput().Text());
-            }
-
-            auto results = co_await picker.PickMultipleFoldersAsync();
-
-            if (results && results.Size() > 0)
-            {
-                std::wstringstream ss;
-                ss << L"[NEW] PickMultipleFoldersAsync: " << results.Size() << L" folders\n";
-                for (const auto& result : results)
-                {
-                    ss << L"  - " << std::filesystem::path(result.Path().c_str()).filename().c_str() << L"\n";
-                }
-                LogResult(hstring{ ss.str() });
-            }
-            else
-            {
-                LogResult(L"[NEW] PickMultipleFoldersAsync: Cancelled or no folders");
-            }
-        }
-        catch (hresult_error const& ex)
-        {
-            LogResult(L"[NEW] Error: " + ex.message());
-        }
-    }
-}
diff --git a/test/TestApps/StoragePickersTestApp/MainWindow.xaml.h b/test/TestApps/StoragePickersTestApp/MainWindow.xaml.h
deleted file mode 100644
index ef1fff1e44..0000000000
--- a/test/TestApps/StoragePickersTestApp/MainWindow.xaml.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "MainWindow.g.h"
-#include <winrt/Microsoft.Windows.Storage.Pickers.h>
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include <filesystem>
-#include <chrono>
-#include <iomanip>
-
-namespace winrt::StoragePickersTestApp::implementation
-{
-    struct MainWindow : MainWindowT<MainWindow>
-    {
-        MainWindow()
-        {
-        }
-        
-        void InitializeDefaults()
-        {
-            OpenPickerFileTypeChoicesInput().Text(LR"({"Documents": [".txt", ".doc"], "Images": [".png", ".jpg"]})");
-            SavePickerFileTypeChoicesInput().Text(LR"({"Documents": [".txt", ".doc"], "All Files": ["*"]})");
-        }
-
-        // Helper methods
-        void LogResult(hstring const& message);
-        HWND GetWindowHandle();
-        winrt::Windows::Storage::Pickers::PickerLocationId GetUwpLocationId();
-        winrt::Microsoft::Windows::Storage::Pickers::PickerLocationId GetNewLocationId();
-        winrt::Windows::Storage::Pickers::PickerViewMode GetUwpViewMode();
-        winrt::Microsoft::Windows::Storage::Pickers::PickerViewMode GetNewViewMode();
-        std::vector<hstring> ParseFileTypeFilter();
-        std::vector<std::pair<std::wstring, std::vector<std::wstring>>> ParseFileTypeChoices(hstring const& json);
-
-        // FileOpenPicker handlers
-        winrt::Windows::Foundation::IAsyncAction UwpPickSingleFile_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction NewPickSingleFile_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction UwpPickMultipleFiles_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction NewPickMultipleFiles_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-
-        // FileSavePicker handlers
-        winrt::Windows::Foundation::IAsyncAction UwpPickSaveFile_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction NewPickSaveFile_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-
-        // FolderPicker handlers
-        winrt::Windows::Foundation::IAsyncAction UwpPickFolder_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction NewPickFolder_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-        winrt::Windows::Foundation::IAsyncAction NewPickMultipleFolders_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-
-        // Utility handlers
-        void ClearLog_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
-    };
-}
-
-namespace winrt::StoragePickersTestApp::factory_implementation
-{
-    struct MainWindow : MainWindowT<MainWindow, implementation::MainWindow>
-    {
-    };
-}
diff --git a/test/TestApps/StoragePickersTestApp/Package.appxmanifest b/test/TestApps/StoragePickersTestApp/Package.appxmanifest
deleted file mode 100644
index aa23d6090d..0000000000
--- a/test/TestApps/StoragePickersTestApp/Package.appxmanifest
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="fb9840ea-ba0d-4980-a83f-a28abb9e13fe"
-    Publisher="CN=xiaomgao"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="fb9840ea-ba0d-4980-a83f-a28abb9e13fe" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>StoragePickersTestApp</DisplayName>
-    <PublisherDisplayName>xiaomgao</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="StoragePickersTestApp"
-        Description="StoragePickersTestApp"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>
diff --git a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.exe.manifest b/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.exe.manifest
deleted file mode 100644
index 68d1e330e7..0000000000
--- a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.exe.manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="StoragePickersTestApp.app"/>
-
-  <!-- Registration-free WinRT: Storage Pickers classes in WindowsAppRuntime DLL -->
-  <file name="Microsoft.WindowsAppRuntime.dll">
-    <activatableClass
-      name="Microsoft.Windows.Storage.Pickers.FileOpenPicker"
-      threadingModel="both"
-      xmlns="urn:schemas-microsoft-com:winrt.v1" />
-    <activatableClass
-      name="Microsoft.Windows.Storage.Pickers.FileSavePicker"
-      threadingModel="both"
-      xmlns="urn:schemas-microsoft-com:winrt.v1" />
-    <activatableClass
-      name="Microsoft.Windows.Storage.Pickers.FolderPicker"
-      threadingModel="both"
-      xmlns="urn:schemas-microsoft-com:winrt.v1" />
-    <activatableClass
-      name="Microsoft.Windows.Storage.Pickers.PickFileResult"
-      threadingModel="both"
-      xmlns="urn:schemas-microsoft-com:winrt.v1" />
-    <activatableClass
-      name="Microsoft.Windows.Storage.Pickers.PickFolderResult"
-      threadingModel="both"
-      xmlns="urn:schemas-microsoft-com:winrt.v1" />
-  </file>
-
-</assembly>
\ No newline at end of file
diff --git a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj b/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj
deleted file mode 100644
index 5962499ebe..0000000000
--- a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
-<!--
-  StoragePickersTestApp - A WinUI 3 test application for Storage Pickers API
-  
-  NOTE: This project is intentionally isolated from the repo's build system via local
-  Directory.Build.props/targets files. It uses the shipped WindowsAppSDK NuGet for WinUI
-  and references the local Storage Pickers implementation via ProjectReference.
--->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Define paths for this project -->
-  <PropertyGroup>
-    <RepoRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'WindowsAppRuntime.sln'))\</RepoRoot>
-    <PackagesDir>$(RepoRoot)packages\</PackagesDir>
-    <BaseOutputPath>$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\StoragePickersTestApp\</BaseOutputPath>
-    <IntDir>$(RepoRoot)obj\$(Configuration)\$(Platform)\StoragePickersTestApp\</IntDir>
-    <OutDir>$(BaseOutputPath)</OutDir>
-  </PropertyGroup>
-  
-  <!-- Import NuGet props BEFORE other imports -->
-  <Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props')" />
-  <Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" />
-  
-  <PropertyGroup Label="Globals">
-    <CppWinRTOptimized>true</CppWinRTOptimized>
-    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
-    <MinimalCoreWin>true</MinimalCoreWin>
-    <ProjectGuid>{d1310de7-70ec-4b6a-8a78-2a31bcfa037f}</ProjectGuid>
-    <ProjectName>StoragePickersTestApp</ProjectName>
-    <RootNamespace>StoragePickersTestApp</RootNamespace>
-    <TargetName>$(RootNamespace)</TargetName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>false</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
-    <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
-    <!-- SelfContained mode: disables bootstrap auto-init (no framework package needed),
-         enables UndockedRegFreeWinRT auto-init, and auto-generates a manifest with all
-         WinRT class registrations. The local DLL from CopyWindowsAppRuntimeDll target
-         overwrites the MSIX-extracted copy at runtime. -->
-    <WindowsPackageType>None</WindowsPackageType>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <AppxPackage>false</AppxPackage>
-  </PropertyGroup>
-  
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <DesktopCompatible>true</DesktopCompatible>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  
-  <PropertyGroup Label="UserMacros" />
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
-      <PreprocessorDefinitions>DISABLE_XAML_GENERATED_MAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <ItemGroup>
-    <Manifest Include="app.manifest" />
-    <Manifest Include="StoragePickersTestApp.exe.manifest" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="App.xaml.h">
-      <DependentUpon>App.xaml</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="MainWindow.xaml.h">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </ClInclude>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml" />
-    <Page Include="MainWindow.xaml" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="App.xaml.cpp">
-      <DependentUpon>App.xaml</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="MainWindow.xaml.cpp">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Midl Include="MainWindow.idl">
-      <SubType>Code</SubType>
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Midl>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Text Include="readme.txt">
-      <DeploymentContent>false</DeploymentContent>
-    </Text>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Image Include="Assets\LockScreenLogo.scale-200.png" />
-    <Image Include="Assets\SplashScreen.scale-200.png" />
-    <Image Include="Assets\Square150x150Logo.scale-200.png" />
-    <Image Include="Assets\Square44x44Logo.scale-200.png" />
-    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Image Include="Assets\StoreLogo.png" />
-    <Image Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  
-  <!-- Reference Storage Pickers WinMD from the repo's build output -->
-  <ItemGroup>
-    <Reference Include="Microsoft.Windows.Storage.Pickers">
-      <HintPath>$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.Windows.Storage.Pickers.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-    </Reference>
-  </ItemGroup>
-  
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-  </PropertyGroup>
-  
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(PackagesDir)Microsoft.Web.WebView2.1.0.2651.64\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(PackagesDir)Microsoft.Web.WebView2.1.0.2651.64\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  </ImportGroup>
-  
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.1.6.241114003'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.1.6.241114003'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.2.0.230706.1'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.2.0.230706.1'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.10.0.26100.1742'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.10.0.26100.1742'))" />
-    <Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.240803.1'))" />
-  </Target>
-  
-  <!-- Copy Windows App Runtime DLL and PRI from repo build output for runtime -->
-  <Target Name="CopyWindowsAppRuntimeDll" AfterTargets="Build">
-    <Copy 
-      SourceFiles="$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll"
-      DestinationFolder="$(OutDir)"
-      SkipUnchangedFiles="true"
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll')" />
-    <Copy 
-      SourceFiles="$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.pri"
-      DestinationFolder="$(OutDir)"
-      SkipUnchangedFiles="true"
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.pri')" />
-    <Copy 
-      SourceFiles="$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.exp"
-      DestinationFolder="$(OutDir)"
-      SkipUnchangedFiles="true"
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.exp')" />
-    <Copy 
-      SourceFiles="$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.lib"
-      DestinationFolder="$(OutDir)"
-      SkipUnchangedFiles="true"
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.lib')" />
-    <Copy 
-      SourceFiles="$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.pdb"
-      DestinationFolder="$(OutDir)"
-      SkipUnchangedFiles="true"
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.pdb')" />
-    <Message Importance="High" Text="Copied Microsoft.WindowsAppRuntime.dll and .pri from repo build output" 
-      Condition="Exists('$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll')" />
-  </Target>
-  
-  <!-- 
-    Verify WindowsAppRuntime_DLL is built before compiling this test app.
-    We don't auto-build it because WindowsAppRuntime_DLL has many dependencies 
-    and requires building the full solution (very slow).
-  -->
-  <Target Name="VerifyWindowsAppRuntimeDllExists" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <_WindowsAppRuntimeDll>$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll</_WindowsAppRuntimeDll>
-      <_WindowsAppRuntimeWinmd>$(RepoRoot)BuildOutput\$(Configuration)\$(Platform)\WindowsAppRuntime_DLL\Microsoft.Windows.Storage.Pickers.winmd</_WindowsAppRuntimeWinmd>
-    </PropertyGroup>
-    <Error 
-      Text="WindowsAppRuntime_DLL not found for $(Configuration)|$(Platform). Please build it first:&#xA;&#xA;  Option 1: Build full solution&#xA;    msbuild WindowsAppRuntime.sln /p:Configuration=$(Configuration) /p:Platform=$(Platform)&#xA;&#xA;  Option 2: Use BuildAll.cmd&#xA;    BuildAll.cmd -Platform $(Platform) -Configuration $(Configuration)&#xA;&#xA;Missing file: $(_WindowsAppRuntimeDll)"
-      Condition="!Exists('$(_WindowsAppRuntimeDll)')" />
-    <Message Importance="High" Text="Found WindowsAppRuntime_DLL build output: $(_WindowsAppRuntimeDll)" 
-      Condition="Exists('$(_WindowsAppRuntimeDll)')" />
-  </Target>
-</Project>
diff --git a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj.filters b/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj.filters
deleted file mode 100644
index 6e2b122dc8..0000000000
--- a/test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj.filters
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="MainWindow.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="MainWindow.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp" />
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="Assets\Wide310x150Logo.scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\StoreLogo.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\Square150x150Logo.scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\Square44x44Logo.scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\SplashScreen.scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\LockScreenLogo.scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Assets">
-      <UniqueIdentifier>{d1310de7-70ec-4b6a-8a78-2a31bcfa037f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="readme.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="app.manifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/TestApps/StoragePickersTestApp/app.manifest b/test/TestApps/StoragePickersTestApp/app.manifest
deleted file mode 100644
index 23ad088136..0000000000
--- a/test/TestApps/StoragePickersTestApp/app.manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="StoragePickersTestApp.app"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
\ No newline at end of file
diff --git a/test/TestApps/StoragePickersTestApp/main.cpp b/test/TestApps/StoragePickersTestApp/main.cpp
deleted file mode 100644
index a0c0bfcb44..0000000000
--- a/test/TestApps/StoragePickersTestApp/main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// Custom entry point for StoragePickersTestApp.
-// This replaces the auto-generated wWinMain (disabled via DISABLE_XAML_GENERATED_MAIN).
-
-#include "pch.h"
-#include "App.xaml.h"
-
-int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
-{
-    winrt::init_apartment(winrt::apartment_type::single_threaded);
-
-    ::winrt::Microsoft::UI::Xaml::Application::Start(
-        [](auto&&)
-        {
-            ::winrt::make<::winrt::StoragePickersTestApp::implementation::App>();
-        });
-
-    return 0;
-}
diff --git a/test/TestApps/StoragePickersTestApp/packages.config b/test/TestApps/StoragePickersTestApp/packages.config
deleted file mode 100644
index d95f39ee9d..0000000000
--- a/test/TestApps/StoragePickersTestApp/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240803.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.1742" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.241114003" targetFramework="native" />
-</packages>
diff --git a/test/TestApps/StoragePickersTestApp/pch.cpp b/test/TestApps/StoragePickersTestApp/pch.cpp
deleted file mode 100644
index fdc2d78817..0000000000
--- a/test/TestApps/StoragePickersTestApp/pch.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
diff --git a/test/TestApps/StoragePickersTestApp/pch.h b/test/TestApps/StoragePickersTestApp/pch.h
deleted file mode 100644
index 4f7f19f197..0000000000
--- a/test/TestApps/StoragePickersTestApp/pch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-#include <windows.h>
-#include <unknwn.h>
-#include <restrictederrorinfo.h>
-#include <hstring.h>
-
-// Undefine GetCurrentTime macro to prevent
-// conflict with Storyboard::GetCurrentTime
-#undef GetCurrentTime
-
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.ApplicationModel.Activation.h>
-#include <winrt/Microsoft.UI.Composition.h>
-#include <winrt/Microsoft.UI.Xaml.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Microsoft.UI.Xaml.Data.h>
-#include <winrt/Microsoft.UI.Xaml.Interop.h>
-#include <winrt/Microsoft.UI.Xaml.Markup.h>
-#include <winrt/Microsoft.UI.Xaml.Media.h>
-#include <winrt/Microsoft.UI.Xaml.Navigation.h>
-#include <winrt/Microsoft.UI.Xaml.Shapes.h>
-#include <winrt/Microsoft.UI.Dispatching.h>
-#include <winrt/Microsoft.UI.Windowing.h>
-#include <winrt/Microsoft.UI.Interop.h>
-#include <winrt/Microsoft.Windows.Storage.Pickers.h>
-#include <wil/cppwinrt_helpers.h>
-
-// For legacy UWP pickers:
-#include <winrt/Windows.Storage.h>
-#include <winrt/Windows.Storage.Pickers.h>
-// For IInitializeWithWindow (required for UWP pickers in desktop apps)
-#include <Shobjidl.h>