react-native-windows 0.68.1 → 0.69.0-preview.1

package/Mso/object/unknownObject.h

@@ -394,7 +394,7 @@ class DECLSPEC_NOVTABLE UnknownObject : public Mso::QueryCastList<TBaseType0, TB
 
  protected:
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   virtual ~UnknownObject() noexcept = default;
 
@@ -442,7 +442,7 @@ class DECLSPEC_NOVTABLE UnknownObject<Mso::SimpleRefCountPolicy<TDeleter, TAlloc
 
  protected:
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   virtual ~UnknownObject() noexcept = default;
 
@@ -489,7 +489,7 @@ class DECLSPEC_NOVTABLE UnknownObject<Mso::RefCountStrategy::SimpleNoQuery, TBas
 
  protected:
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : TBaseType0(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : TBaseType0(std::forward<TArgs>(args)...) {}
 
   virtual ~UnknownObject() noexcept = default;
 
@@ -536,7 +536,7 @@ class UnknownObject<Mso::WeakRefCountPolicy<TDeleter, TAllocator>, TBaseType0, T
 
  protected:
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   virtual ~UnknownObject() noexcept = default;
 };
@@ -552,7 +552,7 @@ class DECLSPEC_NOVTABLE UnknownObject<Mso::RefCountStrategy::NoRefCount, TBaseTy
   MSO_OBJECT_NOREFCOUNT(UnknownObject);
 
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   _Success_(return == S_OK) STDMETHOD(QueryInterface)(const GUID &riid, _Outptr_ void **ppvObject) noexcept override {
     return ::Mso::Details::QueryInterfaceHelper<UnknownObject>::QueryInterface(this, riid, ppvObject);
@@ -582,7 +582,7 @@ class DECLSPEC_NOVTABLE UnknownObject<Mso::RefCountStrategy::NoRefCountNoQuery,
   MSO_OBJECT_NOREFCOUNT(UnknownObject);
 
   template <typename... TArgs>
-  UnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  UnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   _Success_(return == S_OK)
       STDMETHOD(QueryInterface)(const GUID & /*riid*/, _Outptr_ void ** /*ppvObject*/) noexcept override {
@@ -613,7 +613,7 @@ class AgileUnknownObject : public UnknownObject<TBaseTypes...> {
   MSO_NO_COPY_CTOR_AND_ASSIGNMENT(AgileUnknownObject);
 
   template <typename... TArgs>
-  AgileUnknownObject(TArgs &&... args) noexcept : Super(std::forward<TArgs>(args)...) {}
+  AgileUnknownObject(TArgs &&...args) noexcept : Super(std::forward<TArgs>(args)...) {}
 
   _Success_(return == S_OK) STDMETHOD(QueryInterface)(const GUID &riid, _Outptr_ void **ppvObject) noexcept override {
     HRESULT hr = Super::QueryInterface(riid, ppvObject);

package/Mso/platformAdapters/windowsFirst.h

@@ -14,7 +14,7 @@ typedef unsigned long DWORD;
 #define NOMINMAX
 #endif
 
-//#include <winsock2.h>
+// #include <winsock2.h>
 #include <windows.h>
 
 #endif // defined(MS_TARGET_POSIX)

package/Mso/smartPtr/cntPtr.h

@@ -155,12 +155,12 @@ struct CntPtrRef {
 
   operator CntPtr<T> *() const noexcept;
   operator void *() const noexcept;
-  operator T * *() const noexcept;
-  operator void * *() const noexcept;
-  operator const void * *() const noexcept;
+  operator T **() const noexcept;
+  operator void **() const noexcept;
+  operator const void **() const noexcept;
 
   template <typename TBase, EnableIfIsBaseOf<TBase, T> = 0>
-  explicit operator TBase * *() const noexcept;
+  explicit operator TBase **() const noexcept;
 
   T *&operator*() noexcept;
   T **ClearAndGetAddressOf() noexcept;
@@ -508,23 +508,23 @@ inline CntPtrRef<T>::operator void *() const noexcept {
 }
 
 template <typename T>
-inline CntPtrRef<T>::operator T * *() const noexcept {
+inline CntPtrRef<T>::operator T **() const noexcept {
   return const_cast<CntPtrRef *>(this)->m_pCntPtr->GetAddressOf();
 }
 
 template <typename T>
-inline CntPtrRef<T>::operator void * *() const noexcept {
+inline CntPtrRef<T>::operator void **() const noexcept {
   return reinterpret_cast<void **>(const_cast<CntPtrRef *>(this)->m_pCntPtr->GetAddressOf());
 }
 
 template <typename T>
-inline CntPtrRef<T>::operator const void * *() const noexcept {
+inline CntPtrRef<T>::operator const void **() const noexcept {
   return (const void **)(const_cast<CntPtrRef *>(this)->m_pCntPtr->GetAddressOf());
 }
 
 template <typename T>
 template <typename TBase, EnableIfIsBaseOf<TBase, T>>
-inline CntPtrRef<T>::operator TBase * *() const noexcept {
+inline CntPtrRef<T>::operator TBase **() const noexcept {
   return (TBase **)const_cast<CntPtrRef *>(this)->m_pCntPtr->GetAddressOf();
 }
 

package/Mso/src/dispatchQueue/threadPoolScheduler_win.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#include <utility>
 #include "dispatchQueue/dispatchQueue.h"
 #include "queueService.h"
 
@@ -29,6 +30,13 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   void Shutdown() noexcept override;
   void AwaitTermination() noexcept override;
 
+ public: // Used by test APIs
+  static void EnableThreadPoolWorkTracking(bool enable) noexcept;
+  static void WaitForThreadPoolWorkCompletion() noexcept;
+
+ private: // Used by test APIs
+  static void TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &work) noexcept;
+
  private:
   struct ThreadAccessGuard {
     ThreadAccessGuard(ThreadPoolSchedulerWin *scheduler) noexcept;
@@ -42,12 +50,29 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   };
 
  private:
-  std::unique_ptr<TP_WORK, ThreadPoolWorkDeleter> m_threadPoolWork;
+  std::shared_ptr<TP_WORK> m_threadPoolWork;
   Mso::WeakPtr<IDispatchQueueService> m_queue;
   const uint32_t m_maxThreads{1};
   std::atomic<uint32_t> m_usedThreads{0};
 
   constexpr static uint32_t MaxConcurrentThreads{64};
+
+ private:
+  static std::mutex s_threadPoolWorkMutex;
+  static bool s_enableThreadPoolWorkTracking;
+  static std::vector<std::shared_ptr<TP_WORK>> s_trackedThreadPoolWork;
+};
+
+// Track the ThreadPoolSchedulerWin instance used by current thread.
+// We use it to avoid a deadlock on queue shutdown.
+struct ThreadPoolSchedulerWinContext {
+  ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept;
+  ~ThreadPoolSchedulerWinContext() noexcept;
+  static ThreadPoolSchedulerWin *CurrentScheduler() noexcept;
+
+ private:
+  static thread_local ThreadPoolSchedulerWin *tls_scheduler;
+  ThreadPoolSchedulerWin *m_prevScheduler{nullptr};
 };
 
 //=============================================================================
@@ -64,9 +89,15 @@ void ThreadPoolWorkDeleter::operator()(TP_WORK *tpWork) noexcept {
 // ThreadPoolSchedulerWin implementation
 //=============================================================================
 
+std::mutex ThreadPoolSchedulerWin::s_threadPoolWorkMutex;
+bool ThreadPoolSchedulerWin::s_enableThreadPoolWorkTracking{false};
+std::vector<std::shared_ptr<TP_WORK>> ThreadPoolSchedulerWin::s_trackedThreadPoolWork;
+
 ThreadPoolSchedulerWin::ThreadPoolSchedulerWin(uint32_t maxThreads) noexcept
-    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr)},
-      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {}
+    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr), ThreadPoolWorkDeleter{}},
+      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {
+  TrackThreadPoolWork(m_threadPoolWork);
+}
 
 ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
   AwaitTermination();
@@ -78,6 +109,7 @@ ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
     _Inout_ PTP_WORK /*work*/) {
   // The ThreadPoolSchedulerWin is alive here because m_threadPoolWork must be completed before it is destroyed.
   ThreadPoolSchedulerWin *self = static_cast<ThreadPoolSchedulerWin *>(context);
+  ThreadPoolSchedulerWinContext schedulerContext(self);
 
   if (auto queue = self->m_queue.GetStrongPtr()) {
     auto endTime = std::chrono::steady_clock::now() + 100ms;
@@ -129,7 +161,38 @@ void ThreadPoolSchedulerWin::Shutdown() noexcept {
 }
 
 void ThreadPoolSchedulerWin::AwaitTermination() noexcept {
-  ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  // Avoid deadlock when the dispatch queue and ThreadPoolSchedulerWin are released from inside of a task.
+  if (ThreadPoolSchedulerWinContext::CurrentScheduler() != this) {
+    ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(bool enable) noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToStopTracking;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    s_enableThreadPoolWorkTracking = enable;
+    // Reset all previously tracked work
+    tpWorkToStopTracking = std::move(s_trackedThreadPoolWork);
+  }
+}
+
+void ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion() noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToTrack;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    tpWorkToTrack = std::move(s_trackedThreadPoolWork);
+  }
+  for (std::shared_ptr<TP_WORK> &tpWork : tpWorkToTrack) {
+    ::WaitForThreadpoolWorkCallbacks(tpWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &tpWork) noexcept {
+  std::scoped_lock lock{s_threadPoolWorkMutex};
+  if (s_enableThreadPoolWorkTracking) {
+    s_trackedThreadPoolWork.push_back(tpWork);
+  }
 }
 
 //=============================================================================
@@ -151,6 +214,23 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return tls_scheduler == scheduler;
 }
 
+//=============================================================================
+// ThreadPoolSchedulerWinContext implementation
+//=============================================================================
+
+thread_local ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::tls_scheduler{nullptr};
+
+ThreadPoolSchedulerWinContext::ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept
+    : m_prevScheduler(std::exchange(tls_scheduler, scheduler)) {}
+
+ThreadPoolSchedulerWinContext::~ThreadPoolSchedulerWinContext() noexcept {
+  std::exchange(tls_scheduler, m_prevScheduler);
+}
+
+ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::CurrentScheduler() noexcept {
+  return tls_scheduler;
+}
+
 //=============================================================================
 // DispatchQueueStatic::MakeThreadPoolScheduler implementation
 //=============================================================================
@@ -160,4 +240,16 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return Mso::Make<ThreadPoolSchedulerWin, IDispatchQueueScheduler>(maxThreads);
 }
 
+//=============================================================================
+// Test specific functions
+//=============================================================================
+
+void Test_ThreadPoolSchedulerWin_EnableThreadPoolWorkTracking(bool enable) noexcept {
+  ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(enable);
+}
+
+void Test_ThreadPoolSchedulerWin_WaitForThreadPoolWorkCompletion() noexcept {
+  ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion();
+}
+
 } // namespace Mso

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -13,8 +13,8 @@ using namespace Windows::Foundation;
 #include "winrt/Windows.System.h"
 using namespace Windows::System;
 #else
-#include "winrt/Microsoft.System.h"
-using namespace Microsoft::System;
+#include "winrt/Microsoft.UI.Dispatching.h"
+using namespace Microsoft::UI::Dispatching;
 #endif
 
 namespace Mso {

package/Mso/src/future/futureImpl.h

@@ -226,7 +226,7 @@ class FutureImpl final : public Mso::QueryCastList<Mso::QueryCastDerived<FutureI
   void AddContinuation(Mso::CntPtr<IFuture> &&continuation) noexcept override;
 
   _Success_(
-      return ) bool TryStartSetValue(_Out_ ByteArrayView &valueBuffer, bool crashIfFailed = false) noexcept override;
+      return) bool TryStartSetValue(_Out_ ByteArrayView &valueBuffer, bool crashIfFailed = false) noexcept override;
   void Post() noexcept override;
   void StartAwaiting() noexcept override;
   bool TrySetSuccess(bool crashIfFailed = false) noexcept override;

package/Mso/src/memoryApi/memoryApi.cpp

@@ -50,11 +50,11 @@ _Use_decl_annotations_ void Free(void *pv) noexcept {
   ::free(pv);
 }
 
-//#ifdef DEBUG
-// void RegisterCallback(Mso::LibletAPI::ILibletMemoryMarking&) noexcept {}
+// #ifdef DEBUG
+//  void RegisterCallback(Mso::LibletAPI::ILibletMemoryMarking&) noexcept {}
 //
-// void UnregisterCallback(Mso::LibletAPI::ILibletMemoryMarking&) noexcept {}
-//#endif
+//  void UnregisterCallback(Mso::LibletAPI::ILibletMemoryMarking&) noexcept {}
+// #endif
 
 } // namespace Memory
 } // namespace Mso

