From 944bd3d35624409e1a7d02f3597d2fb9c6a74feb Mon Sep 17 00:00:00 2001
From: Roxk <vzox.rock@gmail.com>
Date: Tue, 2 Apr 2024 02:30:22 +0800
Subject: [PATCH] preview: Update nuget to include dll loader #7

Fix nuget test projects
---
 WinUI3XamlPreview/Nuget/.gitignore            |   1 +
 .../Nuget/WinUI3XamlPreview-Native.targets    |  20 ++++
 .../Nuget/WinUI3XamlPreview.nuspec.template   |   3 +
 WinUI3XamlPreview/TestDep/TestDep.vcxproj     |   2 -
 WinUI3XamlPreview/TestDep/packages.config     |   1 -
 WinUI3XamlPreview/TestDep/pch.h               |   1 -
 .../TestDepOfDep/TestDepOfDep.vcxproj         |   7 +-
 .../TestDepOfDep/packages.config              |   2 +-
 .../TestNonPackagedCs.csproj                  |   2 +-
 WinUI3XamlPreview/TestNuget/TestNuget.vcxproj |   6 +-
 WinUI3XamlPreview/TestNuget/packages.config   |   2 +-
 .../TestPackagedCs/TestPackagedCs.csproj      |   4 +-
 WinUI3XamlPreview/WinUI3XamlPreview.sln       | 112 ------------------
 WinUI3XamlPreview/scripts/build-nuget.ps1     |   3 +
 WinUI3XamlPreview/test/test-file.cpp          |   8 --
 15 files changed, 40 insertions(+), 134 deletions(-)
 delete mode 100644 WinUI3XamlPreview/test/test-file.cpp

diff --git a/WinUI3XamlPreview/Nuget/.gitignore b/WinUI3XamlPreview/Nuget/.gitignore
index 2e480c8..b06db16 100644
--- a/WinUI3XamlPreview/Nuget/.gitignore
+++ b/WinUI3XamlPreview/Nuget/.gitignore
@@ -1 +1,2 @@
 .nuspec
+*.zip
diff --git a/WinUI3XamlPreview/Nuget/WinUI3XamlPreview-Native.targets b/WinUI3XamlPreview/Nuget/WinUI3XamlPreview-Native.targets
index 402148f..58e998a 100644
--- a/WinUI3XamlPreview/Nuget/WinUI3XamlPreview-Native.targets
+++ b/WinUI3XamlPreview/Nuget/WinUI3XamlPreview-Native.targets
@@ -13,6 +13,11 @@
 		<Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
 		<Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
 	</PropertyGroup>
+	<PropertyGroup>
+		<CleanDependsOn>
+			$(CleanDependsOn);WinUI3XPClean
+		</CleanDependsOn>
+	</PropertyGroup>
 	<ItemGroup Condition="$(WinUI3XPEnabled)">
 		<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\WinUI3XamlPreview.winmd">
 			<Implementation>WinUI3XamlPreview.dll</Implementation>
@@ -20,4 +25,19 @@
 		<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\WinUI3XamlPreview.dll" />
 		<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\WinUI3XamlPreview.pri" />
 	</ItemGroup>
+	<PropertyGroup>
+		<PreviewDir>$(OutDir)..\$(ProjectName)_Preview</PreviewDir>
+	</PropertyGroup>
+	<Target Name="WinUI3XPClean">
+		<ItemGroup>
+			<_FilesToDelete Remove="@(_FilesToDelete)"/>
+			<_FilesToDelete Include="$(PreviewDir)\**"/>
+		</ItemGroup>
+		<Delete Files="@(_FilesToDelete)"/>
+	</Target>
+	<Target Name="CopyPreviewAppToOutputDir" AfterTargets="AfterBuild" Condition="$(WinUI3XPEnabled)">
+		<Exec Command="xcopy /y /e /i &quot;$(OutDir)&quot; &quot;$(PreviewDir)&quot;"/>
+		<!-- loader has higher priority -->
+		<Exec Command="powershell -c &quot;Expand-Archive '$(MSBuildThisFileDirectory)..\..\tools\WinUI3XamlPreview.DllLoader.zip' -DestinationPath '$(PreviewDir)' -Force&quot;"/>
+	</Target>
 </Project>
