From ce14e1ef5f104201554d7d93ef9e8c9a179fb032 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:23:01 +0200
Subject: [PATCH] fix(windows): fix `run-windows` not launching apps built with
 New Arch

---
 windows/Win32/ReactApp.Package.wapproj | 27 ++++++++++++++++++++++++++
 windows/Win32/pch.h                    |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/windows/Win32/ReactApp.Package.wapproj b/windows/Win32/ReactApp.Package.wapproj
index abf43544b..3040d6819 100644
--- a/windows/Win32/ReactApp.Package.wapproj
+++ b/windows/Win32/ReactApp.Package.wapproj
@@ -13,6 +13,17 @@
   </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.WindowsSdk.Default.props" />
   <PropertyGroup>
+    <!--
+      `AppxManifest.xml` is output relative to the `.wapproj` file and
+      `run-windows` cannot find it because it expects `.wapproj` to be in the
+      same directory as the solution. We need to change the output directory so
+      that `run-windows` can find the file.
+
+      Note that we don't use `OutDir` because the project name is always
+      appended to it, e.g. `x64/Debug/ReactApp.Package`.
+    -->
+    <BaseOutputPath>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), $(SolutionDir)))\$(MSBuildProjectName)\bin\</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)\$(Platform)\$(Configuration)\</OutputPath>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
   </PropertyGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
@@ -88,4 +99,20 @@
     <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.Package.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.Package.props'))" />
     <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.Package.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.Package.targets'))" />
   </Target>
+  <Target Name="CopyAppPackagesToOutputDirectory" AfterTargets="_GenerateAppxPackage">
+    <!--
+      `AppPackages` is output relative to the `.wapproj` file and `run-windows`
+      cannot find it because it expects `.wapproj` to be in the same directory
+      as the solution. We need to copy the files to the output directory so that
+      `run-windows` can find them.
+    -->
+    <ItemGroup>
+      <AppPackagesFiles Include="$(MSBuildThisFileDirectory)\AppPackages\**\*.*"/>
+    </ItemGroup>
+    <Copy
+      SourceFiles="@(AppPackagesFiles)"
+      DestinationFolder="$(BaseOutputPath)\..\AppPackages\%(RecursiveDir)"
+      UseSymbolicLinksIfPossible="true"
+    />
+  </Target>
 </Project>
diff --git a/windows/Win32/pch.h b/windows/Win32/pch.h
index 48a795460..585220a51 100644
--- a/windows/Win32/pch.h
+++ b/windows/Win32/pch.h
@@ -13,6 +13,10 @@
 #include <unknwn.h>
 
 // WinRT Header Files
+// clang-format off
+#include <winrt/base.h>
+// clang-format on
+
 #include <CppWinRTIncludes.h>
 
 #include <winrt/Microsoft.ReactNative.Composition.h>
@@ -22,7 +26,6 @@
 #include <winrt/Microsoft.UI.Dispatching.h>
 #include <winrt/Microsoft.UI.Windowing.h>
 #include <winrt/Microsoft.UI.interop.h>
-#include <winrt/base.h>
 
 // C RunTime Header Files
 #include <malloc.h>