react-native-windows 0.73.11 → 0.74.0-preview.2

package/templates/cpp-app/windows/MyApp/MyApp.cpp

@@ -4,49 +4,10 @@
 #include "pch.h"
 #include "{{ name }}.h"
 
-#include "../../node_modules/react-native-windows/codegen/NativeDeviceInfoSpec.g.h"
-
-#include <DispatcherQueue.h>
-#include <UIAutomation.h>
-
-#include <winrt/Microsoft.ReactNative.Composition.h>
-#include <winrt/Windows.UI.Composition.Desktop.h>
+#include "AutolinkedNativeModules.g.h"
 
 #include "NativeModules.h"
-#include "ReactPropertyBag.h"
-
-constexpr size_t MAX_LOADSTRING = 100;
-
-// Work around crash in DeviceInfo when running outside of XAML environment
-// TODO rework built-in DeviceInfo to allow it to be driven without use of HWNDs or XamlApps
-// Issue Tracking #11414
-REACT_MODULE(DeviceInfo)
-struct DeviceInfo {
-  using ModuleSpec = Microsoft::ReactNativeSpecs::DeviceInfoSpec;
-
-  REACT_INIT(Initialize)
-  void Initialize(React::ReactContext const &reactContext) noexcept {
-    m_context = reactContext;
-  }
 
-  REACT_GET_CONSTANTS(GetConstants)
-  Microsoft::ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants GetConstants() noexcept {
-    Microsoft::ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants constants;
-    Microsoft::ReactNativeSpecs::DeviceInfoSpec_DisplayMetrics screenDisplayMetrics;
-    screenDisplayMetrics.fontScale = 1;
-    screenDisplayMetrics.height = 1024;
-    screenDisplayMetrics.width = 1024;
-    screenDisplayMetrics.scale = 1;
-    constants.Dimensions.screen = screenDisplayMetrics;
-    constants.Dimensions.window = screenDisplayMetrics;
-    return constants;
-  }
-
- private:
-  winrt::Microsoft::ReactNative::ReactContext m_context;
-};
-
-// Have to use TurboModules to override built in modules.. so the standard attributed package provider doesn't work.
 struct CompReactPackageProvider
     : winrt::implements<CompReactPackageProvider, winrt::Microsoft::ReactNative::IReactPackageProvider> {
  public: // IReactPackageProvider
@@ -56,229 +17,153 @@ struct CompReactPackageProvider
 };
 
 // Global Variables:
-WCHAR szTitle[MAX_LOADSTRING]; // The title bar text
-WCHAR szWindowClass[MAX_LOADSTRING]; // the main window class name
+constexpr PCWSTR windowTitle = L"{{ mainComponentName }}";
+constexpr PCWSTR mainComponentName = L"{{ mainComponentName }}";
+
+float ScaleFactor(HWND hwnd) noexcept {
+  return GetDpiForWindow(hwnd) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
+}
 
-winrt::Windows::System::DispatcherQueueController g_dispatcherQueueController{nullptr};
-winrt::Windows::UI::Composition::Compositor g_compositor{nullptr};
+void UpdateRootViewSizeToAppWindow(
+    winrt::Microsoft::ReactNative::CompositionRootView const &rootView,
+    winrt::Microsoft::UI::Windowing::AppWindow const &window) {
+  auto hwnd = winrt::Microsoft::UI::GetWindowFromWindowId(window.Id());
+  auto scaleFactor = ScaleFactor(hwnd);
+  winrt::Windows::Foundation::Size size{
+      window.ClientSize().Width / scaleFactor, window.ClientSize().Height / scaleFactor};
+  // Do not relayout when minimized
+  if (window.Presenter().as<winrt::Microsoft::UI::Windowing::OverlappedPresenter>().State() !=
+      winrt::Microsoft::UI::Windowing::OverlappedPresenterState::Minimized) {
+    rootView.Arrange(size);
+    rootView.Size(size);
+  }
+}
 