diff --git a/WinUI3XamlPreview/Nuget/WinUI3XamlPreview.nuspec.template b/WinUI3XamlPreview/Nuget/WinUI3XamlPreview.nuspec.template
index 6c4b4ee..d09b906 100644
--- a/WinUI3XamlPreview/Nuget/WinUI3XamlPreview.nuspec.template
+++ b/WinUI3XamlPreview/Nuget/WinUI3XamlPreview.nuspec.template
@@ -43,5 +43,8 @@
 
 		<!-- .NET projection -->
 		<file target="lib\net6.0-windows10.0.22621.0\WinUI3XamlPreviewCs.dll"  src="..\AnyCPU\Release\WinUI3XamlPreviewCs\bin\WinUI3XamlPreviewCs.dll" />
+
+		<!-- DLL loader app -->
+		<file target="tools\WinUI3XamlPreview.DllLoader.zip" src="WinUI3XamlPreview.DllLoader.zip" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestDep/TestDep.vcxproj b/WinUI3XamlPreview/TestDep/TestDep.vcxproj
index 5e4dc10..dbb5258 100644
--- a/WinUI3XamlPreview/TestDep/TestDep.vcxproj
+++ b/WinUI3XamlPreview/TestDep/TestDep.vcxproj
@@ -173,7 +173,6 @@
     <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets" Condition="Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -186,6 +185,5 @@
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestDep/packages.config b/WinUI3XamlPreview/TestDep/packages.config
index adb64fd..152b1d8 100644
--- a/WinUI3XamlPreview/TestDep/packages.config
+++ b/WinUI3XamlPreview/TestDep/packages.config
@@ -4,5 +4,4 @@
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.755" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.4.230913002" targetFramework="native" />
-  <package id="WinUI3XamlPreview.WinUI3XamlPreview" version="0.0.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestDep/pch.h b/WinUI3XamlPreview/TestDep/pch.h
index 836099e..635278a 100644
--- a/WinUI3XamlPreview/TestDep/pch.h
+++ b/WinUI3XamlPreview/TestDep/pch.h
@@ -25,4 +25,3 @@
 #include <winrt/Microsoft.UI.Dispatching.h>
 #include <wil/cppwinrt_helpers.h>
 #include "DepCustomControl.h"
-#include <winrt/WinUI3XamlPreview.h>
diff --git a/WinUI3XamlPreview/TestDepOfDep/TestDepOfDep.vcxproj b/WinUI3XamlPreview/TestDepOfDep/TestDepOfDep.vcxproj
index 623e005..fd5d5ee 100644
--- a/WinUI3XamlPreview/TestDepOfDep/TestDepOfDep.vcxproj
+++ b/WinUI3XamlPreview/TestDepOfDep/TestDepOfDep.vcxproj
@@ -170,7 +170,7 @@
     <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets" Condition="Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" />
