react-native-windows 0.71.10 → 0.72.0-preview.2

package/Shared/HermesSamplingProfiler.cpp

@@ -7,13 +7,46 @@
 #include <chrono>
 #include <future>
 
+#include "HermesRuntimeHolder.h"
 #include "HermesSamplingProfiler.h"
 #include "HermesShim.h"
+#include "IReactDispatcher.h"
+#include "ReactPropertyBag.h"
 #include "Utils.h"
 
+using namespace winrt::Microsoft::ReactNative;
+using namespace facebook::react;
+
 namespace Microsoft::ReactNative {
 
 namespace {
+
+// Implements an awaiter for Mso::DispatchQueue
+auto resume_in_dispatcher(const IReactDispatcher &dispatcher) noexcept {
+  struct awaitable {
+    awaitable(const IReactDispatcher &dispatcher) noexcept : dispatcher_(dispatcher) {}
+
+    bool await_ready() const noexcept {
+      return false;
+    }
+
+    void await_resume() const noexcept {}
+
+    void await_suspend(std::experimental::coroutine_handle<> resume) noexcept {
+      callback_ = [context = resume.address()]() noexcept {
+        std::experimental::coroutine_handle<>::from_address(context)();
+      };
+      dispatcher_.Post(std::move(callback_));
+    }
+
+   private:
+    IReactDispatcher dispatcher_;
+    ReactDispatcherCallback callback_;
+  };
+
+  return awaitable{dispatcher};
+}
+
 std::future<std::string> getTraceFilePath() noexcept {
   auto hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
   std::ostringstream os;
@@ -23,18 +56,27 @@ std::future<std::string> getTraceFilePath() noexcept {
   os << hermesDataPath << "\\cpu_" << now << ".cpuprofile";
   co_return os.str();
 }
+
 } // namespace
 
-bool HermesSamplingProfiler::s_isStarted = false;
+std::atomic_bool HermesSamplingProfiler::s_isStarted{false};
 std::string HermesSamplingProfiler::s_lastTraceFilePath;
 
 std::string HermesSamplingProfiler::GetLastTraceFilePath() noexcept {
   return s_lastTraceFilePath;
 }
 
-winrt::fire_and_forget HermesSamplingProfiler::Start() noexcept {
-  if (!s_isStarted) {
-    s_isStarted = true;
+winrt::fire_and_forget HermesSamplingProfiler::Start(
+    Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept {
+  bool expectedIsStarted = false;
+  if (s_isStarted.compare_exchange_strong(expectedIsStarted, true)) {
+    IReactDispatcher jsDispatcher = implementation::ReactDispatcher::GetJSDispatcher(reactContext->Properties());
+    ReactPropertyBag propertyBag = ReactPropertyBag(reactContext->Properties());
+
+    co_await resume_in_dispatcher(jsDispatcher);
+    std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);
+    hermesRuntimeHolder->addToProfiling();
+
     co_await winrt::resume_background();
     HermesShim::enableSamplingProfiler();
   }
@@ -42,20 +84,31 @@ winrt::fire_and_forget HermesSamplingProfiler::Start() noexcept {
   co_return;
 }
 
-std::future<std::string> HermesSamplingProfiler::Stop() noexcept {
-  if (s_isStarted) {
-    s_isStarted = false;
+std::future<std::string> HermesSamplingProfiler::Stop(
+    Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept {
+  bool expectedIsStarted = true;
+  if (s_isStarted.compare_exchange_strong(expectedIsStarted, false)) {
+    IReactDispatcher jsDispatcher = implementation::ReactDispatcher::GetJSDispatcher(reactContext->Properties());
+    ReactPropertyBag propertyBag = ReactPropertyBag(reactContext->Properties());
+
     co_await winrt::resume_background();
     HermesShim::disableSamplingProfiler();
+
     s_lastTraceFilePath = co_await getTraceFilePath();
     HermesShim::dumpSampledTraceToFile(s_lastTraceFilePath);
+
+    co_await resume_in_dispatcher(jsDispatcher);
+    std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);
+    hermesRuntimeHolder->removeFromProfiling();
+
+    co_await winrt::resume_background();
   }
 
   co_return s_lastTraceFilePath;
 }
 
 bool HermesSamplingProfiler::IsStarted() noexcept {
-  return s_isStarted;
+  return s_isStarted.load();
 }
 
 } // namespace Microsoft::ReactNative

package/Shared/HermesSamplingProfiler.h

@@ -3,19 +3,22 @@
 
 #pragma once
 
+#include <ReactHost/React.h>
+#include <atomic>
+#include <future>
 #include <string>
 
 namespace Microsoft::ReactNative {
 
 class HermesSamplingProfiler final {
  public:
-  static winrt::fire_and_forget Start() noexcept;
-  static std::future<std::string> Stop() noexcept;
+  static winrt::fire_and_forget Start(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept;
+  static std::future<std::string> Stop(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept;
   static std::string GetLastTraceFilePath() noexcept;
   static bool IsStarted() noexcept;
 
  private:
-  static bool s_isStarted;
+  static std::atomic_bool s_isStarted;
   static std::string s_lastTraceFilePath;
 };
 

package/Shared/HermesShim.cpp

@@ -4,115 +4,119 @@
 #include "HermesShim.h"
 #include "Crash.h"
 
-namespace Microsoft::ReactNative::HermesShim {
-
-static HMODULE s_hermesModule{nullptr};
-static decltype(&facebook::hermes::makeHermesRuntime) s_makeHermesRuntime{nullptr};
-static decltype(&facebook::hermes::HermesRuntime::enableSamplingProfiler) s_enableSamplingProfiler{nullptr};
-static decltype(&facebook::hermes::HermesRuntime::disableSamplingProfiler) s_disableSamplingProfiler{nullptr};
-static decltype(&facebook::hermes::HermesRuntime::dumpSampledTraceToFile) s_dumpSampledTraceToFile{nullptr};
-static decltype(&facebook::hermes::makeHermesRuntimeWithWER) s_makeHermesRuntimeWithWER{nullptr};
-static decltype(&facebook::hermes::hermesCrashHandler) s_hermesCrashHandler{nullptr};
-
-#if _M_X64
-constexpr const char *makeHermesRuntimeSymbol =
-    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@AEBVRuntimeConfig@vm@1@@Z";
-constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *dumpSampledTraceToFileSymbol =
-    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
-constexpr const char *makeHermesRuntimeWithWERSymbol =
-    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
-constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
-#endif
-
-#if _M_ARM64
-constexpr const char *makeHermesRuntimeSymbol =
-    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@AEBVRuntimeConfig@vm@1@@Z";
-constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *dumpSampledTraceToFileSymbol =
-    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
-constexpr const char *makeHermesRuntimeWithWERSymbol =
-    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
-constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
-#endif
-
-#if _M_IX86
-constexpr const char *makeHermesRuntimeSymbol =
-    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@ABVRuntimeConfig@vm@1@@Z";
-constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
-constexpr const char *dumpSampledTraceToFileSymbol =
-    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
-constexpr const char *makeHermesRuntimeWithWERSymbol =
-    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
-constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAAVHermesRuntime@12@H@Z";
-#endif
-
-static std::once_flag s_hermesLoading;
-
-static void EnsureHermesLoaded() noexcept {
+#define DECLARE_SYMBOL(symbol, importedSymbol) \
+  decltype(&importedSymbol) s_##symbol{};      \
+  constexpr const char symbol##Symbol[] = #importedSymbol;
+
+#define INIT_SYMBOL(symbol)                                                                            \
+  s_##symbol = reinterpret_cast<decltype(s_##symbol)>(GetProcAddress(s_hermesModule, symbol##Symbol)); \
+  VerifyElseCrash(s_##symbol);
+
+#define CRASH_ON_ERROR(result) VerifyElseCrash(result == hermes_ok);
+
+namespace Microsoft::ReactNative {
+
+namespace {
+
+DECLARE_SYMBOL(createRuntime, hermes_create_runtime);
+DECLARE_SYMBOL(createRuntimeWithWER, hermes_create_runtime_with_wer);
+DECLARE_SYMBOL(deleteRuntime, hermes_delete_runtime);
+DECLARE_SYMBOL(getNonAbiSafeRuntime, hermes_get_non_abi_safe_runtime);
+DECLARE_SYMBOL(dumpCrashData, hermes_dump_crash_data);
+DECLARE_SYMBOL(samplingProfilerEnable, hermes_sampling_profiler_enable);
+DECLARE_SYMBOL(samplingProfilerDisable, hermes_sampling_profiler_disable);
+DECLARE_SYMBOL(samplingProfilerAdd, hermes_sampling_profiler_add);
+DECLARE_SYMBOL(samplingProfilerRemove, hermes_sampling_profiler_remove);
+DECLARE_SYMBOL(samplingProfilerDumpToFile, hermes_sampling_profiler_dump_to_file);
+
+HMODULE s_hermesModule{};
+std::once_flag s_hermesLoading;
+
+void EnsureHermesLoaded() noexcept {
   std::call_once(s_hermesLoading, []() {
     VerifyElseCrashSz(!s_hermesModule, "Invalid state: \"hermes.dll\" being loaded again.");
 
     s_hermesModule = LoadLibrary(L"hermes.dll");
     VerifyElseCrashSz(s_hermesModule, "Could not load \"hermes.dll\"");
 
-    s_makeHermesRuntime =
-        reinterpret_cast<decltype(s_makeHermesRuntime)>(GetProcAddress(s_hermesModule, makeHermesRuntimeSymbol));
-    VerifyElseCrash(s_makeHermesRuntime);
+    INIT_SYMBOL(createRuntime);
+    INIT_SYMBOL(createRuntimeWithWER);
+    INIT_SYMBOL(deleteRuntime);
+    INIT_SYMBOL(getNonAbiSafeRuntime);
+    INIT_SYMBOL(dumpCrashData);
+    INIT_SYMBOL(samplingProfilerEnable);
+    INIT_SYMBOL(samplingProfilerDisable);
+    INIT_SYMBOL(samplingProfilerAdd);
+    INIT_SYMBOL(samplingProfilerRemove);
+    INIT_SYMBOL(samplingProfilerDumpToFile);
+  });
+}
+
+struct RuntimeDeleter {
+  RuntimeDeleter(std::shared_ptr<const HermesShim> &&hermesShimPtr) noexcept
+      : hermesShimPtr_(std::move(hermesShimPtr)) {}
 
-    s_enableSamplingProfiler = reinterpret_cast<decltype(s_enableSamplingProfiler)>(
-        GetProcAddress(s_hermesModule, enableSamlingProfilerSymbol));
-    VerifyElseCrash(s_enableSamplingProfiler);
+  void operator()(facebook::hermes::HermesRuntime * /*runtime*/) {
+    // Do nothing. Instead, we rely on the RuntimeDeleter destructor.
+  }
 
-    s_disableSamplingProfiler = reinterpret_cast<decltype(s_disableSamplingProfiler)>(
-        GetProcAddress(s_hermesModule, disableSamlingProfilerSymbol));
-    VerifyElseCrash(s_disableSamplingProfiler);
+ private:
+  std::shared_ptr<const HermesShim> hermesShimPtr_;
+};
 
-    s_dumpSampledTraceToFile = reinterpret_cast<decltype(s_dumpSampledTraceToFile)>(
-        GetProcAddress(s_hermesModule, dumpSampledTraceToFileSymbol));
-    VerifyElseCrash(s_dumpSampledTraceToFile);
+} // namespace
 
-    s_makeHermesRuntimeWithWER = reinterpret_cast<decltype(s_makeHermesRuntimeWithWER)>(
-        GetProcAddress(s_hermesModule, makeHermesRuntimeWithWERSymbol));
-    VerifyElseCrash(s_makeHermesRuntimeWithWER);
+HermesShim::HermesShim(hermes_runtime runtime) noexcept : runtime_(runtime) {
+  CRASH_ON_ERROR(s_getNonAbiSafeRuntime(runtime_, reinterpret_cast<void **>(&nonAbiSafeRuntime_)));
+}
 
-    s_hermesCrashHandler =
-        reinterpret_cast<decltype(s_hermesCrashHandler)>(GetProcAddress(s_hermesModule, hermesCrashHandlerSymbol));
-    VerifyElseCrash(s_hermesCrashHandler);
-  });
+HermesShim::~HermesShim() {
+  CRASH_ON_ERROR(s_deleteRuntime(runtime_));
 }
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes::vm::RuntimeConfig &runtimeConfig) {
+/*static*/ std::shared_ptr<HermesShim> HermesShim::make() noexcept {
   EnsureHermesLoaded();
-  return s_makeHermesRuntime(runtimeConfig);
+  hermes_runtime runtime{};
+  CRASH_ON_ERROR(s_createRuntime(&runtime));
+  return std::make_shared<HermesShim>(runtime);
 }
 
-void enableSamplingProfiler() {
+/*static*/
+std::shared_ptr<HermesShim> HermesShim::makeWithWER() noexcept {
   EnsureHermesLoaded();
-  s_enableSamplingProfiler();
+  hermes_runtime runtime{};
+  CRASH_ON_ERROR(s_createRuntimeWithWER(&runtime));
+  return std::make_shared<HermesShim>(runtime);
 }
 
-void disableSamplingProfiler() {
-  EnsureHermesLoaded();
-  s_disableSamplingProfiler();
+std::shared_ptr<facebook::hermes::HermesRuntime> HermesShim::getRuntime() const noexcept {
+  return std::shared_ptr<facebook::hermes::HermesRuntime>(nonAbiSafeRuntime_, RuntimeDeleter(shared_from_this()));
 }
 
-void dumpSampledTraceToFile(const std::string &fileName) {
+void HermesShim::dumpCrashData(int fileDescriptor) const noexcept {
+  CRASH_ON_ERROR(s_dumpCrashData(runtime_, fileDescriptor));
+}
+
+/*static*/ void HermesShim::enableSamplingProfiler() noexcept {
   EnsureHermesLoaded();
-  s_dumpSampledTraceToFile(fileName);
+  CRASH_ON_ERROR(s_samplingProfilerEnable());
 }
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER() {
+/*static*/ void HermesShim::disableSamplingProfiler() noexcept {
   EnsureHermesLoaded();
-  return s_makeHermesRuntimeWithWER();
+  CRASH_ON_ERROR(s_samplingProfilerDisable());
 }
 
-void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor) {
+/*static*/ void HermesShim::dumpSampledTraceToFile(const std::string &fileName) noexcept {
   EnsureHermesLoaded();
-  s_hermesCrashHandler(runtime, fileDescriptor);
+  CRASH_ON_ERROR(s_samplingProfilerDumpToFile(fileName.c_str()));
+}
+void HermesShim::addToProfiling() const noexcept {
+  CRASH_ON_ERROR(s_samplingProfilerAdd(runtime_));
+}
+
+void HermesShim::removeFromProfiling() const noexcept {
+  CRASH_ON_ERROR(s_samplingProfilerRemove(runtime_));
 }
 
-} // namespace Microsoft::ReactNative::HermesShim
+} // namespace Microsoft::ReactNative

package/Shared/HermesShim.h

@@ -9,13 +9,33 @@
 //! use pure delay-loading to achieve this, since WACK will detect the
 //! non-present DLL. Functions in this namespace shim to the Hermes DLL via
 //! GetProcAddress.
-namespace Microsoft::ReactNative::HermesShim {
+namespace Microsoft::ReactNative {
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes::vm::RuntimeConfig &runtimeConfig);
-void enableSamplingProfiler();
-void disableSamplingProfiler();
-void dumpSampledTraceToFile(const std::string &fileName);
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER();
-void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor);
+class HermesShim : public std::enable_shared_from_this<HermesShim> {
+ public:
+  HermesShim(hermes_runtime runtimeAbiPtr) noexcept;
+  ~HermesShim();
 
-} // namespace Microsoft::ReactNative::HermesShim
+  static std::shared_ptr<HermesShim> make() noexcept;
+  static std::shared_ptr<HermesShim> makeWithWER() noexcept;
+
+  std::shared_ptr<facebook::hermes::HermesRuntime> getRuntime() const noexcept;
+
+  void dumpCrashData(int fileDescriptor) const noexcept;
+
+  static void enableSamplingProfiler() noexcept;
+  static void disableSamplingProfiler() noexcept;
+  static void dumpSampledTraceToFile(const std::string &fileName) noexcept;
+  void addToProfiling() const noexcept;
+  void removeFromProfiling() const noexcept;
+
+  HermesShim(const HermesShim &) = delete;
+  HermesShim &operator=(const HermesShim &) = delete;
+
+ private:
+  // It must be a raw pointer to avoid circular reference.
+  facebook::hermes::HermesRuntime *nonAbiSafeRuntime_{};
+  hermes_runtime runtime_{};
+};
+
+} // namespace Microsoft::ReactNative

package/Shared/JSI/ChakraRuntime.cpp

@@ -446,14 +446,14 @@ bool ChakraRuntime::hasProperty(const facebook::jsi::Object &obj, const facebook
 }
 
 void ChakraRuntime::setPropertyValue(
-    facebook::jsi::Object &object,
+    const facebook::jsi::Object &object,
     const facebook::jsi::PropNameID &name,
     const facebook::jsi::Value &value) {
   SetProperty(GetJsRef(object), GetJsRef(name), ToJsValueRef(value));
 }
 
 void ChakraRuntime::setPropertyValue(
-    facebook::jsi::Object &object,
+    const facebook::jsi::Object &object,
     const facebook::jsi::String &name,
     const facebook::jsi::Value &value) {
   SetProperty(GetJsRef(object), GetPropertyIdFromString(GetJsRef(name)), ToJsValueRef(value));
@@ -545,7 +545,7 @@ facebook::jsi::WeakObject ChakraRuntime::createWeakObject(const facebook::jsi::O
   return make<facebook::jsi::WeakObject>(CloneChakraPointerValue(getPointerValue(object)));
 }
 
-facebook::jsi::Value ChakraRuntime::lockWeakObject(facebook::jsi::WeakObject &weakObject) {
+facebook::jsi::Value ChakraRuntime::lockWeakObject(const facebook::jsi::WeakObject &weakObject) {
   // We need to make a copy of the ChakraObjectRef held within weakObj's
   // member PointerValue for the returned jsi::Value here.
   return ToJsiValue(GetJsRef(weakObject));
@@ -585,7 +585,10 @@ facebook::jsi::Value ChakraRuntime::getValueAtIndex(const facebook::jsi::Array &
   return ToJsiValue(GetIndexedProperty(GetJsRef(arr), static_cast<int>(index)));
 }
 
-void ChakraRuntime::setValueAtIndexImpl(facebook::jsi::Array &arr, size_t index, const facebook::jsi::Value &value) {
+void ChakraRuntime::setValueAtIndexImpl(
+    const facebook::jsi::Array &arr,
+    size_t index,
+    const facebook::jsi::Value &value) {
   assert(isArray(arr));
   assert(index <= static_cast<size_t>((std::numeric_limits<int>::max)()));
 

package/Shared/JSI/ChakraRuntime.h

@@ -99,11 +99,11 @@ class ChakraRuntime : public facebook::jsi::Runtime, public ChakraApi, ChakraApi
   bool hasProperty(const facebook::jsi::Object &obj, const facebook::jsi::PropNameID &name) override;
   bool hasProperty(const facebook::jsi::Object &obj, const facebook::jsi::String &name) override;
   void setPropertyValue(
-      facebook::jsi::Object &obj,
+      const facebook::jsi::Object &obj,
       const facebook::jsi::PropNameID &name,
       const facebook::jsi::Value &value) override;
   void setPropertyValue(
-      facebook::jsi::Object &obj,
+      const facebook::jsi::Object &obj,
       const facebook::jsi::String &name,
       const facebook::jsi::Value &value) override;
 
@@ -117,7 +117,7 @@ class ChakraRuntime : public facebook::jsi::Runtime, public ChakraApi, ChakraApi
   facebook::jsi::Array getPropertyNames(const facebook::jsi::Object &obj) override;
 
   facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object &obj) override;
-  facebook::jsi::Value lockWeakObject(facebook::jsi::WeakObject &weakObj) override;
+  facebook::jsi::Value lockWeakObject(const facebook::jsi::WeakObject &weakObj) override;
 
   facebook::jsi::Array createArray(size_t length) override;
   size_t size(const facebook::jsi::Array &arr) override;
@@ -127,7 +127,7 @@ class ChakraRuntime : public facebook::jsi::Runtime, public ChakraApi, ChakraApi
   // the ArrayBuffer for the purpose of garbage collection.
   uint8_t *data(const facebook::jsi::ArrayBuffer &arrBuf) override;
   facebook::jsi::Value getValueAtIndex(const facebook::jsi::Array &arr, size_t index) override;
-  void setValueAtIndexImpl(facebook::jsi::Array &arr, size_t index, const facebook::jsi::Value &value) override;
+  void setValueAtIndexImpl(const facebook::jsi::Array &arr, size_t index, const facebook::jsi::Value &value) override;
 
   facebook::jsi::Function createFunctionFromHostFunction(
       const facebook::jsi::PropNameID &name,

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -8,6 +8,8 @@
 #include "RuntimeHolder.h"
 #include "ScriptStore.h"
 
+#include <cxxreact/MessageQueueThread.h>
+
 namespace Microsoft::JSI {
 
 class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {

package/Shared/JSI/RuntimeHolder.h

@@ -11,7 +11,7 @@ namespace Microsoft::JSI {
 // a. lazily create a JSI Runtime on the first call to getRuntime
 // b. subsequent calls to getRuntime should return the Runtime created in (a)
 
-// Note :: All calls to getRuntime() should happen on the same thread unless you are sure that
+// Note: all calls to getRuntime() should happen on the same thread unless you are sure that
 // the underlying Runtime instance is thread safe.
 
 struct RuntimeHolderLazyInit {
@@ -21,7 +21,7 @@ struct RuntimeHolderLazyInit {
   virtual void teardown() noexcept {};
 
   // You can call this when a crash happens to attempt recording additional data
-  // The fd supplied is a raw file stream an implementation might write JSON to
+  // The fileDescriptor supplied is a raw file stream an implementation might write JSON to.
   virtual void crashHandler(int fileDescriptor) noexcept {};
 };
 

package/Shared/Logging.cpp

@@ -33,7 +33,7 @@ void InitializeLogging(NativeLoggingHook &&hook) {
   JSNativeHooks::loggingHook = LogHook;
   JSNativeHooks::nowHook = nativePerformanceNow;
 
-  ReactMarker::logTaggedMarker = logMarker;
+  ReactMarker::logTaggedMarkerImpl = logMarker;
 }
 
 } // namespace react

package/Shared/Modules/BlobModule.cpp

@@ -12,9 +12,6 @@
 // React Native
 #include <cxxreact/JsArgumentHelpers.h>
 
-// Boost Libriaries
-#include <boost/uuid/uuid_io.hpp>
-
 // Windows API
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Security.Cryptography.h>
@@ -36,6 +33,7 @@ using winrt::Microsoft::ReactNative::IReactPropertyBag;
 using winrt::Microsoft::ReactNative::ReactNonAbiValue;
 using winrt::Microsoft::ReactNative::ReactPropertyBag;
 using winrt::Microsoft::ReactNative::ReactPropertyId;
+using winrt::Windows::Foundation::GuidHelper;
 using winrt::Windows::Foundation::IInspectable;
 using winrt::Windows::Foundation::Uri;
 using winrt::Windows::Security::Cryptography::CryptographicBuffer;
@@ -251,7 +249,8 @@ void MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message, string &&blobI
 }
 
 string MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message) noexcept {
-  auto blobId = boost::uuids::to_string(m_guidGenerator());
+  // substr(1, 36) strips curly braces from a GUID.
+  auto blobId = winrt::to_string(winrt::to_hstring(GuidHelper::CreateNewGuid())).substr(1, 36);
 
   scoped_lock lock{m_mutex};
   m_blobs.insert_or_assign(blobId, std::move(message));

package/Shared/Modules/BlobModule.h

@@ -11,9 +11,6 @@
 // React Native
 #include <cxxreact/CxxModule.h>
 
-// Boost Libraries
-#include <boost/uuid/uuid_generators.hpp>
-
 // Windows API
 #include <winrt/base.h>
 
@@ -29,7 +26,6 @@ namespace Microsoft::React {
 class MemoryBlobPersistor final : public IBlobPersistor {
   std::unordered_map<std::string, std::vector<uint8_t>> m_blobs;
   std::mutex m_mutex;
-  boost::uuids::random_generator m_guidGenerator;
 
  public:
 #pragma region IBlobPersistor

package/Shared/Networking/OriginPolicyHttpFilter.cpp

@@ -37,26 +37,22 @@ namespace Microsoft::React::Networking {
 
 #pragma region OriginPolicyHttpFilter
 
-#pragma region CaseInsensitiveComparer
+#pragma region ConstWcharComparer
 
-bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wchar_t *a, const wchar_t *b) const {
+bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, const wchar_t *b) const {
   return _wcsicmp(a, b) < 0;
 }
 
-bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &a, const wstring &b) const {
-  return _wcsicmp(a.c_str(), b.c_str()) < 0;
-}
-
-#pragma endregion CaseInsensitiveComparer
+#pragma endregion ConstWcharComparer
 
 // https://fetch.spec.whatwg.org/#forbidden-method
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
-    OriginPolicyHttpFilter::s_forbiddenMethods = {L"CONNECT", L"TRACE", L"TRACK"};
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer> OriginPolicyHttpFilter::s_forbiddenMethods =
+    {L"CONNECT", L"TRACE", L"TRACK"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_simpleCorsMethods = {L"GET", L"HEAD", L"POST"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_simpleCorsRequestHeaderNames = {
         L"Accept",
         L"Accept-Language",
@@ -68,11 +64,11 @@ bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &
         L"Viewport-Width",
         L"Width"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_simpleCorsResponseHeaderNames =
         {L"Cache-Control", L"Content-Language", L"Content-Type", L"Expires", L"Last-Modified", L"Pragma"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_simpleCorsContentTypeValues = {
         L"application/x-www-form-urlencoded",
         L"multipart/form-data",
@@ -80,7 +76,7 @@ bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &
 
 // https://fetch.spec.whatwg.org/#forbidden-header-name
 // Chromium still bans "User-Agent" due to https://crbug.com/571722
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_corsForbiddenRequestHeaderNames = {
         L"Accept-Charset",
         L"Accept-Encoding",
@@ -103,13 +99,13 @@ bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &
         L"Upgrade",
         L"Via"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_cookieSettingResponseHeaders = {
         L"Set-Cookie",
         L"Set-Cookie2", // Deprecated by the spec, but probably still used
 };
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
     OriginPolicyHttpFilter::s_corsForbiddenRequestHeaderNamePrefixes = {L"Proxy-", L"Sec-"};
 
 /*static*/ Uri OriginPolicyHttpFilter::s_origin{nullptr};
@@ -297,7 +293,7 @@ bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &
 }
 
 /*static*/ OriginPolicyHttpFilter::AccessControlValues OriginPolicyHttpFilter::ExtractAccessControlValues(
-    IMap<hstring, hstring> const &headers) {
+    winrt::Windows::Foundation::Collections::IMap<hstring, hstring> const &headers) {
   using std::wregex;
   using std::wsregex_token_iterator;