-constexpr auto WindowDataProperty = L"WindowData";
-constexpr PCWSTR c_windowClassName = L"MS_REACTNATIVE_RNTESTER_COMPOSITION";
-constexpr PCWSTR appName = L"{{ mainComponentName }}";
+// Create and configure the ReactNativeHost
+winrt::Microsoft::ReactNative::ReactNativeHost CreateReactNativeHost(
+    HWND hwnd,
+    const winrt::Microsoft::UI::Composition::Compositor &compositor) {
+  WCHAR appDirectory[MAX_PATH];
+  GetModuleFileNameW(NULL, appDirectory, MAX_PATH);
+  PathCchRemoveFileSpec(appDirectory, MAX_PATH);
 
-// Forward declarations of functions included in this code module:
-LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-int RunRNTester(int showCmd);
+  auto host = winrt::Microsoft::ReactNative::ReactNativeHost();
 
-struct WindowData {
-  static HINSTANCE s_instance;
-  static constexpr uint16_t defaultDebuggerPort{9229};
+  // Include any autolinked modules
+  RegisterAutolinkedNativeModulePackages(host.PackageProviders());
 
-  bool m_windowInited{false};
-  winrt::Microsoft::ReactNative::CompositionHwndHost m_CompositionHwndHost{nullptr};
-  winrt::Microsoft::ReactNative::ReactNativeHost m_host{nullptr};
-  winrt::Microsoft::ReactNative::ReactInstanceSettings m_instanceSettings{nullptr};
+  host.PackageProviders().Append(winrt::make<CompReactPackageProvider>());
 
 #if BUNDLE
-  std::wstring m_bundleFile = L"index.windows";
-  bool m_useWebDebugger{false};
-  bool m_fastRefreshEnabled{false};
+  host.InstanceSettings().JavaScriptBundleFile(L"index.windows");
+  host.InstanceSettings().BundleRootPath(std::wstring(L"file://").append(appDirectory).append(L"\\Bundle\\").c_str());
+  host.InstanceSettings().UseFastRefresh(false);
 #else
-  std::wstring m_bundleFile = L"index";
-  bool m_useWebDebugger{false};
-  bool m_fastRefreshEnabled{true};
+  host.InstanceSettings().JavaScriptBundleFile(L"index");
+  host.InstanceSettings().UseFastRefresh(true);
 #endif
 
-  bool m_useDirectDebugger{false};
-  bool m_breakOnNextLine{false};
-  uint16_t m_debuggerPort{defaultDebuggerPort};
-  xaml::ElementTheme m_theme{xaml::ElementTheme::Default};
-
-  WindowData(const winrt::Microsoft::ReactNative::CompositionHwndHost &compHost) : m_CompositionHwndHost(compHost) {
-    winrt::Microsoft::ReactNative::Composition::CompositionUIService::SetCompositionContext(
-        InstanceSettings().Properties(),
-        winrt::Microsoft::ReactNative::Composition::WindowsCompositionContextHelper::CreateContext(g_compositor));
-  }
-
-  static WindowData *GetFromWindow(HWND hwnd) {
-    auto data = reinterpret_cast<WindowData *>(GetProp(hwnd, WindowDataProperty));
-    return data;
-  }
-
-  winrt::Microsoft::ReactNative::ReactNativeHost Host() noexcept {
-    if (!m_host) {
-      m_host = winrt::Microsoft::ReactNative::ReactNativeHost();
-      m_host.InstanceSettings(InstanceSettings());
-    }
-
-    return m_host;
-  }
-
-  winrt::Microsoft::ReactNative::ReactInstanceSettings InstanceSettings() noexcept {
-    if (!m_instanceSettings) {
-      m_instanceSettings = winrt::Microsoft::ReactNative::ReactInstanceSettings();
-    }
-
-    return m_instanceSettings;
-  }
-
-  LRESULT RenderApp(HWND hwnd) {
-    WCHAR workingDir[MAX_PATH];
-    GetCurrentDirectory(MAX_PATH, workingDir);
-
-    auto host = Host();
-    // Disable until we have a 3rd party story for custom components
-    // RegisterAutolinkedNativeModulePackages(host.PackageProviders()); // Includes any
-    // autolinked modules
-
-    host.InstanceSettings().JavaScriptBundleFile(m_bundleFile);
-
-    host.InstanceSettings().UseWebDebugger(m_useWebDebugger);
-    host.InstanceSettings().UseDirectDebugger(m_useDirectDebugger);
-    host.InstanceSettings().BundleRootPath(std::wstring(L"file:").append(workingDir).append(L"\\Bundle\\").c_str());
-    host.InstanceSettings().DebuggerBreakOnNextLine(m_breakOnNextLine);
-    host.InstanceSettings().UseFastRefresh(m_fastRefreshEnabled);
-    host.InstanceSettings().DebuggerPort(m_debuggerPort);
-    host.InstanceSettings().UseDeveloperSupport(true);
-
-    host.PackageProviders().Append(winrt::make<CompReactPackageProvider>());
-    winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
-        host.InstanceSettings().Properties(), reinterpret_cast<uint64_t>(hwnd));
-
-    // Nudge the ReactNativeHost to create the instance and wrapping context
-    host.ReloadInstance();
-
-    winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
-    viewOptions.ComponentName(appName);
-    m_CompositionHwndHost.ReactViewHost(
-        winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
-
-    auto windowData = WindowData::GetFromWindow(hwnd);
-    if (!windowData->m_windowInited) {
-      m_CompositionHwndHost.Initialize((uint64_t)(hwnd));
-      windowData->m_windowInited = true;
-    }
-    return 0;
-  }
-
-  LRESULT TranslateMessage(UINT message, WPARAM wparam, LPARAM lparam) noexcept {
-    if (m_CompositionHwndHost) {
-      return static_cast<LRESULT>(m_CompositionHwndHost.TranslateMessage(message, wparam, lparam));
-    }
-    return 0;
-  }
-};
-
-extern "C" IMAGE_DOS_HEADER __ImageBase;
-HINSTANCE WindowData::s_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
-  auto windowData = WindowData::GetFromWindow(hWnd);
-  if (windowData) {
-    auto result = WindowData::GetFromWindow(hWnd)->TranslateMessage(message, wParam, lParam);
-    if (result)
-      return result;
-  }
+#if _DEBUG
+  host.InstanceSettings().UseDirectDebugger(true);
+  host.InstanceSettings().UseDeveloperSupport(true);
+#else
+  host.InstanceSettings().UseDirectDebugger(false);
+  host.InstanceSettings().UseDeveloperSupport(false);
+#endif
 
-  switch (message) {
-    case WM_DESTROY: {
-      delete WindowData::GetFromWindow(hWnd);
-      SetProp(hWnd, WindowDataProperty, 0);
-      PostQuitMessage(0);
-      return 0;
-    }
-    case WM_NCCREATE: {
-      auto cs = reinterpret_cast<CREATESTRUCT *>(lParam);
-      auto windowData = static_cast<WindowData *>(cs->lpCreateParams);
-      WINRT_ASSERT(windowData);
-      SetProp(hWnd, WindowDataProperty, reinterpret_cast<HANDLE>(windowData));
-      break;
-    }
-    case WM_GETOBJECT: {
-      {
-        auto windowData = WindowData::GetFromWindow(hWnd);
-        if (windowData == nullptr || !windowData->m_windowInited)
-          break;
-
-        auto hwndHost = windowData->m_CompositionHwndHost;
-        winrt::com_ptr<IRawElementProviderSimple> spReps;
-        if (!hwndHost.UiaProvider().try_as(spReps)) {
-          break;
-        }
-        LRESULT lResult = UiaReturnRawElementProvider(hWnd, wParam, lParam, spReps.get());
-        return lResult;
-      }
-    }
-  }
+  winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
+      host.InstanceSettings().Properties(), reinterpret_cast<uint64_t>(hwnd));
 