+    <Import Project="..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets" Condition="Exists('..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -183,6 +183,9 @@
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets'))" />
+    <Error Condition="!Exists('..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets'))" />
+  </Target>
+  <Target Name="EnsureLocalPackage" BeforeTargets="EnsureNuGetPackageBuildImports">
+    <Exec Command="powershell -c &quot;if (test-path $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg) { exit 0 }; $(ProjectDir)..\scripts\build-nuget -version 0.0.0; move $(ProjectDir)..\Nuget\WinUI3XamlPreview.0.0.0.nupkg -destination $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg; nuget restore $(ProjectPath) -PackagesDirectory $(ProjectDir)..\packages&quot;" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestDepOfDep/packages.config b/WinUI3XamlPreview/TestDepOfDep/packages.config
index adb64fd..5bfb1ee 100644
--- a/WinUI3XamlPreview/TestDepOfDep/packages.config
+++ b/WinUI3XamlPreview/TestDepOfDep/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.755" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.4.230913002" targetFramework="native" />
-  <package id="WinUI3XamlPreview.WinUI3XamlPreview" version="0.0.0" targetFramework="native" />
+  <package id="WinUI3XamlPreview" version="0.0.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestNonPackagedCs/TestNonPackagedCs.csproj b/WinUI3XamlPreview/TestNonPackagedCs/TestNonPackagedCs.csproj
index b87c95d..9e09d2c 100644
--- a/WinUI3XamlPreview/TestNonPackagedCs/TestNonPackagedCs.csproj
+++ b/WinUI3XamlPreview/TestNonPackagedCs/TestNonPackagedCs.csproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-	<PackageReference Include="WinUI3XamlPreview.WinUI3XamlPreview" Version="0.0.0" />
+    <PackageReference Include="WinUI3XamlPreview" Version="0.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/WinUI3XamlPreview/TestNuget/TestNuget.vcxproj b/WinUI3XamlPreview/TestNuget/TestNuget.vcxproj
index 414c097..39e3147 100644
--- a/WinUI3XamlPreview/TestNuget/TestNuget.vcxproj
+++ b/WinUI3XamlPreview/TestNuget/TestNuget.vcxproj
@@ -191,7 +191,7 @@
     <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets" Condition="Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" />
+    <Import Project="..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets" Condition="Exists('..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -204,9 +204,9 @@
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.WinUI3XamlPreview.targets'))" />
+    <Error Condition="!Exists('..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinUI3XamlPreview.0.0.0\build\native\WinUI3XamlPreview.targets'))" />
   </Target>
   <Target Name="EnsureLocalPackage" BeforeTargets="EnsureNuGetPackageBuildImports">
-    <Exec Command="powershell -c &quot;if (test-path $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg) { exit 0 }; $(ProjectDir)..\scripts\build-nuget -version 0.0.0; move $(ProjectDir)..\Nuget\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg -destination $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg; nuget restore $(ProjectPath) -PackagesDirectory $(ProjectDir)..\packages&quot;" />
+    <Exec Command="powershell -c &quot;if (test-path $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg) { exit 0 }; $(ProjectDir)..\scripts\build-nuget -version 0.0.0; move $(ProjectDir)..\Nuget\WinUI3XamlPreview.0.0.0.nupkg -destination $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg; nuget restore $(ProjectPath) -PackagesDirectory $(ProjectDir)..\packages&quot;" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestNuget/packages.config b/WinUI3XamlPreview/TestNuget/packages.config
index adb64fd..5bfb1ee 100644
--- a/WinUI3XamlPreview/TestNuget/packages.config
+++ b/WinUI3XamlPreview/TestNuget/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.755" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.4.230913002" targetFramework="native" />
-  <package id="WinUI3XamlPreview.WinUI3XamlPreview" version="0.0.0" targetFramework="native" />
+  <package id="WinUI3XamlPreview" version="0.0.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/WinUI3XamlPreview/TestPackagedCs/TestPackagedCs.csproj b/WinUI3XamlPreview/TestPackagedCs/TestPackagedCs.csproj
index 55cd7aa..2694ef9 100644
--- a/WinUI3XamlPreview/TestPackagedCs/TestPackagedCs.csproj
+++ b/WinUI3XamlPreview/TestPackagedCs/TestPackagedCs.csproj
@@ -25,7 +25,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-	<PackageReference Include="WinUI3XamlPreview.WinUI3XamlPreview" Version="0.0.0" />
+    <PackageReference Include="WinUI3XamlPreview" Version="0.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
@@ -47,6 +47,6 @@
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-	  <Exec Command="powershell -c &quot;if (test-path $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg) { exit 0 }; $(ProjectDir)..\scripts\build-nuget -version 0.0.0; move $(ProjectDir)..\Nuget\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg -destination $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.WinUI3XamlPreview.0.0.0.nupkg; nuget restore $(ProjectPath) -PackagesDirectory $(ProjectDir)..\packages&quot;" />
+	  <Exec Command="powershell -c &quot;if (test-path $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg) { exit 0 }; $(ProjectDir)..\scripts\build-nuget -version 0.0.0; move $(ProjectDir)..\Nuget\WinUI3XamlPreview.0.0.0.nupkg -destination $(ProjectDir)..\LocalPackages\WinUI3XamlPreview.0.0.0.nupkg; nuget restore $(ProjectPath) -PackagesDirectory $(ProjectDir)..\packages&quot;" />
   </Target>
 </Project>