package/PropertySheets/CppAppConsumeCSharpModule.props

@@ -18,12 +18,14 @@
     <DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.8-rel-28605-00\build\Microsoft.Net.Native.Compiler.props')">2.2.8-rel-28605-00</DotNetNativeVersion>
     <DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.9-rel-29512-01\build\Microsoft.Net.Native.Compiler.props')">2.2.9-rel-29512-01</DotNetNativeVersion>
     <DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.10-rel-29722-00\build\Microsoft.Net.Native.Compiler.props')">2.2.10-rel-29722-00</DotNetNativeVersion>
+    <DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.11-rel-30601-02\build\Microsoft.Net.Native.Compiler.props')">2.2.11-rel-30601-02</DotNetNativeVersion>
 
     <DotNetNativeRuntimeVersion>DOTNET_NATIVE_RUNTIME_VERSION_NOT_SET</DotNetNativeRuntimeVersion>
     <DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.7-rel-27913-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.7-rel-27913-00</DotNetNativeRuntimeVersion>
     <DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.7-rel-28605-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.7-rel-28605-00</DotNetNativeRuntimeVersion>
     <DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-29512-01\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-29512-01</DotNetNativeRuntimeVersion>
     <DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-29722-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-29722-00</DotNetNativeRuntimeVersion>
