react-native-windows 0.70.14 → 0.70.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/Directory.Build.props
CHANGED
|
@@ -23,6 +23,25 @@
|
|
|
23
23
|
<FmtCommitHash>9e8b86fd2d9806672cc73133d21780dd182bfd24</FmtCommitHash>
|
|
24
24
|
</PropertyGroup>
|
|
25
25
|
|
|
26
|
+
<!--
|
|
27
|
+
IMPORTANT: Traversals left in a directory will break some tools like midl, but we also cannot call
|
|
28
|
+
[MSBuild]::NormalizeDirectory on relative paths since cwd is not always correct. This logic should prefer to operate
|
|
29
|
+
on full paths and avoid extra normalization.
|
|
30
|
+
-->
|
|
31
|
+
<PropertyGroup>
|
|
32
|
+
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
|
|
33
|
+
|
|
34
|
+
<ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
|
|
35
|
+
|
|
36
|
+
<YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
|
|
37
|
+
|
|
38
|
+
<FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
|
|
39
|
+
<FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
|
|
40
|
+
|
|
41
|
+
<FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
|
|
42
|
+
<FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
|
|
43
|
+
</PropertyGroup>
|
|
44
|
+
|
|
26
45
|
<PropertyGroup Label="Configuration">
|
|
27
46
|
<ProjectName Condition="'$(ProjectName)'==''">$(MSBuildProjectName)</ProjectName>
|
|
28
47
|
|
|
@@ -46,25 +65,6 @@
|
|
|
46
65
|
<OutputPath Condition="'$(MSBuildProjectExtension)' == '.csproj'">$(OutDir)</OutputPath>
|
|
47
66
|
</PropertyGroup>
|
|
48
67
|
|
|
49
|
-
<!--
|
|
50
|
-
IMPORTANT: Traversals left in a directory will break some tools like midl, but we also cannot call
|
|
51
|
-
[MSBuild]::NormalizeDirectory on relative paths since cwd is not always correct. This logic should prefer to operate
|
|
52
|
-
on full paths and avoid extra normalization.
|
|
53
|
-
-->
|
|
54
|
-
<PropertyGroup>
|
|
55
|
-
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
|
|
56
|
-
|
|
57
|
-
<ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
|
|
58
|
-
|
|
59
|
-
<YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
|
|
60
|
-
|
|
61
|
-
<FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
|
|
62
|
-
<FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
|
|
63
|
-
|
|
64
|
-
<FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
|
|
65
|
-
<FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
|
|
66
|
-
</PropertyGroup>
|
|
67
|
-
|
|
68
68
|
<PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
|
|
69
69
|
<!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
|
|
70
70
|
<RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
#include "ReactInstanceWin.h"
|
|
6
6
|
|
|
7
7
|
#include <winrt/Windows.Storage.h>
|
|
8
|
+
#include <csignal>
|
|
8
9
|
|
|
9
10
|
#include <WerApi.h>
|
|
10
11
|
|
|
@@ -14,7 +15,7 @@ namespace Mso::React {
|
|
|
14
15
|
// That should be saved so that if needed it can be called after the new unhandled exception has finished executing.
|
|
15
16
|
// This allows the Windows Error Reporting system to process the error and upload the data for processing.
|
|
16
17
|
static LPTOP_LEVEL_EXCEPTION_FILTER g_previousExceptionFilter = nullptr;
|
|
17
|
-
|
|
18
|
+
static _crt_signal_t g_previousSignalHandler = SIG_ERR;
|
|
18
19
|
static std::wstring g_logFileName;
|
|
19
20
|
static bool g_WERExceptionFilterWasCalled{false}; // Prevent recursion in the custom handler
|
|
20
21
|
|
|
@@ -29,9 +30,18 @@ extern "C" LONG WINAPI CustomWERExceptionFilter(LPEXCEPTION_POINTERS const excep
|
|
|
29
30
|
|
|
30
31
|
CrashManager::OnUnhandledException();
|
|
31
32
|
|
|
33
|
+
if (exceptionPointers == nullptr) {
|
|
34
|
+
return EXCEPTION_EXECUTE_HANDLER;
|
|
35
|
+
}
|
|
36
|
+
|
|
32
37
|
return g_previousExceptionFilter(exceptionPointers);
|
|
33
38
|
}
|
|
34
39
|
|
|
40
|
+
void __cdecl on_sigabrt(int signum) {
|
|
41
|
+
CustomWERExceptionFilter(nullptr);
|
|
42
|
+
signal(signum, SIG_DFL);
|
|
43
|
+
}
|
|
44
|
+
|
|
35
45
|
void InternalRegisterCustomHandler() noexcept {
|
|
36
46
|
// Do this now because by the time we catch the exception we may be in OOM
|
|
37
47
|
#ifndef CORE_ABI // win32 vs uwp file permissions
|
|
@@ -47,6 +57,8 @@ void InternalRegisterCustomHandler() noexcept {
|
|
|
47
57
|
VerifySucceededElseCrash(::WerRegisterFile(g_logFileName.c_str(), WerRegFileTypeOther, WER_FILE_ANONYMOUS_DATA));
|
|
48
58
|
|
|
49
59
|
g_previousExceptionFilter = ::SetUnhandledExceptionFilter(CustomWERExceptionFilter);
|
|
60
|
+
|
|
61
|
+
g_previousSignalHandler = signal(SIGABRT, &on_sigabrt);
|
|
50
62
|
}
|
|
51
63
|
|
|
52
64
|
void InternalUnregisterCustomHandler() noexcept {
|
|
@@ -56,6 +68,10 @@ void InternalUnregisterCustomHandler() noexcept {
|
|
|
56
68
|
::SetUnhandledExceptionFilter(g_previousExceptionFilter);
|
|
57
69
|
g_previousExceptionFilter = nullptr;
|
|
58
70
|
}
|
|
71
|
+
|
|
72
|
+
if (g_previousSignalHandler != SIG_ERR) {
|
|
73
|
+
signal(SIGABRT, g_previousSignalHandler);
|
|
74
|
+
}
|
|
59
75
|
}
|
|
60
76
|
|
|
61
77
|
/*static*/ void CrashManager::OnUnhandledException() noexcept {
|
|
@@ -425,6 +425,7 @@ void ReactInstanceWin::Initialize() noexcept {
|
|
|
425
425
|
|
|
426
426
|
devSettings->waitingForDebuggerCallback = GetWaitingForDebuggerCallback();
|
|
427
427
|
devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
|
|
428
|
+
devSettings->enableDefaultCrashHandler = m_options.EnableDefaultCrashHandler();
|
|
428
429
|
|
|
429
430
|
#ifndef CORE_ABI
|
|
430
431
|
devSettings->showDevMenuCallback = [weakThis]() noexcept {
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.70.
|
|
13
|
+
<ReactNativeWindowsVersion>0.70.16</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>70</ReactNativeWindowsMinor>
|
|
16
|
-
<ReactNativeWindowsPatch>
|
|
16
|
+
<ReactNativeWindowsPatch>16</ReactNativeWindowsPatch>
|
|
17
17
|
<ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
|
|
18
|
-
<ReactNativeWindowsCommitId>
|
|
18
|
+
<ReactNativeWindowsCommitId>767d722fabc2c56778d12ae66f53e868aa8ef5d6</ReactNativeWindowsCommitId>
|
|
19
19
|
</PropertyGroup>
|
|
20
20
|
</Project>
|