diff --git a/WinUI3XamlPreview/WinUI3XamlPreview.sln b/WinUI3XamlPreview/WinUI3XamlPreview.sln
index 2c1dfc1..38bb3dd 100644
--- a/WinUI3XamlPreview/WinUI3XamlPreview.sln
+++ b/WinUI3XamlPreview/WinUI3XamlPreview.sln
@@ -27,240 +27,128 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNonWinRTDep", "TestNonW
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|Any CPU.Build.0 = Debug|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|ARM64.Build.0 = Debug|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x64.ActiveCfg = Debug|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x64.Build.0 = Debug|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x64.Deploy.0 = Debug|x64
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x86.ActiveCfg = Debug|Win32
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x86.Build.0 = Debug|Win32
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Debug|x86.Deploy.0 = Debug|Win32
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|Any CPU.ActiveCfg = Release|x64
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|Any CPU.Build.0 = Release|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|ARM64.ActiveCfg = Release|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|ARM64.Build.0 = Release|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|ARM64.Deploy.0 = Release|ARM64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x64.ActiveCfg = Release|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x64.Build.0 = Release|x64
 		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x64.Deploy.0 = Release|x64
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x86.ActiveCfg = Release|Win32
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x86.Build.0 = Release|Win32
-		{9DAF64AE-E801-49F0-9820-BA8F8D037093}.Release|x86.Deploy.0 = Release|Win32
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|x64.ActiveCfg = Debug|x64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|x64.Build.0 = Debug|x64
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|x86.ActiveCfg = Debug|Win32
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Debug|x86.Build.0 = Debug|Win32
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|Any CPU.ActiveCfg = Release|x64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|ARM64.ActiveCfg = Release|ARM64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|ARM64.Build.0 = Release|ARM64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|x64.ActiveCfg = Release|x64
 		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|x64.Build.0 = Release|x64
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|x86.ActiveCfg = Release|Win32
-		{A4C036F2-EAB5-4447-BA06-64D6C3E1AFF1}.Release|x86.Build.0 = Release|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x64.ActiveCfg = Debug|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x64.Build.0 = Debug|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x64.Deploy.0 = Debug|x64
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x86.ActiveCfg = Debug|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x86.Build.0 = Debug|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Debug|x86.Deploy.0 = Debug|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|Any CPU.ActiveCfg = Release|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|ARM64.Build.0 = Release|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|ARM64.Deploy.0 = Release|ARM64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x64.ActiveCfg = Release|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x64.Build.0 = Release|x64
 		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x64.Deploy.0 = Release|x64
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x86.ActiveCfg = Release|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x86.Build.0 = Release|Win32
-		{D732F8C9-C578-493A-AD12-99235412EB3D}.Release|x86.Deploy.0 = Release|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|Any CPU.Build.0 = Debug|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x64.ActiveCfg = Debug|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x64.Build.0 = Debug|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x64.Deploy.0 = Debug|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x86.ActiveCfg = Debug|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x86.Build.0 = Debug|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Debug|x86.Deploy.0 = Debug|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|Any CPU.ActiveCfg = Release|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|Any CPU.Build.0 = Release|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|Any CPU.Deploy.0 = Release|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|ARM64.Build.0 = Release|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|ARM64.Deploy.0 = Release|ARM64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x64.ActiveCfg = Release|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x64.Build.0 = Release|x64
 		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x64.Deploy.0 = Release|x64
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x86.ActiveCfg = Release|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x86.Build.0 = Release|Win32
-		{3EFC6AD6-6189-4B32-8ABC-6926BC82A65E}.Release|x86.Deploy.0 = Release|Win32
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|Any CPU.Build.0 = Debug|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x64.ActiveCfg = Debug|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x64.Build.0 = Debug|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x64.Deploy.0 = Debug|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x86.ActiveCfg = Debug|x86
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x86.Build.0 = Debug|x86
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Debug|x86.Deploy.0 = Debug|x86
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|Any CPU.ActiveCfg = Release|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|Any CPU.Build.0 = Release|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|Any CPU.Deploy.0 = Release|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|ARM64.ActiveCfg = Release|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|ARM64.Build.0 = Release|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|ARM64.Deploy.0 = Release|ARM64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x64.ActiveCfg = Release|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x64.Build.0 = Release|x64
 		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x64.Deploy.0 = Release|x64
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x86.ActiveCfg = Release|x86
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x86.Build.0 = Release|x86
-		{CE853703-DD5F-460B-8D06-ED9DA4795423}.Release|x86.Deploy.0 = Release|x86
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|x64.Build.0 = Debug|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Debug|x86.Build.0 = Debug|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|ARM64.Build.0 = Release|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|x64.ActiveCfg = Release|Any CPU
 		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|x64.Build.0 = Release|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|x86.ActiveCfg = Release|Any CPU