+    <DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-30601-02\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-30601-02</DotNetNativeRuntimeVersion>
     
     <!-- The name 'DotNetNativeVersion' is critical for restoring the right .NET framework libraries -->
     <UWPCoreRuntimeSdkVersion>UWP_CORE_RUNTIME_SDK_VERSION_NOT_SET</UWPCoreRuntimeSdkVersion>
@@ -31,6 +33,7 @@
     <UWPCoreRuntimeSdkVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk\2.2.10\build\Microsoft.Net.UWPCoreRuntimeSdk.props')">2.2.10</UWPCoreRuntimeSdkVersion>
     <UWPCoreRuntimeSdkVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk\2.2.11\build\Microsoft.Net.UWPCoreRuntimeSdk.props')">2.2.11</UWPCoreRuntimeSdkVersion>
     <UWPCoreRuntimeSdkVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk\2.2.12\build\Microsoft.Net.UWPCoreRuntimeSdk.props')">2.2.12</UWPCoreRuntimeSdkVersion>
+    <UWPCoreRuntimeSdkVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk\2.2.13\build\Microsoft.Net.UWPCoreRuntimeSdk.props')">2.2.13</UWPCoreRuntimeSdkVersion>
     <!-- End Custom .NET Native properties -->
   </PropertyGroup>
 