-  return DefWindowProc(hWnd, message, wParam, lParam);
-}
+  // By using the MicrosoftCompositionContextHelper here, React Native Windows will use Lifted Visuals for its
+  // tree.
+  winrt::Microsoft::ReactNative::Composition::CompositionUIService::SetCompositionContext(
+      host.InstanceSettings().Properties(),
+      winrt::Microsoft::ReactNative::Composition::MicrosoftCompositionContextHelper::CreateContext(compositor));
 
-int RunRNTester(int showCmd) {
-  auto windowData = std::make_unique<WindowData>(winrt::Microsoft::ReactNative::CompositionHwndHost());
-  HWND hwnd = CreateWindow(
-      c_windowClassName,
-      appName,
-      WS_OVERLAPPEDWINDOW,
-      CW_USEDEFAULT,
-      CW_USEDEFAULT,
-      CW_USEDEFAULT,
-      CW_USEDEFAULT,
-      nullptr,
-      nullptr,
-      WindowData::s_instance,
-      windowData.get());
-
-  WINRT_VERIFY(hwnd);
-
-  windowData.release();
-
-  ShowWindow(hwnd, showCmd);
-  UpdateWindow(hwnd);
-  SetFocus(hwnd);
-  WindowData::GetFromWindow(hwnd)->RenderApp(hwnd);
-
-  HACCEL hAccelTable = LoadAccelerators(WindowData::s_instance, MAKEINTRESOURCE(IDC_RNTESTER_COMPOSITION));
-
-  MSG msg = {};
-  while (GetMessage(&msg, nullptr, 0, 0)) {
-    if (!TranslateAccelerator(hwnd, hAccelTable, &msg)) {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-  }
-  return static_cast<int>(msg.wParam);
+  return host;
 }
 
 _Use_decl_annotations_ int CALLBACK WinMain(HINSTANCE instance, HINSTANCE, PSTR /* commandLine */, int showCmd) {
-  WNDCLASSEXW wcex = {};
-  wcex.cbSize = sizeof(WNDCLASSEX);
-  wcex.style = CS_HREDRAW | CS_VREDRAW;
-  wcex.lpfnWndProc = &WndProc;
-  wcex.cbClsExtra = DLGWINDOWEXTRA;
-  wcex.cbWndExtra = sizeof(WindowData *);
-  wcex.hInstance = WindowData::s_instance;
-  wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
-  wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-  wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_RNTESTER_COMPOSITION);
-  wcex.lpszClassName = c_windowClassName;
-  wcex.hIcon = LoadIconW(instance, MAKEINTRESOURCEW(IDI_ICON1));
-  ATOM classId = RegisterClassEx(&wcex);
-  WINRT_VERIFY(classId);
-  winrt::check_win32(!classId);
-
-  DispatcherQueueOptions options{
-      sizeof(DispatcherQueueOptions), /* dwSize */
-      DQTYPE_THREAD_CURRENT, /* threadType */
-      DQTAT_COM_ASTA /* apartmentType */
-  };
-
-  // Need to have a Dispatcher on the current thread to be able to create a Compositor
-  winrt::check_hresult(CreateDispatcherQueueController(
-      options,
-      reinterpret_cast<ABI::Windows::System::IDispatcherQueueController **>(
-          winrt::put_abi(g_dispatcherQueueController))));
-
-  g_compositor = winrt::Windows::UI::Composition::Compositor();
-  return RunRNTester(showCmd);
+  // Initialize WinRT.
+  winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+  // Enable per monitor DPI scaling
+  SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+
+  // Create a DispatcherQueue for this thread.  This is needed for Composition, Content, and
+  // Input APIs.
+  auto dispatcherQueueController{winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread()};
+
+  // Create a Compositor for all Content on this thread.
+  auto compositor{winrt::Microsoft::UI::Composition::Compositor()};
+
+  // Create a top-level window.
+  auto window = winrt::Microsoft::UI::Windowing::AppWindow::Create();
+  window.Title(windowTitle);
+  window.Resize({1000, 1000});
+  window.Show();
+  auto hwnd = winrt::Microsoft::UI::GetWindowFromWindowId(window.Id());
+  auto scaleFactor = ScaleFactor(hwnd);
+
+  auto host = CreateReactNativeHost(hwnd, compositor);
+
+  // Start the react-native instance, which will create a JavaScript runtime and load the applications bundle
+  host.ReloadInstance();
+
+  // Create a RootView which will present a react-native component
+  winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
+  viewOptions.ComponentName(mainComponentName);
+  auto rootView = winrt::Microsoft::ReactNative::CompositionRootView(compositor);
+  rootView.ReactViewHost(winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
+
+  // Update the size of the RootView when the AppWindow changes size
+  window.Changed([wkRootView = winrt::make_weak(rootView)](
+                     winrt::Microsoft::UI::Windowing::AppWindow const &window,
+                     winrt::Microsoft::UI::Windowing::AppWindowChangedEventArgs const &args) {
+    if (args.DidSizeChange() || args.DidVisibilityChange()) {
+      if (auto rootView = wkRootView.get()) {
+        UpdateRootViewSizeToAppWindow(rootView, window);
+      }
+    }
+  });
+
+  // Quit application when main window is closed
+  window.Destroying(
+      [host](winrt::Microsoft::UI::Windowing::AppWindow const &window, winrt::IInspectable const & /*args*/) {
+        // Before we shutdown the application - unload the ReactNativeHost to give the javascript a chance to save any
+        // state
+        auto async = host.UnloadInstance();
+        async.Completed([host](auto asyncInfo, winrt::Windows::Foundation::AsyncStatus asyncStatus) {
+          assert(asyncStatus == winrt::Windows::Foundation::AsyncStatus::Completed);
+          host.InstanceSettings().UIDispatcher().Post([]() { PostQuitMessage(0); });
+        });
+      });
+
+  // DesktopChildSiteBridge create a ContentSite that can host the RootView ContentIsland
+  auto bridge = winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(compositor, window.Id());
+  bridge.Connect(rootView.Island());
+  bridge.ResizePolicy(winrt::Microsoft::UI::Content::ContentSizePolicy::ResizeContentToParentWindow);
+
+  auto invScale = 1.0f / scaleFactor;
+  rootView.RootVisual().Scale({invScale, invScale, invScale});
+  rootView.ScaleFactor(scaleFactor);
+
+  // Set the intialSize of the root view
+  UpdateRootViewSizeToAppWindow(rootView, window);
+
+  bridge.Show();
+
+  // Run the main application event loop
+  dispatcherQueueController.DispatcherQueue().RunEventLoop();
+
+  // Rundown the DispatcherQueue. This drains the queue and raises events to let components
+  // know the message loop has finished.
+  dispatcherQueueController.ShutdownQueue();
+
+  bridge.Close();
+  bridge = nullptr;
+
+  // Destroy all Composition objects
+  compositor.Close();
+  compositor = nullptr;
 }

package/templates/cpp-app/windows/MyApp/MyApp.vcxproj

@@ -16,8 +16,6 @@
   </PropertyGroup>
   <PropertyGroup Label="ReactNativeWindowsProps">
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
-    <!-- https://github.com/microsoft/react-native-windows/issues/8591 -->
-    <RunAutolinkCheck>false</RunAutolinkCheck>
   </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.WindowsSdk.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -38,13 +36,15 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -101,16 +101,20 @@
   <ItemGroup>
     <ClInclude Include="{{ name }}.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="AutolinkedNativeModules.g.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="{{ name }}.cpp" />
+    <ClCompile Include="AutolinkedNativeModules.g.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -120,9 +124,6 @@
     <Image Include="{{ name }}.ico" />
     <Image Include="small.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ReactNativeWindowsTargets">
     <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets')" />

package/templates/cpp-app/windows/MyApp/MyApp.vcxproj.filters

@@ -24,6 +24,9 @@
     <ClInclude Include="{{ name }}.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="AutolinkedNativeModules.g.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -32,6 +35,9 @@
     <ClCompile Include="{{ name }}.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="AutolinkedNativeModules.g.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -49,7 +55,4 @@
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
 </Project>

package/templates/cpp-app/windows/MyApp/pch.h

@@ -13,16 +13,21 @@
 
 // Windows Header Files
 #include <windows.h>
-
-#pragma push_macro("GetCurrentTime")
 #undef GetCurrentTime
+#include <pathcch.h>
+#include <unknwn.h>
+
+// WinRT Header Files
+#include <winrt/base.h>
 
-// Playground pch.h
 #include <CppWinRTIncludes.h>
+#include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Microsoft.ReactNative.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.Foundation.h>
-#pragma pop_macro("GetCurrentTime")
+#include <winrt/Microsoft.UI.Composition.h>
+#include <winrt/Microsoft.UI.Content.h>
+#include <winrt/Microsoft.UI.Dispatching.h>
+#include <winrt/Microsoft.UI.Windowing.h>
+#include <winrt/Microsoft.UI.interop.h>
 
 // C RunTime Header Files
 #include <malloc.h>
@@ -30,6 +35,4 @@
 #include <stdlib.h>
 #include <tchar.h>
 
-// reference additional headers your program requires here
-#include <unknwn.h>
-#include <winrt/base.h>
+// Reference additional headers your project requires here

package/templates/cpp-app/windows/MyApp/resource.h

@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by {{ name }}.rc
 
-#define IDC_RNTESTER_COMPOSITION 100
 #define IDI_ICON1 1008
 // Next default values for new objects
 //

package/templates/cpp-app/windows/MyApp.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "{{ name }}.Package", "{{ name }}.Package\{{ name }}.Package.wapproj", "{{ packageGuidUpper }}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{ name }}.vcxproj", "{{ projectGuidUpper }}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
 	EndProjectSection
 EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "{{ name }}.Package", "{{ name }}.Package\{{ name }}.Package.wapproj", "{{ packageGuidUpper }}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
@@ -56,42 +56,42 @@ Global
 		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{{ projectGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{{ projectGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
-		{{ projectGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{{ projectGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64
-		{{ projectGuidUpper }}.Debug|x64.Build.0 = Debug|x64
-		{{ projectGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64
-		{{ projectGuidUpper }}.Debug|x86.ActiveCfg = Debug|Win32
-		{{ projectGuidUpper }}.Debug|x86.Build.0 = Debug|Win32
-		{{ projectGuidUpper }}.Debug|x86.Deploy.0 = Debug|Win32
-		{{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
-		{{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
-		{{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
-		{{ projectGuidUpper }}.Release|x64.ActiveCfg = Release|x64
-		{{ projectGuidUpper }}.Release|x64.Build.0 = Release|x64
-		{{ projectGuidUpper }}.Release|x64.Deploy.0 = Release|x64
-		{{ projectGuidUpper }}.Release|x86.ActiveCfg = Release|Win32
-		{{ projectGuidUpper }}.Release|x86.Build.0 = Release|Win32
-		{{ projectGuidUpper }}.Release|x86.Deploy.0 = Release|Win32
-		{{ packageGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{{ packageGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
-		{{ packageGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{{ packageGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64
 		{{ packageGuidUpper }}.Debug|x64.Build.0 = Debug|x64
 		{{ packageGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64
 		{{ packageGuidUpper }}.Debug|x86.ActiveCfg = Debug|x86
 		{{ packageGuidUpper }}.Debug|x86.Build.0 = Debug|x86
 		{{ packageGuidUpper }}.Debug|x86.Deploy.0 = Debug|x86
-		{{ packageGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
-		{{ packageGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
-		{{ packageGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
+		{{ packageGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{{ packageGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
+		{{ packageGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{{ packageGuidUpper }}.Release|x64.ActiveCfg = Release|x64
 		{{ packageGuidUpper }}.Release|x64.Build.0 = Release|x64
 		{{ packageGuidUpper }}.Release|x64.Deploy.0 = Release|x64
 		{{ packageGuidUpper }}.Release|x86.ActiveCfg = Release|x86
 		{{ packageGuidUpper }}.Release|x86.Build.0 = Release|x86
 		{{ packageGuidUpper }}.Release|x86.Deploy.0 = Release|x86
+		{{ packageGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
+		{{ packageGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
+		{{ packageGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
+		{{ projectGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64
+		{{ projectGuidUpper }}.Debug|x64.Build.0 = Debug|x64
+		{{ projectGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64
+		{{ projectGuidUpper }}.Debug|x86.ActiveCfg = Debug|Win32
+		{{ projectGuidUpper }}.Debug|x86.Build.0 = Debug|Win32
+		{{ projectGuidUpper }}.Debug|x86.Deploy.0 = Debug|Win32
+		{{ projectGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{{ projectGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
+		{{ projectGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{{ projectGuidUpper }}.Release|x64.ActiveCfg = Release|x64
+		{{ projectGuidUpper }}.Release|x64.Build.0 = Release|x64
+		{{ projectGuidUpper }}.Release|x64.Deploy.0 = Release|x64
+		{{ projectGuidUpper }}.Release|x86.ActiveCfg = Release|Win32
+		{{ projectGuidUpper }}.Release|x86.Build.0 = Release|Win32
+		{{ projectGuidUpper }}.Release|x86.Deploy.0 = Release|Win32
+		{{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
+		{{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
+		{{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64