-		{FB3E9B3C-8352-4419-8946-AAB8C5E0D784}.Release|x86.Build.0 = Release|Any CPU
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|Any CPU.Build.0 = Debug|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x64.ActiveCfg = Debug|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x64.Build.0 = Debug|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x64.Deploy.0 = Debug|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x86.ActiveCfg = Debug|Win32
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x86.Build.0 = Debug|Win32
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Debug|x86.Deploy.0 = Debug|Win32
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|Any CPU.ActiveCfg = Release|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|Any CPU.Build.0 = Release|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|Any CPU.Deploy.0 = Release|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|ARM64.Build.0 = Release|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|ARM64.Deploy.0 = Release|ARM64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x64.ActiveCfg = Release|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x64.Build.0 = Release|x64
 		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x64.Deploy.0 = Release|x64
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x86.ActiveCfg = Release|Win32
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x86.Build.0 = Release|Win32
-		{20E315F8-5269-4F54-A0A3-596ADDAFE21E}.Release|x86.Deploy.0 = Release|Win32
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|Any CPU.Build.0 = Debug|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|ARM64.Build.0 = Debug|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x64.ActiveCfg = Debug|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x64.Build.0 = Debug|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x64.Deploy.0 = Debug|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x86.ActiveCfg = Debug|x86
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x86.Build.0 = Debug|x86
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Debug|x86.Deploy.0 = Debug|x86
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|Any CPU.ActiveCfg = Release|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|Any CPU.Build.0 = Release|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|Any CPU.Deploy.0 = Release|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|ARM64.ActiveCfg = Release|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|ARM64.Build.0 = Release|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|ARM64.Deploy.0 = Release|ARM64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x64.ActiveCfg = Release|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x64.Build.0 = Release|x64
 		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x64.Deploy.0 = Release|x64
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x86.ActiveCfg = Release|x86
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x86.Build.0 = Release|x86
-		{80338CC5-DAD1-4C65-B8E8-9ECC4474FE10}.Release|x86.Deploy.0 = Release|x86
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|Any CPU.Build.0 = Debug|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x64.ActiveCfg = Debug|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x64.Build.0 = Debug|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x64.Deploy.0 = Debug|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x86.ActiveCfg = Debug|Win32
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x86.Build.0 = Debug|Win32
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Debug|x86.Deploy.0 = Debug|Win32
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|Any CPU.ActiveCfg = Release|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|Any CPU.Build.0 = Release|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|Any CPU.Deploy.0 = Release|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|ARM64.ActiveCfg = Release|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|ARM64.Build.0 = Release|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|ARM64.Deploy.0 = Release|ARM64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x64.ActiveCfg = Release|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x64.Build.0 = Release|x64
 		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x64.Deploy.0 = Release|x64
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x86.ActiveCfg = Release|Win32
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x86.Build.0 = Release|Win32
-		{A5B149B5-3236-4F9E-8755-857EBC4BE4D4}.Release|x86.Deploy.0 = Release|Win32
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|Any CPU.Build.0 = Debug|x64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|x64.ActiveCfg = Debug|x64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|x64.Build.0 = Debug|x64
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|x86.ActiveCfg = Debug|Win32
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Debug|x86.Build.0 = Debug|Win32
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|Any CPU.ActiveCfg = Release|x64
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|Any CPU.Build.0 = Release|x64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|ARM64.ActiveCfg = Release|ARM64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|ARM64.Build.0 = Release|ARM64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|x64.ActiveCfg = Release|x64
 		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|x64.Build.0 = Release|x64
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|x86.ActiveCfg = Release|Win32
-		{B0B1B030-754A-40B7-A311-C96BAC9352DC}.Release|x86.Build.0 = Release|Win32
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|Any CPU.Build.0 = Debug|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|ARM64.ActiveCfg = Debug|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|ARM64.Build.0 = Debug|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|x64.ActiveCfg = Debug|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|x64.Build.0 = Debug|x64
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|x86.ActiveCfg = Debug|Win32
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Debug|x86.Build.0 = Debug|Win32
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|Any CPU.ActiveCfg = Release|x64
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|Any CPU.Build.0 = Release|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|ARM64.ActiveCfg = Release|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|ARM64.Build.0 = Release|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|x64.ActiveCfg = Release|x64
 		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|x64.Build.0 = Release|x64
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|x86.ActiveCfg = Release|Win32
-		{139F0229-1C0E-432E-9928-D8589E7FA87C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WinUI3XamlPreview/scripts/build-nuget.ps1 b/WinUI3XamlPreview/scripts/build-nuget.ps1
index 059c45e..6afc124 100644
--- a/WinUI3XamlPreview/scripts/build-nuget.ps1
+++ b/WinUI3XamlPreview/scripts/build-nuget.ps1
@@ -9,8 +9,11 @@ Set-Content -path $PSScriptRoot\..\Nuget\.nuspec -value $nuspec
 . "$PSScriptRoot\get-msbuild"
 nuget restore $PSScriptRoot\..\WinUI3XamlPreviewCs\WinUI3XamlPreviewCs.csproj
 nuget restore $PSScriptRoot\..\WinUI3XamlPreview\WinUI3XamlPreview.vcxproj -PackagesDirectory $PSScriptRoot\..\packages
+nuget restore $PSScriptRoot\..\WinUI3XamlPreview.DllLoader\WinUI3XamlPreview.DllLoader.vcxproj -PackagesDirectory $PSScriptRoot\..\packages
 &$msbuild $PSScriptRoot\.. -t:WinUI3XamlPreview -p:Platform=x64,Configuration=Release
 &$msbuild $PSScriptRoot\.. -t:WinUI3XamlPreviewCs -p:Platform="Any CPU" -p:Configuration=Release
+&$msbuild $PSScriptRoot\.. -t:WinUI3XamlPreview_DllLoader -p:Platform=x64,Configuration=Release
 # TODO: Fix ARM support. idlgen is attempting to use ARM64/idlgen.exe when the host is x64.
 #&$msbuild $PSScriptRoot\..\WinUI3XamlPreview\WinUI3XamlPreview.vcxproj -p:Platform=ARM64,Configuration=Release
+get-childitem $PSScriptRoot\..\x64\Release\WinUI3XamlPreview.DllLoader -exclude *.pdb | compress-archive -destinationpath $PSScriptRoot\..\Nuget\WinUI3XamlPreview.DllLoader.zip -force
 nuget pack $PSScriptRoot\..\Nuget\.nuspec -outputDirectory $PSScriptRoot\..\Nuget
diff --git a/WinUI3XamlPreview/test/test-file.cpp b/WinUI3XamlPreview/test/test-file.cpp
deleted file mode 100644
index 994077f..0000000
--- a/WinUI3XamlPreview/test/test-file.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace foo {
-	struct bar {};
-}
-
-int main() {
-	TARGET-NAMESPACE::bar baz;
-	return 0;
-}