package/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.props

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation.
+  Licensed under the MIT License.
+
+  This file will be consumed by ALL WinAppSDK 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')" />
+
+  <PropertyGroup>
+    <!--https://github.com/microsoft/react-native-windows/pull/9177#discussion_r827643823-->
+    <UseDocString>false</UseDocString>
+    <ReactNativeCodeGenEnabled Condition="'$(ReactNativeCodeGenEnabled)' == ''">true</ReactNativeCodeGenEnabled>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.WinAppSDK.Common.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Appx.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Autolink.props" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
+</Project>

package/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.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 WinAppSDK 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/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.68.1</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>68</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>1</ReactNativeWindowsPatch>
+    <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
+    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -18,7 +18,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.65.5</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.65.11</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
     <V8Package>$(NuGetPackageRoot)\$(V8PackageName).$(V8Version)</V8Package>

package/PropertySheets/React.Cpp.props

@@ -19,6 +19,18 @@
 
   <PropertyGroup Label="NuGet">
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
+
+    <!-- https://github.com/NuGet/Home/issues/10511#issuecomment-778400668 -->
+    <AssetTargetFallback>$(AssetTargetFallback);native</AssetTargetFallback>
+
+    <!--
+      Avoid Visual Studio error message:
+      "The project '$(MSBuildProjectName)' ran into a problem during the last operation: The value of the
+      'TargetFrameworkMoniker' and 'NuGetTargetMoniker' properties in the '$(Configuration)|$(Platform)' configuration are both
+      empty. This configuration will not contribute to NuGet restore, which may result in restore and build errors. You may
+      need to reload the solution after fixing the problem."
+    -->
+    <TargetFrameworkMoniker>native,Version=v0.0</TargetFrameworkMoniker>
   </PropertyGroup>
 
   <PropertyGroup Label="Desktop">
