react-native-windows 0.0.0-canary.708 → 0.0.0-canary.709

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -9,12 +9,10 @@
 
 using namespace winrt;
 using namespace Windows::Foundation;
-#ifndef USE_WINUI3
 #include "winrt/Windows.System.h"
-using namespace Windows::System;
-#else
+
+#ifdef USE_WINUI3
 #include "winrt/Microsoft.UI.Dispatching.h"
-using namespace Microsoft::UI::Dispatching;
 #endif
 
 namespace Mso {
@@ -67,29 +65,68 @@ struct ThreadSafeMap {
 
 } // namespace
 
+template <typename TDispatcherTraits>
 struct UISchedulerWinRT;
 
+template <typename TDispatcherTraits>
+struct DispatcherTraits {};
+
+template <typename TDispatcherTraits>
+struct TaskDispatcherHandler;
+
+struct WindowsTypeTag;
+using WindowsTaskDispatcherHandler = TaskDispatcherHandler<DispatcherTraits<WindowsTypeTag>>;
+
+template <>
+struct DispatcherTraits<WindowsTypeTag> {
+  using DispatcherQueueHandler = Windows::System::DispatcherQueueHandler;
+  using DispatcherQueue = Windows::System::DispatcherQueue;
+  using DispatcherQueue_ShutdownCompleted_revoker = Windows::System::DispatcherQueue::ShutdownCompleted_revoker;
+  using TaskDispatcherHandler = WindowsTaskDispatcherHandler;
+};
+using WindowsDispatcherTraits = DispatcherTraits<WindowsTypeTag>;
+
+#ifdef USE_WINUI3
+struct MicrosoftTypeTag;
+using MicrosoftTaskDispatcherHandler = TaskDispatcherHandler<DispatcherTraits<MicrosoftTypeTag>>;
+
+template <>
+struct DispatcherTraits<MicrosoftTypeTag> {
+  using DispatcherQueueHandler = Microsoft::UI::Dispatching::DispatcherQueueHandler;
+  using DispatcherQueue = Microsoft::UI::Dispatching::DispatcherQueue;
+  using DispatcherQueue_ShutdownCompleted_revoker =
+      Microsoft::UI::Dispatching::DispatcherQueue::ShutdownCompleted_revoker;
+  using TaskDispatcherHandler = MicrosoftTaskDispatcherHandler;
+};
+using MicrosoftDispatcherTraits = DispatcherTraits<MicrosoftTypeTag>;
+
+#endif
+
 //! TaskDispatcherHandler is a DispatcherQueueHandler delegate that we pass to DispatcherQueue.
 //! We use custom ref counting to avoid extra memory allocations and to handle reference to DispatchTask.
-struct TaskDispatcherHandler final : impl::abi_t<DispatcherQueueHandler> {
-  TaskDispatcherHandler(UISchedulerWinRT *scheduler) noexcept;
+template <typename TDispatcherTraits>
+struct TaskDispatcherHandler final : impl::abi_t<typename TDispatcherTraits::DispatcherQueueHandler> {
+  TaskDispatcherHandler(UISchedulerWinRT<TDispatcherTraits> *scheduler) noexcept;
   int32_t __stdcall QueryInterface(guid const &id, void **result) noexcept final;
   uint32_t __stdcall AddRef() noexcept final;
   uint32_t __stdcall Release() noexcept final;
   int32_t __stdcall Invoke() noexcept final;
 
  private:
-  UISchedulerWinRT *m_scheduler;
+  UISchedulerWinRT<TDispatcherTraits> *m_scheduler;
 };
 
+using WindowsTaskDispatcherHandler = TaskDispatcherHandler<DispatcherTraits<WindowsTypeTag>>;
+
+template <typename TDispatcherTraits>
 struct UISchedulerWinRT : Mso::UnknownObject<Mso::RefCountStrategy::WeakRef, IDispatchQueueScheduler> {
-  UISchedulerWinRT(DispatcherQueue &&dispatcher) noexcept;
+  UISchedulerWinRT(typename TDispatcherTraits::DispatcherQueue &&dispatcher) noexcept;
   ~UISchedulerWinRT() noexcept override;
 
   uint32_t AddHandlerRef() noexcept;
   uint32_t ReleaseHandlerRef() noexcept;
 
-  DispatcherQueueHandler MakeDispatcherQueueHandler() noexcept;
+  typename TDispatcherTraits::DispatcherQueueHandler MakeDispatcherQueueHandler() noexcept;
   bool TryTakeTask(Mso::CntPtr<IDispatchQueueService> &queue, DispatchTask &task) noexcept;
 
   static DispatchQueue GetOrCreateUIThreadQueue() noexcept;
@@ -120,8 +157,8 @@ struct UISchedulerWinRT : Mso::UnknownObject<Mso::RefCountStrategy::WeakRef, IDi
   };
 
  private:
-  DispatcherQueue m_dispatcher{nullptr};
-  TaskDispatcherHandler m_dispatcherHandler{this};
+  typename TDispatcherTraits::DispatcherQueue m_dispatcher{nullptr};
+  typename TDispatcherTraits::TaskDispatcherHandler m_dispatcherHandler{this};
   ManualResetEvent m_terminationEvent;
   ThreadMutex m_mutex;
   Mso::WeakPtr<IDispatchQueueService> m_queue;
@@ -130,19 +167,22 @@ struct UISchedulerWinRT : Mso::UnknownObject<Mso::RefCountStrategy::WeakRef, IDi
   uint32_t m_taskCount{0};
   bool m_isShutdown{false};
   std::thread::id m_threadId{std::this_thread::get_id()};
-  DispatcherQueue::ShutdownCompleted_revoker m_shutdownCompletedRevoker;
+  typename TDispatcherTraits::DispatcherQueue_ShutdownCompleted_revoker m_shutdownCompletedRevoker;
 };
 
 //=============================================================================
 // TaskDispatcherHandler implementation
 //=============================================================================
 
-TaskDispatcherHandler::TaskDispatcherHandler(UISchedulerWinRT *scheduler) noexcept : m_scheduler{scheduler} {}
+template <typename TDispatcherTraits>
+TaskDispatcherHandler<TDispatcherTraits>::TaskDispatcherHandler(UISchedulerWinRT<TDispatcherTraits> *scheduler) noexcept
+    : m_scheduler{scheduler} {}
 
-int32_t __stdcall TaskDispatcherHandler::QueryInterface(guid const &id, void **result) noexcept {
-  if (is_guid_of<DispatcherQueueHandler>(id) || is_guid_of<Windows::Foundation::IUnknown>(id) ||
-      is_guid_of<IAgileObject>(id)) {
-    *result = static_cast<impl::abi_t<DispatcherQueueHandler> *>(this);
+template <typename TDispatcherTraits>
+int32_t __stdcall TaskDispatcherHandler<TDispatcherTraits>::QueryInterface(guid const &id, void **result) noexcept {
+  if (is_guid_of<typename TDispatcherTraits::DispatcherQueueHandler>(id) ||
+      is_guid_of<Windows::Foundation::IUnknown>(id) || is_guid_of<IAgileObject>(id)) {
+    *result = static_cast<impl::abi_t<typename TDispatcherTraits::DispatcherQueueHandler> *>(this);
     AddRef();
     return impl::error_ok;
   }
@@ -155,15 +195,18 @@ int32_t __stdcall TaskDispatcherHandler::QueryInterface(guid const &id, void **r
   return impl::error_no_interface;
 }
 
-uint32_t __stdcall TaskDispatcherHandler::AddRef() noexcept {
+template <typename TDispatcherTraits>
+uint32_t __stdcall TaskDispatcherHandler<TDispatcherTraits>::AddRef() noexcept {
   return m_scheduler->AddHandlerRef();
 }
 
-uint32_t __stdcall TaskDispatcherHandler::Release() noexcept {
+template <typename TDispatcherTraits>
+uint32_t __stdcall TaskDispatcherHandler<TDispatcherTraits>::Release() noexcept {
   return m_scheduler->ReleaseHandlerRef();
 }
 
-int32_t __stdcall TaskDispatcherHandler::Invoke() noexcept {
+template <typename TDispatcherTraits>
+int32_t __stdcall TaskDispatcherHandler<TDispatcherTraits>::Invoke() noexcept {
   Mso::CntPtr<IDispatchQueueService> queue;
   DispatchTask task;
   if (m_scheduler->TryTakeTask(queue, task)) {
@@ -177,24 +220,29 @@ int32_t __stdcall TaskDispatcherHandler::Invoke() noexcept {
 // UISchedulerWinRT implementation
 //=============================================================================
 
-UISchedulerWinRT::UISchedulerWinRT(DispatcherQueue &&dispatcher) noexcept : m_dispatcher{std::move(dispatcher)} {
-  m_shutdownCompletedRevoker =
-      m_dispatcher.ShutdownCompleted(winrt::auto_revoke, [](DispatcherQueue const &, IInspectable const &) noexcept {
+template <typename TDispatcherTraits>
+UISchedulerWinRT<TDispatcherTraits>::UISchedulerWinRT(typename TDispatcherTraits::DispatcherQueue &&dispatcher) noexcept
+    : m_dispatcher{std::move(dispatcher)} {
+  m_shutdownCompletedRevoker = m_dispatcher.ShutdownCompleted(
+      winrt::auto_revoke, [](typename TDispatcherTraits::DispatcherQueue const &, IInspectable const &) noexcept {
         GetDispatchQueueRegistry().Remove(std::this_thread::get_id());
       });
 }
 
-UISchedulerWinRT::~UISchedulerWinRT() noexcept {
+template <typename TDispatcherTraits>
+UISchedulerWinRT<TDispatcherTraits>::~UISchedulerWinRT() noexcept {
   GetDispatchQueueRegistry().Remove(m_threadId);
   AwaitTermination();
 }
 
-uint32_t UISchedulerWinRT::AddHandlerRef() noexcept {
+template <typename TDispatcherTraits>
+uint32_t UISchedulerWinRT<TDispatcherTraits>::AddHandlerRef() noexcept {
   std::lock_guard lock{m_mutex};
   return ++m_handlerRefCount;
 }
 
-uint32_t UISchedulerWinRT::ReleaseHandlerRef() noexcept {
+template <typename TDispatcherTraits>
+uint32_t UISchedulerWinRT<TDispatcherTraits>::ReleaseHandlerRef() noexcept {
   Mso::CntPtr<UISchedulerWinRT> self;
   CleanupContext context{this};
 
@@ -213,7 +261,10 @@ uint32_t UISchedulerWinRT::ReleaseHandlerRef() noexcept {
   }
 }
 
-bool UISchedulerWinRT::TryTakeTask(Mso::CntPtr<IDispatchQueueService> &queue, DispatchTask &task) noexcept {
+template <typename TDispatcherTraits>
+bool UISchedulerWinRT<TDispatcherTraits>::TryTakeTask(
+    Mso::CntPtr<IDispatchQueueService> &queue,
+    DispatchTask &task) noexcept {
   {
     std::lock_guard lock{m_mutex};
     VerifyElseCrashSz(m_taskCount, "Task count cannot be negative");
@@ -227,7 +278,9 @@ bool UISchedulerWinRT::TryTakeTask(Mso::CntPtr<IDispatchQueueService> &queue, Di
   return false;
 }
 
-DispatcherQueueHandler UISchedulerWinRT::MakeDispatcherQueueHandler() noexcept {
+template <typename TDispatcherTraits>
+typename TDispatcherTraits::DispatcherQueueHandler
+UISchedulerWinRT<TDispatcherTraits>::MakeDispatcherQueueHandler() noexcept {
   VerifyElseCrash(m_mutex.IsLockedByMe());
 
   if (m_handlerRefCount == 0) {
@@ -238,22 +291,26 @@ DispatcherQueueHandler UISchedulerWinRT::MakeDispatcherQueueHandler() noexcept {
   return {static_cast<void *>(&m_dispatcherHandler), take_ownership_from_abi};
 }
 
-void UISchedulerWinRT::InitializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept {
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::InitializeScheduler(Mso::WeakPtr<IDispatchQueueService> &&queue) noexcept {
   m_queue = std::move(queue);
 }
 
-bool UISchedulerWinRT::HasThreadAccess() noexcept {
+template <typename TDispatcherTraits>
+bool UISchedulerWinRT<TDispatcherTraits>::HasThreadAccess() noexcept {
   // m_dispatcher.HasThreadAccess() is implemented only in Windows 19H1.
   // We must use an alternative implementation.
   return m_threadId == std::this_thread::get_id();
 }
 
-bool UISchedulerWinRT::IsSerial() noexcept {
+template <typename TDispatcherTraits>
+bool UISchedulerWinRT<TDispatcherTraits>::IsSerial() noexcept {
   return true;
 }
 
-void UISchedulerWinRT::Post() noexcept {
-  DispatcherQueueHandler handler;
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::Post() noexcept {
+  typename TDispatcherTraits::DispatcherQueueHandler handler;
   {
     std::lock_guard lock{m_mutex};
     if (!m_isShutdown) {
@@ -267,7 +324,8 @@ void UISchedulerWinRT::Post() noexcept {
   }
 }
 
-void UISchedulerWinRT::Shutdown() noexcept {
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::Shutdown() noexcept {
   CleanupContext context{this};
   {
     std::lock_guard lock{m_mutex};
@@ -276,12 +334,14 @@ void UISchedulerWinRT::Shutdown() noexcept {
   }
 }
 
-void UISchedulerWinRT::AwaitTermination() noexcept {
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::AwaitTermination() noexcept {
   Shutdown();
   m_terminationEvent.Wait();
 }
 
-/*static*/ DispatchQueue UISchedulerWinRT::GetOrCreateUIThreadQueue() noexcept {
+template <typename TDispatcherTraits>
+/*static*/ DispatchQueue UISchedulerWinRT<TDispatcherTraits>::GetOrCreateUIThreadQueue() noexcept {
   std::thread::id threadId{std::this_thread::get_id()};
   std::optional<Mso::WeakPtr<IDispatchQueueService>> weakQueue = GetDispatchQueueRegistry().Get(threadId);
   DispatchQueue queue{weakQueue.value_or(nullptr).GetStrongPtr()};
@@ -289,9 +349,9 @@ void UISchedulerWinRT::AwaitTermination() noexcept {
     return queue;
   }
 
-  decltype(DispatcherQueue::GetForCurrentThread()) dispatcher{nullptr};
+  decltype(TDispatcherTraits::DispatcherQueue::GetForCurrentThread()) dispatcher{nullptr};
   try {
-    dispatcher = DispatcherQueue::GetForCurrentThread();
+    dispatcher = TDispatcherTraits::DispatcherQueue::GetForCurrentThread();
   } catch (winrt::hresult_error const &) {
   }
 
@@ -305,7 +365,9 @@ void UISchedulerWinRT::AwaitTermination() noexcept {
   return queue;
 }
 
-/*static*/ UISchedulerWinRT::DispatchQueueRegistry &UISchedulerWinRT::GetDispatchQueueRegistry() noexcept {
+template <typename TDispatcherTraits>
+/*static*/ typename UISchedulerWinRT<TDispatcherTraits>::DispatchQueueRegistry &
+UISchedulerWinRT<TDispatcherTraits>::GetDispatchQueueRegistry() noexcept {
   static std::recursive_mutex mutex;
   static DispatchQueueRegistry registry{mutex};
   return registry;
@@ -315,9 +377,13 @@ void UISchedulerWinRT::AwaitTermination() noexcept {
 // UISchedulerWinRT::CleanupContext implementation
 //=============================================================================
 
-UISchedulerWinRT::CleanupContext::CleanupContext(UISchedulerWinRT *scheduler) noexcept : m_scheduler{scheduler} {}
+template <typename TDispatcherTraits>
+UISchedulerWinRT<TDispatcherTraits>::CleanupContext::CleanupContext(
+    UISchedulerWinRT<TDispatcherTraits> *scheduler) noexcept
+    : m_scheduler{scheduler} {}
 
-UISchedulerWinRT::CleanupContext::~CleanupContext() noexcept {
+template <typename TDispatcherTraits>
+UISchedulerWinRT<TDispatcherTraits>::CleanupContext::~CleanupContext() noexcept {
   if (m_isTerminated) {
     m_scheduler->m_terminationEvent.Set();
   }
@@ -329,7 +395,8 @@ UISchedulerWinRT::CleanupContext::~CleanupContext() noexcept {
   }
 }
 
-void UISchedulerWinRT::CleanupContext::CheckShutdown() noexcept {
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::CleanupContext::CheckShutdown() noexcept {
   // See if dispatcher queue released all handlers without invoking them.
   if (m_scheduler->m_taskCount != 0 && m_scheduler->m_handlerRefCount == 0) {
     m_isShutdown = true;
@@ -338,7 +405,8 @@ void UISchedulerWinRT::CleanupContext::CheckShutdown() noexcept {
   }
 }
 
-void UISchedulerWinRT::CleanupContext::CheckTermination() noexcept {
+template <typename TDispatcherTraits>
+void UISchedulerWinRT<TDispatcherTraits>::CleanupContext::CheckTermination() noexcept {
   m_isTerminated = m_scheduler->m_isShutdown && (m_scheduler->m_handlerRefCount == 0);
 }
 
@@ -347,7 +415,16 @@ void UISchedulerWinRT::CleanupContext::CheckTermination() noexcept {
 //=============================================================================
 
 DispatchQueue DispatchQueueStatic::GetCurrentUIThreadQueue() noexcept {
-  return UISchedulerWinRT::GetOrCreateUIThreadQueue();
+  DispatchQueue queue{nullptr};
+#if USE_WINUI3
+  queue = UISchedulerWinRT<MicrosoftDispatcherTraits>::GetOrCreateUIThreadQueue();
+  if (!queue) {
+#endif
+    queue = UISchedulerWinRT<WindowsDispatcherTraits>::GetOrCreateUIThreadQueue();
+#if USE_WINUI3
+  }
+#endif
+  return queue;
 }
 
 } // namespace Mso

package/PropertySheets/External/Microsoft.ReactNative.Composition.Common.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation. All rights reserved.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL Win32 app and module projects (both inside
+  and outside of this repo) that build on top of Microsoft.ReactNative.
+  Do not make any changes here unless it applies to ALL such projects.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Common.props" />
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.props

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL Win32 C++ app projects (both inside
+  and outside of this repo) that build on top of Microsoft.ReactNative.
+  Do not make any changes here unless it applies to ALL such projects.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Keeping this at the top of the imports ensures we can use the autolinking 
+       process to set properties without having to edit the project file -->
+  <Import Project="$(ProjectDir)\AutolinkedNativeModules.g.props"
+          Condition="Exists('$(ProjectDir)\AutolinkedNativeModules.g.props')" />
+
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Composition.Common.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Appx.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Autolink.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Codegen.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.Cpp.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\CppAppConsumeCSharpModule.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\PackageVersionDefinitions.props" />
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.targets

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) Microsoft Corporation.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL Win32 C++ app projects (both inside
+  and outside of this repo) that build on top of Microsoft.ReactNative.
+  Do not make any changes here unless it applies to ALL such projects.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Starting with the base of the UWP Cpp targets for now (until we need to start differentiating). -->
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets" />
+
+  <ItemGroup>
+    <PackageReference Include="boost" Version="1.76.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication" Version="6.1.3" />
+    <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
+  </ItemGroup>
+
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation. All rights reserved.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL Win32 app and module projects (both inside
+  and outside of this repo) that build on top of Microsoft.ReactNative.
+  Do not make any changes here unless it applies to ALL such projects.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Common.props" />
+   <!-- Fixes NuGet restore issues: -->
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.CSharp.props" />
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.targets

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation. All rights reserved.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL Win32 app and module projects (both inside
+  and outside of this repo) that build on top of Microsoft.ReactNative.
+  Do not make any changes here unless it applies to ALL such projects.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <ItemGroup>
+    <SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />
+    <!-- Needed for ucrtbased.dll when running a debug build. -->
+    <SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
+  </ItemGroup>
+  
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props

@@ -18,7 +18,7 @@
     <WindowsTargetPlatformMinVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(WindowsTargetPlatformMinVersion)', '10.0.17763.0'))">10.0.17763.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
-  <PropertyGroup Label="Globals" Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+  <PropertyGroup Label="Globals" Condition="'$(MSBuildProjectExtension)' == '.csproj' Or '$(MSBuildProjectExtension)' == '.wapproj'">
     <TargetPlatformVersion Condition="'$(TargetPlatformVersion)'==''">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)'==''">10.0.17763.0</TargetPlatformMinVersion>
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.708</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.709</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>7adbe3ec4dd17828e45a5356bc5d96c1c794aa70</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>c7282e51f9afec33ecc18ad836b02d84bcc17379</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.708",
+  "version": "0.0.0-canary.709",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "12.0.0-alpha.7",
     "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
     "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
-    "@react-native-windows/cli": "0.0.0-canary.188",
+    "@react-native-windows/cli": "0.0.0-canary.189",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.73.0-nightly-20230622-0201e51bb",
     "@react-native/codegen": "0.73.0-nightly-20230711-f396067cc",

package/templates/cpp-app/metro.config.js

@@ -0,0 +1,51 @@
+/**
+ * Metro configuration for React Native
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
+const fs = require('fs');
+const path = require('path');
+const exclusionList = require('metro-config/src/defaults/exclusionList');
+
+const rnwPath = fs.realpathSync(
+  path.resolve(require.resolve('react-native-windows/package.json'), '..'),
+);
+
+//{{#devMode}} [devMode
+const rnwRootNodeModules = path.resolve(rnwPath, '..', 'node_modules');
+const rnwPackages = path.resolve(rnwPath, '..', 'packages');
+// devMode]{{/devMode}}
+
+module.exports = {
+  //{{#devMode}} [devMode
+  watchFolders: [rnwPath, rnwRootNodeModules, rnwPackages],
+  // devMode]{{/devMode}}
+  resolver: {
+    blockList: exclusionList([
+      // This stops "react-native run-windows" from causing the metro server to crash if its already running
+      new RegExp(
+        `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
+      ),
+      // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip or other files produced by msbuild
+      new RegExp(`${rnwPath}/build/.*`),
+      new RegExp(`${rnwPath}/target/.*`),
+      /.*\.ProjectImports\.zip/,
+    ]),
+    //{{#devMode}} [devMode
+    extraNodeModules: {
+      'react-native-windows': rnwPath,
+    },
+    // devMode]{{/devMode}}
+  },
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: true,
+      },
+    }),
+    // This fixes the 'missing-asset-registry-path` error (see https://github.com/microsoft/react-native-windows/issues/11437)
+    assetRegistryPath: 'react-native/Libraries/Image/AssetRegistry',
+  },
+};

package/templates/cpp-app/template.config.js

@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * @ts check
+ * @format
+ */
+
+const chalk = require('chalk');
+const existsSync = require('fs').existsSync;
+const fs = require('fs').promises;
+const path = require('path');
+const username = require('username');
+const uuid = require('uuid');
+
+async function preInstall(config = {}, options = {}) {}
+
+async function getFileMappings(config = {}, options = {}) {
+  const rnwPath = path.dirname(
+    require.resolve('react-native-windows', [config.root]),
+  );
+  const rnwVersion = require(path.join(rnwPath, 'package.json')).version;
+
+  const devMode = await existsSync(path.join(rnwPath, 'src'));
+
+  const projectName =
+    config?.project?.windows?.project?.projectName ?? options?.name ?? 'MyApp';
+  const namespace = options?.namespace ?? projectName;
+  const namespaceCpp = namespace.replace(/\./g, '::');
+  const projectGuid =
+    config?.project?.windows?.project?.projectGuid
+      ?.replace('{', '')
+      .replace('}', '') ?? uuid.v4();
+  const packageGuid = uuid.v4();
+  const currentUser = username.sync(); // Gets the current username depending on the platform.
+
+  const cppNugetPackages = [];
+
+  const replacements = {
+    useMustache: true,
+    regExpPatternsToRemove: [],
+
+    name: projectName,
+    namespace: namespace,
+    namespaceCpp: namespaceCpp,
+
+    rnwVersion: rnwVersion,
+
+    mainComponentName: projectName, // TODO: replace with app.json name
+
+    // Visual Studio is very picky about the casing of the guids for projects, project references and the solution
+    // https://www.bing.com/search?q=visual+studio+project+guid+casing&cvid=311a5ad7f9fc41089507b24600d23ee7&FORM=ANAB01&PC=U531
+    // we therefore have to precariously use the right casing in the right place or risk building in VS breaking.
+    projectGuidLower: `{${projectGuid.toLowerCase()}}`,
+    projectGuidUpper: `{${projectGuid.toUpperCase()}}`,
+
+    // packaging and signing variables:
+    packageGuidLower: `{${packageGuid.toLowerCase()}}`,
+    packageGuidUpper: `{${packageGuid.toUpperCase()}}`,
+    currentUser: currentUser,
+
+    devMode,
+
+    cppNugetPackages,
+  };
+
+  let fileMappings = [];
+
+  const templateFiles = await fs.readdir(__dirname, {recursive: true});
+
+  for (const file of templateFiles) {
+    const fileMapping = {
+      from: path.resolve(__dirname, file),
+      to: file,
+      replacements,
+    };
+
+    // Don't include this file nor directories
+    if (
+      file === 'template.config.js' ||
+      (await fs.stat(fileMapping.from)).isDirectory()
+    ) {
+      continue;
+    }
+
+    // Perform simple file renames
+    const fileName = path.basename(fileMapping.to);
+    switch (fileName) {
+      case '_gitignore':
+        fileMapping.to = path.join(path.dirname(file), '.gitignore');
+        break;
+      case 'NuGet_Config':
+        fileMapping.to = path.join(path.dirname(file), 'NuGet.config');
+        break;
+    }
+
+    // Rename files with MyApp in the name
+    fileMapping.to = fileMapping.to.replace(/MyApp/g, projectName);
+
+    fileMappings.push(fileMapping);
+  }
+
+  return fileMappings;
+}
+
+function postInstall(config = {}, options = {}) {
+  console.log(chalk.white.bold('To run your app on UWP:'));
+  console.log(chalk.white('   npx react-native run-windows'));
+}
+
+module.exports = {
+  name: 'React Native Windows Application (New Arch, C++, Win32, Hermes)',
+  description:
+    "[Experimental] A RNW app targeting RN's new architecture, with the Hermes JS engine.",
+  preInstall,
+  getFileMappings,
+  postInstall,
+};

package/templates/cpp-app/windows/ExperimentalFeatures.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Label="Microsoft.ReactNative Experimental Features">
+    <UseHermes>true</UseHermes>
+    <UseFabric>true</UseFabric>
+    <UseWinUI3>false</UseWinUI3>
+
+    <ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
+  </PropertyGroup>
+
+</Project>