react-native-windows 0.69.6 → 0.70.0-preview.1

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -19,6 +19,7 @@
 #include <INativeUIManager.h>
 #include <IReactInstance.h>
 
+#include <cxxreact/SystraceSection.h>
 #include <inspectable.h>
 #include <unicode.h>
 #include <winrt/Windows.System.h>
@@ -30,6 +31,8 @@
 #include <winrt/Windows.Foundation.h>
 #endif
 
+using namespace facebook::react;
+
 namespace Microsoft::ReactNative {
 
 // ViewShadowNode
@@ -528,9 +531,11 @@ void ViewViewManager::TryUpdateView(
   //
   // 2. Transfer needed properties from old to new view
   //
-
-  // Transfer properties from old XamlView to the new one
-  TransferProperties(oldXamlView, newXamlView);
+  {
+    SystraceSection s("ViewViewManager::TransferProperties");
+    // Transfer properties from old XamlView to the new one
+    TransferProperties(oldXamlView, newXamlView);
+  }
 
   // Since we transferred properties to the new view we need to make the call to
   // finalize

package/Microsoft.ReactNative/Views/cppwinrt/DynamicAutomationPeer.idl

@@ -56,6 +56,8 @@ namespace Microsoft.ReactNative
     CountStates
   };
 
+  // When adding a new numeric value, make sure to increment 'numericValuesCount' in FrameworkElementViewManager
+  // updateProperties depends on Min, Max, Now values being 0-2 for indexing. Be careful not to break that logic when adding new values.
   enum AccessibilityValue
   {
     Min = 0,

package/Microsoft.ReactNative/microsoft.reactnative.def

@@ -1,3 +1,6 @@
-EXPORTS
+EXPORTS
 DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
 DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
+
+RNCoreAppStart
+RNCoreAppStartFromConfigJson

package/Microsoft.ReactNative.Cxx/AppModelHelpers.h

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+
+// AppModel helpers
+
+#include <appmodel.h>
+
+namespace Microsoft::ReactNative {
+
+inline bool HasPackageIdentity() noexcept {
+  uint32_t length{0};
+  const bool isPackagedApp = GetCurrentPackageFullName(&length, nullptr) != APPMODEL_ERROR_NO_PACKAGE;
+  return isPackagedApp;
+}
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative.Cxx/CoreApp.h

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+
+struct RNCoreApp {
+  /// default value: L"index.windows"
+  wchar_t const *jsBundleFile;
+  /// default value: L"ms-appx:///Bundle/"
+  wchar_t const *bundleRootPath;
+  /// Provide the name of your React component here
+  wchar_t const *componentName;
+
+  /// default value: true
+  bool useWebDebugger;
+  /// default value: true
+  bool useFastRefresh;
+  /// default value: true
+  bool useDeveloperSupport;
+  /// default value: false
+  bool useDirectDebugger;
+  /// default value: true
+  bool requestInlineSourceMap;
+
+  /// default value: false
+  bool enableDefaultCrashHandler;
+  /// default value: 9229
+  unsigned short debuggerPort;
+  /// default value: 8081
+  unsigned short sourceBundlePort;
+  /// default value: L"localhost"
+  wchar_t const *sourceBundleHost;
+
+  /// default value: "chakra", possible values: "chakra", "hermes"
+  wchar_t const *jsEngine;
+
+  /// default value: nullptr
+  wchar_t const *viewName;
+
+  void *resourcesAbi;
+  /// Provides the launch arguments back to the CoreApp callback
+  wchar_t const *args;
+  /// Allocate with CoTaskMemAlloc, will be freed by the framework
+  void **packageProvidersAbi;
+  unsigned char packageProvidersAbiCount;
+  void *propertiesAbi;
+};
+
+#ifdef __cplusplus
+#define NORETURN [[noreturn]]
+#else
+#define NORETURN _Noreturn
+#endif
+
+typedef void(__cdecl *RNCoreAppCallback)(RNCoreApp *, void *);
+
+extern "C" NORETURN void __cdecl RNCoreAppStart(RNCoreAppCallback launched, void *data);
+extern "C" NORETURN void __cdecl RNCoreAppStartFromConfigJson(
+    wchar_t const *configJson,
+    RNCoreAppCallback launched,
+    void *data);

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.cpp

@@ -263,6 +263,13 @@ Runtime::PointerValue *JsiAbiRuntime::cloneSymbol(const Runtime::PointerValue *p
   throw;
 }
 
+Runtime::PointerValue *JsiAbiRuntime::cloneBigInt(const Runtime::PointerValue *pv) try {
+  return new BigIntPointerValue{make_weak(m_runtime), m_runtime.CloneBigInt(AsJsiBigIntRef(pv))};
+} catch (hresult_error const &) {
+  RethrowJsiError();
+  throw;
+}
+
 Runtime::PointerValue *JsiAbiRuntime::cloneString(const Runtime::PointerValue *pv) try {
   return new StringPointerValue{make_weak(m_runtime), m_runtime.CloneString(AsJsiStringRef(pv))};
 } catch (hresult_error const &) {
@@ -623,6 +630,13 @@ bool JsiAbiRuntime::strictEquals(const Symbol &a, const Symbol &b) const try {
   throw;
 }
 
+bool JsiAbiRuntime::strictEquals(const BigInt &a, const BigInt &b) const try {
+  return m_runtime.BigIntStrictEquals(AsJsiBigIntRef(a), AsJsiBigIntRef(b));
+} catch (hresult_error const &) {
+  RethrowJsiError();
+  throw;
+}
+
 bool JsiAbiRuntime::strictEquals(const String &a, const String &b) const try {
   return m_runtime.StringStrictEquals(AsJsiStringRef(a), AsJsiStringRef(b));
 } catch (hresult_error const &) {
@@ -686,6 +700,10 @@ void JsiAbiRuntime::SetJsiError(std::exception const &nativeException) noexcept
   return SymbolPointerValue::GetData(pv);
 }
 
+/*static*/ JsiBigIntRef const &JsiAbiRuntime::AsJsiBigIntRef(PointerValue const *pv) noexcept {
+  return BigIntPointerValue::GetData(pv);
+}
+
 /*static*/ JsiStringRef const &JsiAbiRuntime::AsJsiStringRef(PointerValue const *pv) noexcept {
   return StringPointerValue::GetData(pv);
 }
@@ -702,6 +720,10 @@ void JsiAbiRuntime::SetJsiError(std::exception const &nativeException) noexcept
   return SymbolPointerValue::GetData(getPointerValue(symbol));
 }
 
+/*static*/ JsiBigIntRef const &JsiAbiRuntime::AsJsiBigIntRef(BigInt const &bigInt) noexcept {
+  return BigIntPointerValue::GetData(getPointerValue(bigInt));
+}
+
 /*static*/ JsiStringRef const &JsiAbiRuntime::AsJsiStringRef(String const &str) noexcept {
   return StringPointerValue::GetData(getPointerValue(str));
 }
@@ -722,9 +744,12 @@ void JsiAbiRuntime::SetJsiError(std::exception const &nativeException) noexcept
   // We assume that the JsiValueRef and Value have the same layout.
   auto valuePtr = reinterpret_cast<JsiValueRef const *>(&value);
   // Fix up the data part
+  // TODO: JSIVALUECONVERSION - Need to fix JSI kind mapping
   switch (valuePtr->Kind) {
     case JsiValueKind::Symbol:
       return {valuePtr->Kind, SymbolPointerValue::GetData(getPointerValue(value)).Data};
+    case JsiValueKind::BigInt:
+      return {valuePtr->Kind, BigIntPointerValue::GetData(getPointerValue(value)).Data};
     case JsiValueKind::String:
       return {valuePtr->Kind, StringPointerValue::GetData(getPointerValue(value)).Data};
     case JsiValueKind::Object:
@@ -747,9 +772,12 @@ void JsiAbiRuntime::SetJsiError(std::exception const &nativeException) noexcept
   // data alive. Thus, we must detach the value.
   // We assume that the JsiValueRef and Value have the same layout.
   auto valuePtr = reinterpret_cast<JsiValueRef *>(&value);
+  // TODO: JSIVALUECONVERSION - Need to fix JSI kind mapping
   switch (valuePtr->Kind) {
     case JsiValueKind::Symbol:
       return {valuePtr->Kind, SymbolPointerValue::Detach(getPointerValue(value)).Data};
+    case JsiValueKind::BigInt:
+      return {valuePtr->Kind, BigIntPointerValue::Detach(getPointerValue(value)).Data};
     case JsiValueKind::String:
       return {valuePtr->Kind, StringPointerValue::Detach(getPointerValue(value)).Data};
     case JsiValueKind::Object:
@@ -763,6 +791,10 @@ Runtime::PointerValue *JsiAbiRuntime::MakeSymbolValue(JsiSymbolRef &&symbol) con
   return new SymbolPointerValue{make_weak(m_runtime), std::move(symbol)};
 }
 
+Runtime::PointerValue *JsiAbiRuntime::MakeBigIntValue(JsiBigIntRef &&bigInt) const noexcept {
+  return new BigIntPointerValue{make_weak(m_runtime), std::move(bigInt)};
+}
+
 Runtime::PointerValue *JsiAbiRuntime::MakeStringValue(JsiStringRef &&str) const noexcept {
   return new StringPointerValue{make_weak(m_runtime), std::move(str)};
 }
@@ -779,6 +811,10 @@ Symbol JsiAbiRuntime::MakeSymbol(JsiSymbolRef &&symbol) const noexcept {
   return make<Symbol>(MakeSymbolValue(std::move(symbol)));
 }
 
+BigInt JsiAbiRuntime::MakeBigInt(JsiBigIntRef &&bigInt) const noexcept {
+  return make<BigInt>(MakeBigIntValue(std::move(bigInt)));
+}
+
 String JsiAbiRuntime::MakeString(JsiStringRef &&str) const noexcept {
   return make<String>(MakeStringValue(std::move(str)));
 }
@@ -815,6 +851,8 @@ Value JsiAbiRuntime::MakeValue(JsiValueRef &&value) const noexcept {
       return Value(*reinterpret_cast<double *>(&value.Data));
     case JsiValueKind::Symbol:
       return Value(MakeSymbol(JsiSymbolRef{value.Data}));
+    case JsiValueKind::BigInt:
+      return Value(MakeBigInt(JsiBigIntRef{value.Data}));
     case JsiValueKind::String:
       return Value(MakeString(JsiStringRef{value.Data}));
     case JsiValueKind::Object:
@@ -861,6 +899,32 @@ void JsiAbiRuntime::SymbolPointerValue::invalidate() {
   return {std::exchange(static_cast<DataPointerValue *>(const_cast<PointerValue *>(pv))->m_data, 0)};
 }
 
+//===========================================================================
+// JsiAbiRuntime::BigIntPointerValue implementation
+//===========================================================================
+
+JsiAbiRuntime::BigIntPointerValue::BigIntPointerValue(
+    winrt::weak_ref<JsiRuntime> &&weakRuntime,
+    JsiBigIntRef &&bigInt) noexcept
+    : DataPointerValue{std::move(weakRuntime), std::exchange(bigInt.Data, 0)} {}
+
+void JsiAbiRuntime::BigIntPointerValue::invalidate() {
+  if (m_data) {
+    if (auto runtime = m_weakRuntime.get()) {
+      m_weakRuntime = nullptr;
+      runtime.ReleaseBigInt({m_data});
+    }
+  }
+}
+
+/*static*/ JsiBigIntRef const &JsiAbiRuntime::BigIntPointerValue::GetData(PointerValue const *pv) noexcept {
+  return *reinterpret_cast<JsiBigIntRef const *>(&static_cast<DataPointerValue const *>(pv)->m_data);
+}
+
+/*static*/ JsiBigIntRef JsiAbiRuntime::BigIntPointerValue::Detach(PointerValue const *pv) noexcept {
+  return {std::exchange(static_cast<DataPointerValue *>(const_cast<PointerValue *>(pv))->m_data, 0)};
+}
+
 //===========================================================================
 // JsiAbiRuntime::StringPointerValue implementation
 //===========================================================================
@@ -964,6 +1028,7 @@ JsiAbiRuntime::ValueRef::InitValueRef(JsiValueRef const &data, Value *value, Sto
   // We assume that the JsiValueRef and Value have the same layout.
   auto valueAsDataPtr = reinterpret_cast<JsiValueRef *>(value);
   valueAsDataPtr->Kind = data.Kind;
+  // TODO: JSIVALUECONVERSION - Need to fix JSI kind mapping
   switch (valueAsDataPtr->Kind) {
     case JsiValueKind::Symbol:
     case JsiValueKind::String:

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.h

@@ -92,6 +92,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
 
  protected:
   PointerValue *cloneSymbol(const PointerValue *pv) override;
+  PointerValue *cloneBigInt(const PointerValue *pv) override;
   PointerValue *cloneString(const PointerValue *pv) override;
   PointerValue *cloneObject(const PointerValue *pv) override;
   PointerValue *clonePropNameID(const PointerValue *pv) override;
@@ -161,6 +162,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   void popScope(ScopeState *scope) override;
 
   bool strictEquals(const facebook::jsi::Symbol &a, const facebook::jsi::Symbol &b) const override;
+  bool strictEquals(const facebook::jsi::BigInt &a, const facebook::jsi::BigInt &b) const override;
   bool strictEquals(const facebook::jsi::String &a, const facebook::jsi::String &b) const override;
   bool strictEquals(const facebook::jsi::Object &a, const facebook::jsi::Object &b) const override;
   bool instanceOf(const facebook::jsi::Object &o, const facebook::jsi::Function &f) override;
@@ -172,11 +174,13 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
 
  private: // Convert JSI to ABI-safe JSI values
   static JsiSymbolRef const &AsJsiSymbolRef(PointerValue const *pv) noexcept;
+  static JsiBigIntRef const &AsJsiBigIntRef(PointerValue const *pv) noexcept;
   static JsiStringRef const &AsJsiStringRef(PointerValue const *pv) noexcept;
   static JsiObjectRef const &AsJsiObjectRef(PointerValue const *pv) noexcept;
   static JsiPropertyIdRef const &AsJsiPropertyIdRef(PointerValue const *pv) noexcept;
 
   static JsiSymbolRef const &AsJsiSymbolRef(facebook::jsi::Symbol const &symbol) noexcept;
+  static JsiBigIntRef const &AsJsiBigIntRef(facebook::jsi::BigInt const &bigInt) noexcept;
   static JsiStringRef const &AsJsiStringRef(facebook::jsi::String const &str) noexcept;
   static JsiObjectRef const &AsJsiObjectRef(facebook::jsi::Object const &obj) noexcept;
   static JsiPropertyIdRef const &AsJsiPropertyIdRef(facebook::jsi::PropNameID const &propertyId) noexcept;
@@ -188,11 +192,13 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
 
  private: // Convert ABI-safe JSI to JSI values
   PointerValue *MakeSymbolValue(JsiSymbolRef &&symbol) const noexcept;
+  PointerValue *MakeBigIntValue(JsiBigIntRef &&bigInt) const noexcept;
   PointerValue *MakeStringValue(JsiStringRef &&str) const noexcept;
   PointerValue *MakeObjectValue(JsiObjectRef &&obj) const noexcept;
   PointerValue *MakePropNameIDValue(JsiPropertyIdRef &&propertyId) const noexcept;
 
   facebook::jsi::Symbol MakeSymbol(JsiSymbolRef &&symbol) const noexcept;
+  facebook::jsi::BigInt MakeBigInt(JsiBigIntRef &&bigInt) const noexcept;
   facebook::jsi::String MakeString(JsiStringRef &&str) const noexcept;
   facebook::jsi::Object MakeObject(JsiObjectRef &&obj) const noexcept;
   facebook::jsi::PropNameID MakePropNameID(JsiPropertyIdRef &&propertyId) const noexcept;
@@ -225,6 +231,13 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
     static JsiSymbolRef Detach(PointerValue const *pv) noexcept;
   };
 
+  struct BigIntPointerValue : DataPointerValue {
+    BigIntPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiBigIntRef &&bigInt) noexcept;
+    void invalidate() override;
+    static JsiBigIntRef const &GetData(PointerValue const *pv) noexcept;
+    static JsiBigIntRef Detach(PointerValue const *pv) noexcept;
+  };
+
   struct StringPointerValue : DataPointerValue {
     StringPointerValue(winrt::weak_ref<JsiRuntime> &&weakRuntime, JsiStringRef &&str) noexcept;
     void invalidate() override;

package/Microsoft.ReactNative.Cxx/JSI/JsiValueHelpers.cpp

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JsiValueHelpers.h"
+
+namespace winrt::Microsoft::ReactNative {
+
+/*static*/ FacebookJsiValueKind JsiValueKindHelper::ToValueKind(JsiValueKind const &kind) noexcept {
+  switch (kind) {
+    case JsiValueKind::Undefined:
+      return FacebookJsiValueKind::UndefinedKind;
+    case JsiValueKind::Null:
+      return FacebookJsiValueKind::NullKind;
+    case JsiValueKind::Boolean:
+      return FacebookJsiValueKind::BooleanKind;
+    case JsiValueKind::Number:
+      return FacebookJsiValueKind::NumberKind;
+    case JsiValueKind::Symbol:
+      return FacebookJsiValueKind::SymbolKind;
+    case JsiValueKind::String:
+      return FacebookJsiValueKind::StringKind;
+    case JsiValueKind::Object:
+      return FacebookJsiValueKind::ObjectKind;
+    case JsiValueKind::BigInt:
+      return FacebookJsiValueKind::BigIntKind;
+  }
+  return FacebookJsiValueKind::UndefinedKind;
+}
+
+/*static*/ JsiValueKind JsiValueKindHelper::ToJsiValueKind(FacebookJsiValueKind const &kind) noexcept {
+  switch (kind) {
+    case FacebookJsiValueKind::UndefinedKind:
+      return JsiValueKind::Undefined;
+    case FacebookJsiValueKind::NullKind:
+      return JsiValueKind::Null;
+    case FacebookJsiValueKind::BooleanKind:
+      return JsiValueKind::Boolean;
+    case FacebookJsiValueKind::NumberKind:
+      return JsiValueKind::Number;
+    case FacebookJsiValueKind::SymbolKind:
+      return JsiValueKind::Symbol;
+    case FacebookJsiValueKind::BigIntKind:
+      return JsiValueKind::BigInt;
+    case FacebookJsiValueKind::StringKind:
+      return JsiValueKind::String;
+    case FacebookJsiValueKind::ObjectKind:
+      return JsiValueKind::Object;
+  }
+  return JsiValueKind::Undefined;
+}
+
+} // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative.Cxx/JSI/JsiValueHelpers.h

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSIVALUEHELPERS
+#define MICROSOFT_REACTNATIVE_JSIVALUEHELPERS
+
+#include "winrt/Microsoft.ReactNative.h"
+
+namespace winrt::Microsoft::ReactNative {
+
+// CODESYNC: ReactCommon\jsi\jsi\jsi.h
+enum FacebookJsiValueKind {
+  UndefinedKind,
+  NullKind,
+  BooleanKind,
+  NumberKind,
+  SymbolKind,
+  BigIntKind,
+  StringKind,
+  ObjectKind,
+  PointerKind = SymbolKind,
+};
+
+struct JsiValueKindHelper final {
+  static FacebookJsiValueKind ToValueKind(JsiValueKind const &kind) noexcept;
+  static JsiValueKind ToJsiValueKind(FacebookJsiValueKind const &kind) noexcept;
+};
+
+} // namespace winrt::Microsoft::ReactNative
+
+#endif // MICROSOFT_REACTNATIVE_JSIVALUEHELPERS

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.cpp

@@ -130,6 +130,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
 
  protected:
   PointerValue *cloneSymbol(const PointerValue *pointerValue) override;
+  PointerValue *cloneBigInt(const PointerValue *pointerValue) override;
   PointerValue *cloneString(const PointerValue *pointerValue) override;
   PointerValue *cloneObject(const PointerValue *pointerValue) override;
   PointerValue *clonePropNameID(const PointerValue *pointerValue) override;
@@ -205,6 +206,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   void popScope(ScopeState *) override;
 
   bool strictEquals(const facebook::jsi::Symbol &a, const facebook::jsi::Symbol &b) const override;
+  bool strictEquals(const facebook::jsi::BigInt &a, const facebook::jsi::BigInt &b) const override;
   bool strictEquals(const facebook::jsi::String &a, const facebook::jsi::String &b) const override;
   bool strictEquals(const facebook::jsi::Object &a, const facebook::jsi::Object &b) const override;
 
@@ -672,6 +674,12 @@ Runtime::PointerValue *NapiJsiRuntime::cloneSymbol(const Runtime::PointerValue *
   return CloneNapiPointerValue(pointerValue);
 }
 
+Runtime::PointerValue *NapiJsiRuntime::cloneBigInt(const Runtime::PointerValue *pointerValue) {
+  EnvScope scope{m_env};
+
+  return CloneNapiPointerValue(pointerValue);
+}
+
 Runtime::PointerValue *NapiJsiRuntime::cloneString(const Runtime::PointerValue *pointerValue) {
   EnvScope scope{m_env};
 
@@ -715,7 +723,6 @@ PropNameID NapiJsiRuntime::createPropNameIDFromString(const String &str) {
 PropNameID NapiJsiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
   EnvScope envScope{m_env};
   napi_ext_ref propSym = GetPropertyIdFromSymbol(GetNapiValue(sym));
-
   return MakePointer<PropNameID>(propSym);
 }
 
@@ -1005,6 +1012,12 @@ bool NapiJsiRuntime::strictEquals(const Symbol &a, const Symbol &b) const {
   return StrictEquals(GetNapiValue(a), GetNapiValue(b));
 }
 
+bool NapiJsiRuntime::strictEquals(const BigInt &a, const BigInt &b) const {
+  EnvScope scope{m_env};
+
+  return StrictEquals(GetNapiValue(a), GetNapiValue(b));
+}
+
 bool NapiJsiRuntime::strictEquals(const String &a, const String &b) const {
   EnvScope scope{m_env};
 
@@ -1618,7 +1631,6 @@ napi_ext_ref NapiJsiRuntime::GetPropertyIdFromName(napi_value str) const {
 napi_ext_ref NapiJsiRuntime::GetPropertyIdFromSymbol(napi_value sym) const {
   napi_ext_ref ref{};
   CHECK_NAPI(napi_ext_create_reference(m_env, sym, &ref));
-
   return ref;
 }
 

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -37,6 +37,7 @@
     <ClInclude Include="$(JSI_SourcePath)\jsi\instrumentation.h" />
     <ClInclude Include="$(JSI_SourcePath)\jsi\jsi-inl.h" />
     <ClInclude Include="$(JSI_SourcePath)\jsi\jsi.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)CoreApp.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DesktopWindowBridge.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)TurboModuleProvider.h" />
@@ -50,6 +51,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\JsiAbiApi.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\JsiApiContext.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\JsiValueHelpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactHandleHelper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSValue.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSValueReader.h" />
@@ -91,6 +93,7 @@
   <ItemGroup Condition="'$(BuildMSRNCxx)' != 'false'">
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiAbiApi.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiApiContext.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiValueHelpers.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSValue.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSValueTreeReader.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSValueTreeWriter.cpp" />

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems.filters

@@ -12,6 +12,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiAbiApi.cpp">
       <Filter>JSI</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiValueHelpers.cpp">
+      <Filter>JSI</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)TurboModuleProvider.cpp">
       <Filter>TurboModule</Filter>
     </ClCompile>
@@ -110,6 +113,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\JsiAbiApi.h">
       <Filter>JSI</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\JsiValueHelpers.h">
+      <Filter>JSI</Filter>
+    </ClInclude>
     <ClInclude Include="$(JSI_SourcePath)\jsi\jsi.h">
       <Filter>JSI</Filter>
     </ClInclude>
@@ -151,6 +157,7 @@
       <Filter>JSI</Filter>
     </ClInclude>
     <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)CoreApp.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="JSI">

package/Microsoft.ReactNative.Managed/packages.lock.json

@@ -135,31 +135,8 @@
         "resolved": "2.2.9",
         "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
       },
-      "common": {
-        "type": "Project"
-      },
-      "fmt": {
-        "type": "Project"
-      },
-      "folly": {
-        "type": "Project",
-        "dependencies": {
-          "fmt": "1.0.0"
-        }
-      },
       "microsoft.reactnative": {
-        "type": "Project",
-        "dependencies": {
-          "Common": "1.0.0",
-          "Folly": "1.0.0",
-          "ReactCommon": "1.0.0"
-        }
-      },
-      "reactcommon": {
-        "type": "Project",
-        "dependencies": {
-          "Folly": "1.0.0"
-        }
+        "type": "Project"
       }
     },
     "UAP,Version=v10.0.16299/win10-arm": {

package/Mso/dispatchQueue/dispatchQueue.h

@@ -22,6 +22,7 @@ using DispatchTask = VoidFunctor;
 // Forward declarations
 struct DispatchLocalValueGuard;
 struct DispatchQueue;
+struct DispatchQueueSettings;
 struct DispatchSuspendGuard;
 struct DispatchTaskBatch;
 template <typename TInvoke, typename TCancel>
@@ -85,6 +86,13 @@ struct DispatchLocalValueGuard {
   void **m_tlsValue;
 };
 
+struct DispatchQueueSettings {
+  Mso::Functor<void(DispatchQueue const &)> TaskStarting;
+  Mso::Functor<void(DispatchQueue const &)> TaskCompleted;
+  Mso::Functor<void(DispatchQueue const &)> IdleWaitStarting;
+  Mso::Functor<void(DispatchQueue const &)> IdleWaitCompleted;
+};
+
 //! Serial or concurrent dispatch queue main API.
 //! Use Post or InvokeElsePost to post tasks for invocation.
 //! Use BeginTaskBatching to start tasks batching in current thread for the dispatch queue.
@@ -117,7 +125,7 @@ struct DispatchQueue {
   static DispatchQueue MakeSerialQueue() noexcept;
 
   //! Create new looper DispatchQueue on top of new std::thread. It owns the thread until shutdown.
-  static DispatchQueue MakeLooperQueue() noexcept;
+  static DispatchQueue MakeLooperQueue(DispatchQueueSettings const &settings = {}) noexcept;
 
   //! Get a dispatch queue for the current UI thread. The result is null if the UI thread has no system UI thread
   //! dispatcher.
@@ -417,7 +425,7 @@ struct IDispatchQueueStatic : IUnknown {
   virtual DispatchQueue MakeSerialQueue() noexcept = 0;
 
   //! Create new looper DispatchQueue on top of new std::thread. It owns the thread until shutdown.
-  virtual DispatchQueue MakeLooperQueue() noexcept = 0;
+  virtual DispatchQueue MakeLooperQueue(DispatchQueueSettings const &settings) noexcept = 0;
 
   //! Get a dispatch queue for the current UI thread. The result is null if the UI thread has no system UI thread
   //! dispatcher.
@@ -545,8 +553,8 @@ inline /*static*/ DispatchQueue DispatchQueue::MakeSerialQueue() noexcept {
   return IDispatchQueueStatic::Instance()->MakeSerialQueue();
 }
 
-inline /*static*/ DispatchQueue DispatchQueue::MakeLooperQueue() noexcept {
-  return IDispatchQueueStatic::Instance()->MakeLooperQueue();
+inline /*static*/ DispatchQueue DispatchQueue::MakeLooperQueue(DispatchQueueSettings const &settings) noexcept {
+  return IDispatchQueueStatic::Instance()->MakeLooperQueue(settings);
 }
 
 inline /*static*/ DispatchQueue DispatchQueue::GetCurrentUIThreadQueue() noexcept {