react-native-windows 0.70.13 → 0.70.15

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -709,6 +709,7 @@
         RNW_MAJOR=$(ReactNativeWindowsMajor);
         RNW_MINOR=$(ReactNativeWindowsMinor);
         RNW_PATCH=$(ReactNativeWindowsPatch);
+        RNW_COMMITID=$(ReactNativeWindowsCommitId);
         _UNICODE;
         UNICODE;
         %(PreprocessorDefinitions)

package/Microsoft.ReactNative/ReactHost/CrashManager.cpp

@@ -5,6 +5,7 @@
 #include "ReactInstanceWin.h"
 
 #include <winrt/Windows.Storage.h>
+#include <csignal>
 
 #include <WerApi.h>
 
@@ -14,7 +15,7 @@ namespace Mso::React {
 // That should be saved so that if needed it can be called after the new unhandled exception has finished executing.
 // This allows the Windows Error Reporting system to process the error and upload the data for processing.
 static LPTOP_LEVEL_EXCEPTION_FILTER g_previousExceptionFilter = nullptr;
-
+static _crt_signal_t g_previousSignalHandler = SIG_ERR;
 static std::wstring g_logFileName;
 static bool g_WERExceptionFilterWasCalled{false}; // Prevent recursion in the custom handler
 
@@ -29,9 +30,18 @@ extern "C" LONG WINAPI CustomWERExceptionFilter(LPEXCEPTION_POINTERS const excep
 
   CrashManager::OnUnhandledException();
 
+  if (exceptionPointers == nullptr) {
+    return EXCEPTION_EXECUTE_HANDLER;
+  }
+
   return g_previousExceptionFilter(exceptionPointers);
 }
 
+void __cdecl on_sigabrt(int signum) {
+  CustomWERExceptionFilter(nullptr);
+  signal(signum, SIG_DFL);
+}
+
 void InternalRegisterCustomHandler() noexcept {
   // Do this now because by the time we catch the exception we may be in OOM
 #ifndef CORE_ABI // win32 vs uwp file permissions
@@ -47,6 +57,8 @@ void InternalRegisterCustomHandler() noexcept {
   VerifySucceededElseCrash(::WerRegisterFile(g_logFileName.c_str(), WerRegFileTypeOther, WER_FILE_ANONYMOUS_DATA));
 
   g_previousExceptionFilter = ::SetUnhandledExceptionFilter(CustomWERExceptionFilter);
+
+  g_previousSignalHandler = signal(SIGABRT, &on_sigabrt);
 }
 
 void InternalUnregisterCustomHandler() noexcept {
@@ -56,6 +68,10 @@ void InternalUnregisterCustomHandler() noexcept {
     ::SetUnhandledExceptionFilter(g_previousExceptionFilter);
     g_previousExceptionFilter = nullptr;
   }
+
+  if (g_previousSignalHandler != SIG_ERR) {
+    signal(SIGABRT, g_previousSignalHandler);
+  }
 }
 
 /*static*/ void CrashManager::OnUnhandledException() noexcept {

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -425,6 +425,7 @@ void ReactInstanceWin::Initialize() noexcept {
 
           devSettings->waitingForDebuggerCallback = GetWaitingForDebuggerCallback();
           devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
+          devSettings->enableDefaultCrashHandler = m_options.EnableDefaultCrashHandler();
 
 #ifndef CORE_ABI
           devSettings->showDevMenuCallback = [weakThis]() noexcept {

package/Microsoft.ReactNative/Version.rc

@@ -10,6 +10,10 @@
 #define VER_FILEVERSION_STR XSTRINGIZE(RNW_VERSION)
 #define VER_FILEVERSION RNW_MAJOR,RNW_MINOR,RNW_PATCH,RNW_PKG_VERSION_BUILD
 
+#define VER_PRODUCTVERSION_STR XSTRINGIZE(RNW_VERSION+RNW_COMMITID)
+#define VER_PRODUCTVERSION RNW_MAJOR,RNW_MINOR,RNW_PATCH,RNW_PKG_VERSION_BUILD
+
+
 #ifndef DEBUG
 #define VER_DEBUG                   0
 #else
@@ -18,7 +22,7 @@
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-PRODUCTVERSION  VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
 FILEFLAGSMASK   (VS_FF_DEBUG)
 FILEFLAGS(VER_DEBUG)
 FILEOS          VOS__WINDOWS32
@@ -36,7 +40,7 @@ VALUE "InternalName", "Microsoft.ReactNative.dll"
 VALUE "LegalCopyright", "(c) Microsoft Corporation. All rights reserved."
 VALUE "OriginalFilename", "Microsoft.ReactNative.dll"
 VALUE "ProductName", "React-Native-Windows"
-VALUE "ProductVersion", VER_FILEVERSION_STR
+VALUE "ProductVersion", VER_PRODUCTVERSION_STR
 END
 END
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.70.13</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.70.15</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>70</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>13</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>15</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
+    <ReactNativeWindowsCommitId>d118724d1453d4d8e1d2b8ebee4229b683a92ef6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/PackageVersionDefinitions.props

@@ -15,6 +15,7 @@
         RNW_MAJOR=$(ReactNativeWindowsMajor);
         RNW_MINOR=$(ReactNativeWindowsMinor);
         RNW_PATCH=$(ReactNativeWindowsPatch);
+        RNW_COMMITID=$(ReactNativeWindowsCommitId);
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
 
@@ -31,6 +32,7 @@
         RNW_MAJOR=$(ReactNativeWindowsMajor);
         RNW_MINOR=$(ReactNativeWindowsMinor);
         RNW_PATCH=$(ReactNativeWindowsPatch);
+        RNW_COMMITID=$(ReactNativeWindowsCommitId);
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.70.13",
+  "version": "0.70.15",
   "license": "MIT",
   "repository": {
     "type": "git",