@@ -130,6 +142,7 @@
         $(ReactNativeDir)\ReactCommon\jsiexecutor;
         $(ReactNativeDir)\ReactCommon\react\nativemodule\core;
         $(ReactNativeDir)\ReactCommon\react\nativemodule\samples;
+        $(ReactNativeDir)\ReactCommon\react\bridging;
         $(ReactNativeDir)\ReactCommon\reactperflogger;
         $(ReactNativeDir)\ReactCommon\runtimeexecutor;
         %(AdditionalIncludeDirectories);

package/PropertySheets/WinUI.props

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="WinUI3 versioning">
     <!-- This value is also used by the CLI, see /packages/@react-native-windows/generate-windows -->
-    <WinUI3Version Condition="'$(WinUI3Version)'==''">3.0.0-preview4.210210.4</WinUI3Version>
+    <WinUI3Version Condition="'$(WinUI3Version)'==''">1.0.0</WinUI3Version>
   </PropertyGroup>
 
   <PropertyGroup Label="WinUI2x versioning">
@@ -11,8 +11,9 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseWinUI3)'=='true'">
-    <WinUIPackageName>Microsoft.WinUI</WinUIPackageName>
+    <WinUIPackageName>Microsoft.WindowsAppSDK</WinUIPackageName>
     <WinUIPackageVersion>$(WinUI3Version)</WinUIPackageVersion>
+    <WinUIPackageProps/>
 
     <!-- Enlighten C# code about WinUI3 -->
     <DefineConstants Condition="'$(UseWinUI3)'=='true'">USE_WINUI3;$(DefineConstants)</DefineConstants>
@@ -30,14 +31,10 @@
     <!-- Enlighten C++ code about WinUI3 -->
     <ClCompile>
       <PreprocessorDefinitions>USE_WINUI3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!-- Preview 3 will need experimental types due to IXP -->
-      <PreprocessorDefinitions Condition="'$(UseExperimentalIXP)'=='true'">WINUI3_PREVIEW3;ENABLE_WINRT_EXPERIMENTAL_TYPES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <!-- Enlighten IDL interfaces about WinUI3 -->
     <Midl>
       <PreprocessorDefinitions>USE_WINUI3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!-- Preview 3 will need experimental types due to IXP -->
-      <PreprocessorDefinitions>ENABLE_WINRT_EXPERIMENTAL_TYPES=1;DISABLE_MIDL_VERSION_CHECKS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
 

package/ReactCommon/ReactCommon.vcxproj

@@ -83,9 +83,6 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets" Condition="Exists('$(SolutionDir)packages\boost.1.76.0.0\build\boost.targets')" />
-  </ImportGroup>
   <ItemGroup>
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\instrumentation.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\jsi-inl.h" />
@@ -173,11 +170,12 @@
     </ClCompile>
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\callinvoker\ReactCommon\CallInvoker.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\brdiging\CallbackWrapper.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp"/>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.cpp" />

package/ReactCommon/ReactCommon.vcxproj.filters

@@ -138,7 +138,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.cpp">
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.cpp">
@@ -279,6 +279,9 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.h">
       <Filter>turbomodule\core</Filter>
     </ClInclude>
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\bridging\CallbackWrapper.h">
+      <Filter>turbomodule\core</Filter>
+    </ClInclude>
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h">
       <Filter>turbomodule\core</Filter>
     </ClInclude>