react-native-windows 0.74.47 → 0.74.48
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 +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +2 -2
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +3 -0
- package/Microsoft.ReactNative/packages.lock.json +30 -106
- package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems +1 -1
- package/Microsoft.ReactNative.Managed/packages.lock.json +3 -3
- package/PropertySheets/Generated/PackageVersion.g.props +3 -3
- package/PropertySheets/JSEngine.props +1 -1
- package/ReactCommon/TEMP_UntilReactCommonUpdate/jsi/jsi/test/testlib.cpp +4 -4
- package/ReactCommon/cgmanifest.json +1 -1
- package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 +26 -4
- package/package.json +1 -1
- package/fmt/packages.lock.json +0 -13
package/Directory.Build.props
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
<FmtVersion>10.1.0</FmtVersion>
|
|
23
23
|
<FmtCommitHash>ca2e3685b160617d3d95fcd9e789c4e06ca88</FmtCommitHash>
|
|
24
24
|
<!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
|
|
25
|
-
<NodeApiJsiCommitHash>
|
|
25
|
+
<NodeApiJsiCommitHash>21b47f08b762b21b1d4d970940ab23f59f43249c</NodeApiJsiCommitHash>
|
|
26
26
|
</PropertyGroup>
|
|
27
27
|
|
|
28
28
|
<!--
|
|
@@ -381,7 +381,7 @@ void ComponentView::onGotFocus(
|
|
|
381
381
|
focusRect.size.height += (FOCUS_VISUAL_WIDTH * 2);
|
|
382
382
|
focusVisualRoot(focusRect)->hostFocusVisual(true, get_strong());
|
|
383
383
|
}
|
|
384
|
-
if (
|
|
384
|
+
if (EnsureUiaProvider()) {
|
|
385
385
|
auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
|
|
386
386
|
if (spProviderSimple != nullptr) {
|
|
387
387
|
winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
|
|
@@ -88,6 +88,8 @@ void RootComponentView::SetFocusedComponent(
|
|
|
88
88
|
->onLostFocus(args);
|
|
89
89
|
}
|
|
90
90
|
|
|
91
|
+
m_focusedComponent = value;
|
|
92
|
+
|
|
91
93
|
if (value) {
|
|
92
94
|
if (auto rootView = m_wkRootView.get()) {
|
|
93
95
|
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->TrySetFocus();
|
|
@@ -95,8 +97,6 @@ void RootComponentView::SetFocusedComponent(
|
|
|
95
97
|
auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::GotFocusEventArgs>(value, direction);
|
|
96
98
|
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onGotFocus(args);
|
|
97
99
|
}
|
|
98
|
-
|
|
99
|
-
m_focusedComponent = value;
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept {
|
package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp
CHANGED
|
@@ -1592,6 +1592,9 @@ WindowsTextInputComponentView::createVisual() noexcept {
|
|
|
1592
1592
|
LRESULT res;
|
|
1593
1593
|
winrt::check_hresult(m_textServices->TxSendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0, &res));
|
|
1594
1594
|
|
|
1595
|
+
// Enable TSF support
|
|
1596
|
+
winrt::check_hresult(m_textServices->TxSendMessage(EM_SETEDITSTYLE, SES_USECTF, SES_USECTF, nullptr));
|
|
1597
|
+
|
|
1595
1598
|
m_caretVisual = m_compContext.CreateCaretVisual();
|
|
1596
1599
|
visual.InsertAt(m_caretVisual.InnerVisual(), 0);
|
|
1597
1600
|
m_caretVisual.IsVisible(false);
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
},
|
|
11
11
|
"Microsoft.JavaScript.Hermes": {
|
|
12
12
|
"type": "Direct",
|
|
13
|
-
"requested": "[0.
|
|
14
|
-
"resolved": "0.
|
|
15
|
-
"contentHash": "
|
|
13
|
+
"requested": "[0.0.0-2511.7001-d7ca19b3, )",
|
|
14
|
+
"resolved": "0.0.0-2511.7001-d7ca19b3",
|
|
15
|
+
"contentHash": "/EGy/gbTWpFZPZ4Z81QxbGQxpZhqiOE3qrnSokZRgXAyHivl15s7zZkRLOy9daDmVyEfanq7YBCOMi0ha58uQA=="
|
|
16
16
|
},
|
|
17
17
|
"Microsoft.SourceLink.GitHub": {
|
|
18
18
|
"type": "Direct",
|
|
@@ -24,22 +24,21 @@
|
|
|
24
24
|
"Microsoft.SourceLink.Common": "1.1.1"
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
|
+
"Microsoft.UI.Xaml": {
|
|
28
|
+
"type": "Direct",
|
|
29
|
+
"requested": "[2.8.0, )",
|
|
30
|
+
"resolved": "2.8.0",
|
|
31
|
+
"contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
|
|
32
|
+
"dependencies": {
|
|
33
|
+
"Microsoft.Web.WebView2": "1.0.1264.42"
|
|
34
|
+
}
|
|
35
|
+
},
|
|
27
36
|
"Microsoft.Windows.CppWinRT": {
|
|
28
37
|
"type": "Direct",
|
|
29
38
|
"requested": "[2.0.230706.1, )",
|
|
30
39
|
"resolved": "2.0.230706.1",
|
|
31
40
|
"contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
|
|
32
41
|
},
|
|
33
|
-
"Microsoft.WindowsAppSDK": {
|
|
34
|
-
"type": "Direct",
|
|
35
|
-
"requested": "[1.7.250401001, )",
|
|
36
|
-
"resolved": "1.7.250401001",
|
|
37
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
38
|
-
"dependencies": {
|
|
39
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
40
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
41
|
-
}
|
|
42
|
-
},
|
|
43
42
|
"Microsoft.Build.Tasks.Git": {
|
|
44
43
|
"type": "Transitive",
|
|
45
44
|
"resolved": "1.1.1",
|
|
@@ -52,13 +51,8 @@
|
|
|
52
51
|
},
|
|
53
52
|
"Microsoft.Web.WebView2": {
|
|
54
53
|
"type": "Transitive",
|
|
55
|
-
"resolved": "1.0.
|
|
56
|
-
"contentHash": "
|
|
57
|
-
},
|
|
58
|
-
"Microsoft.Windows.SDK.BuildTools": {
|
|
59
|
-
"type": "Transitive",
|
|
60
|
-
"resolved": "10.0.22621.756",
|
|
61
|
-
"contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
|
|
54
|
+
"resolved": "1.0.1264.42",
|
|
55
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
62
56
|
},
|
|
63
57
|
"common": {
|
|
64
58
|
"type": "Project",
|
|
@@ -72,8 +66,8 @@
|
|
|
72
66
|
"folly": {
|
|
73
67
|
"type": "Project",
|
|
74
68
|
"dependencies": {
|
|
75
|
-
"
|
|
76
|
-
"
|
|
69
|
+
"boost": "[1.83.0, )",
|
|
70
|
+
"fmt": "[1.0.0, )"
|
|
77
71
|
}
|
|
78
72
|
},
|
|
79
73
|
"reactcommon": {
|
|
@@ -85,122 +79,52 @@
|
|
|
85
79
|
}
|
|
86
80
|
},
|
|
87
81
|
"native,Version=v0.0/win10-arm": {
|
|
88
|
-
"Microsoft.WindowsAppSDK": {
|
|
89
|
-
"type": "Direct",
|
|
90
|
-
"requested": "[1.7.250401001, )",
|
|
91
|
-
"resolved": "1.7.250401001",
|
|
92
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
93
|
-
"dependencies": {
|
|
94
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
95
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
82
|
"Microsoft.Web.WebView2": {
|
|
99
83
|
"type": "Transitive",
|
|
100
|
-
"resolved": "1.0.
|
|
101
|
-
"contentHash": "
|
|
84
|
+
"resolved": "1.0.1264.42",
|
|
85
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
102
86
|
}
|
|
103
87
|
},
|
|
104
88
|
"native,Version=v0.0/win10-arm-aot": {
|
|
105
|
-
"Microsoft.WindowsAppSDK": {
|
|
106
|
-
"type": "Direct",
|
|
107
|
-
"requested": "[1.7.250401001, )",
|
|
108
|
-
"resolved": "1.7.250401001",
|
|
109
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
110
|
-
"dependencies": {
|
|
111
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
112
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
113
|
-
}
|
|
114
|
-
},
|
|
115
89
|
"Microsoft.Web.WebView2": {
|
|
116
90
|
"type": "Transitive",
|
|
117
|
-
"resolved": "1.0.
|
|
118
|
-
"contentHash": "
|
|
91
|
+
"resolved": "1.0.1264.42",
|
|
92
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
119
93
|
}
|
|
120
94
|
},
|
|
121
95
|
"native,Version=v0.0/win10-arm64-aot": {
|
|
122
|
-
"Microsoft.WindowsAppSDK": {
|
|
123
|
-
"type": "Direct",
|
|
124
|
-
"requested": "[1.7.250401001, )",
|
|
125
|
-
"resolved": "1.7.250401001",
|
|
126
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
127
|
-
"dependencies": {
|
|
128
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
129
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
130
|
-
}
|
|
131
|
-
},
|
|
132
96
|
"Microsoft.Web.WebView2": {
|
|
133
97
|
"type": "Transitive",
|
|
134
|
-
"resolved": "1.0.
|
|
135
|
-
"contentHash": "
|
|
98
|
+
"resolved": "1.0.1264.42",
|
|
99
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
136
100
|
}
|
|
137
101
|
},
|
|
138
102
|
"native,Version=v0.0/win10-x64": {
|
|
139
|
-
"Microsoft.WindowsAppSDK": {
|
|
140
|
-
"type": "Direct",
|
|
141
|
-
"requested": "[1.7.250401001, )",
|
|
142
|
-
"resolved": "1.7.250401001",
|
|
143
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
144
|
-
"dependencies": {
|
|
145
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
146
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
147
|
-
}
|
|
148
|
-
},
|
|
149
103
|
"Microsoft.Web.WebView2": {
|
|
150
104
|
"type": "Transitive",
|
|
151
|
-
"resolved": "1.0.
|
|
152
|
-
"contentHash": "
|
|
105
|
+
"resolved": "1.0.1264.42",
|
|
106
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
153
107
|
}
|
|
154
108
|
},
|
|
155
109
|
"native,Version=v0.0/win10-x64-aot": {
|
|
156
|
-
"Microsoft.WindowsAppSDK": {
|
|
157
|
-
"type": "Direct",
|
|
158
|
-
"requested": "[1.7.250401001, )",
|
|
159
|
-
"resolved": "1.7.250401001",
|
|
160
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
161
|
-
"dependencies": {
|
|
162
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
163
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
164
|
-
}
|
|
165
|
-
},
|
|
166
110
|
"Microsoft.Web.WebView2": {
|
|
167
111
|
"type": "Transitive",
|
|
168
|
-
"resolved": "1.0.
|
|
169
|
-
"contentHash": "
|
|
112
|
+
"resolved": "1.0.1264.42",
|
|
113
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
170
114
|
}
|
|
171
115
|
},
|
|
172
116
|
"native,Version=v0.0/win10-x86": {
|
|
173
|
-
"Microsoft.WindowsAppSDK": {
|
|
174
|
-
"type": "Direct",
|
|
175
|
-
"requested": "[1.7.250401001, )",
|
|
176
|
-
"resolved": "1.7.250401001",
|
|
177
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
178
|
-
"dependencies": {
|
|
179
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
180
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
181
|
-
}
|
|
182
|
-
},
|
|
183
117
|
"Microsoft.Web.WebView2": {
|
|
184
118
|
"type": "Transitive",
|
|
185
|
-
"resolved": "1.0.
|
|
186
|
-
"contentHash": "
|
|
119
|
+
"resolved": "1.0.1264.42",
|
|
120
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
187
121
|
}
|
|
188
122
|
},
|
|
189
123
|
"native,Version=v0.0/win10-x86-aot": {
|
|
190
|
-
"Microsoft.WindowsAppSDK": {
|
|
191
|
-
"type": "Direct",
|
|
192
|
-
"requested": "[1.7.250401001, )",
|
|
193
|
-
"resolved": "1.7.250401001",
|
|
194
|
-
"contentHash": "kPsJ2LZoo3Xs/6FtIWMZRGnQ2ZMx9zDa0ZpqRGz1qwZr0gwwlXZJTmngaA1Ym2AHmIa05NtX2jEE2He8CzfhTg==",
|
|
195
|
-
"dependencies": {
|
|
196
|
-
"Microsoft.Web.WebView2": "1.0.2903.40",
|
|
197
|
-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
|
|
198
|
-
}
|
|
199
|
-
},
|
|
200
124
|
"Microsoft.Web.WebView2": {
|
|
201
125
|
"type": "Transitive",
|
|
202
|
-
"resolved": "1.0.
|
|
203
|
-
"contentHash": "
|
|
126
|
+
"resolved": "1.0.1264.42",
|
|
127
|
+
"contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
|
|
204
128
|
}
|
|
205
129
|
}
|
|
206
130
|
}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
|
|
19
19
|
<Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)react\bridging\CallbackWrapper.h')">$(MSBuildThisFileDirectory)react\bridging</Bridging_SourcePath>
|
|
20
20
|
|
|
21
|
-
<NodeApiJsiCommitHash>
|
|
21
|
+
<NodeApiJsiCommitHash>21b47f08b762b21b1d4d970940ab23f59f43249c</NodeApiJsiCommitHash>
|
|
22
22
|
<NodeApiJsiLocal Condition="Exists('$(MSBuildThisFileDirectory)NodeApiJsiRuntime.cpp')">true</NodeApiJsiLocal>
|
|
23
23
|
<NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(NodeApiJsiLocal)' == 'true'">$(MSBuildThisFileDirectory)</NodeApiJsiDir>
|
|
24
24
|
<NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)\</NodeApiJsiDir>
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
},
|
|
37
37
|
"Microsoft.JavaScript.Hermes": {
|
|
38
38
|
"type": "Transitive",
|
|
39
|
-
"resolved": "0.
|
|
40
|
-
"contentHash": "
|
|
39
|
+
"resolved": "0.0.0-2511.7001-d7ca19b3",
|
|
40
|
+
"contentHash": "/EGy/gbTWpFZPZ4Z81QxbGQxpZhqiOE3qrnSokZRgXAyHivl15s7zZkRLOy9daDmVyEfanq7YBCOMi0ha58uQA=="
|
|
41
41
|
},
|
|
42
42
|
"Microsoft.Net.Native.Compiler": {
|
|
43
43
|
"type": "Transitive",
|
|
@@ -179,7 +179,7 @@
|
|
|
179
179
|
"dependencies": {
|
|
180
180
|
"Common": "[1.0.0, )",
|
|
181
181
|
"Folly": "[1.0.0, )",
|
|
182
|
-
"Microsoft.JavaScript.Hermes": "[0.
|
|
182
|
+
"Microsoft.JavaScript.Hermes": "[0.0.0-2511.7001-d7ca19b3, )",
|
|
183
183
|
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
|
|
184
184
|
"Microsoft.UI.Xaml": "[2.8.0, )",
|
|
185
185
|
"ReactCommon": "[1.0.0, )",
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.74.
|
|
13
|
+
<ReactNativeWindowsVersion>0.74.48</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
|
|
16
|
-
<ReactNativeWindowsPatch>
|
|
16
|
+
<ReactNativeWindowsPatch>48</ReactNativeWindowsPatch>
|
|
17
17
|
<ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
|
|
18
|
-
<ReactNativeWindowsCommitId>
|
|
18
|
+
<ReactNativeWindowsCommitId>ddef61e5c9244a04e1c34529f89bde30491ec53f</ReactNativeWindowsCommitId>
|
|
19
19
|
</PropertyGroup>
|
|
20
20
|
</Project>
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
|
|
7
7
|
<UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
|
|
8
8
|
<!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
|
|
9
|
-
<HermesVersion Condition="'$(HermesVersion)' == ''">0.
|
|
9
|
+
<HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2511.7001-d7ca19b3</HermesVersion>
|
|
10
10
|
<HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
|
|
11
11
|
<HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
|
|
12
12
|
<EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
|
|
@@ -1173,7 +1173,7 @@ TEST_P(JSITest, DecoratorTest) {
|
|
|
1173
1173
|
|
|
1174
1174
|
class CountRuntime final : public WithRuntimeDecorator<Count> {
|
|
1175
1175
|
public:
|
|
1176
|
-
explicit CountRuntime(std::
|
|
1176
|
+
explicit CountRuntime(std::shared_ptr<Runtime> rt)
|
|
1177
1177
|
: WithRuntimeDecorator<Count>(*rt, count_),
|
|
1178
1178
|
rt_(std::move(rt)),
|
|
1179
1179
|
count_(kInit) {}
|
|
@@ -1183,7 +1183,7 @@ TEST_P(JSITest, DecoratorTest) {
|
|
|
1183
1183
|
}
|
|
1184
1184
|
|
|
1185
1185
|
private:
|
|
1186
|
-
std::
|
|
1186
|
+
std::shared_ptr<Runtime> rt_;
|
|
1187
1187
|
Count count_;
|
|
1188
1188
|
};
|
|
1189
1189
|
|
|
@@ -1222,7 +1222,7 @@ TEST_P(JSITest, MultiDecoratorTest) {
|
|
|
1222
1222
|
class MultiRuntime final
|
|
1223
1223
|
: public WithRuntimeDecorator<std::tuple<Inc, Nest>> {
|
|
1224
1224
|
public:
|
|
1225
|
-
explicit MultiRuntime(std::
|
|
1225
|
+
explicit MultiRuntime(std::shared_ptr<Runtime> rt)
|
|
1226
1226
|
: WithRuntimeDecorator<std::tuple<Inc, Nest>>(*rt, tuple_),
|
|
1227
1227
|
rt_(std::move(rt)) {}
|
|
1228
1228
|
|
|
@@ -1234,7 +1234,7 @@ TEST_P(JSITest, MultiDecoratorTest) {
|
|
|
1234
1234
|
}
|
|
1235
1235
|
|
|
1236
1236
|
private:
|
|
1237
|
-
std::
|
|
1237
|
+
std::shared_ptr<Runtime> rt_;
|
|
1238
1238
|
std::tuple<Inc, Nest> tuple_;
|
|
1239
1239
|
};
|
|
1240
1240
|
|
|
@@ -8,13 +8,35 @@ Set-Location -Path $RepoRoot
|
|
|
8
8
|
|
|
9
9
|
try
|
|
10
10
|
{
|
|
11
|
-
|
|
12
|
-
$
|
|
11
|
+
# Delete existing lock files
|
|
12
|
+
$existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
|
|
13
|
+
$existingLockFiles | Foreach-Object {
|
|
14
|
+
Write-Host Deleting $_.FullName
|
|
15
|
+
Remove-Item $_.FullName
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
$packagesSolutions = (Get-ChildItem -File -Recurse -Path $RepoRoot\packages -Filter *.sln )| Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') }
|
|
19
|
+
$vnextSolutions = (Get-ChildItem -File -Path $RepoRoot\vnext -Filter *.sln)
|
|
13
20
|
|
|
14
|
-
|
|
15
|
-
|
|
21
|
+
# Run all solutions with their defaults
|
|
22
|
+
$($packagesSolutions; $vnextSolutions) | Foreach-Object {
|
|
23
|
+
Write-Host Restoring $_.FullName with defaults
|
|
16
24
|
& msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
|
|
17
25
|
}
|
|
26
|
+
|
|
27
|
+
# Re-run solutions that build with UseExperimentalWinUI3
|
|
28
|
+
$experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
|
|
29
|
+
$($packagesSolutions; $vnextSolutions) | Where-Object { $experimentalSolutions -contains $_.Name } | Foreach-Object {
|
|
30
|
+
Write-Host Restoring $_.FullName with UseExperimentalWinUI3=true
|
|
31
|
+
& msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseExperimentalWinUI3=true $_.FullName
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
# Re-run solutions that build with Chakra
|
|
35
|
+
$chakraSolutions = @("ReactUWPTestApp.sln", "integrationtest.sln");
|
|
36
|
+
$($packagesSolutions; $vnextSolutions) | Where-Object { $chakraSolutions -contains $_.Name } | Foreach-Object {
|
|
37
|
+
Write-Host Restoring $_.FullName with UseHermes=false
|
|
38
|
+
& msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseHermes=false $_.FullName
|
|
39
|
+
}
|
|
18
40
|
}
|
|
19
41
|
finally
|
|
20
42
|
{
|
package/package.json
CHANGED
package/fmt/packages.lock.json
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 1,
|
|
3
|
-
"dependencies": {
|
|
4
|
-
"native,Version=v0.0": {},
|
|
5
|
-
"native,Version=v0.0/win10-arm": {},
|
|
6
|
-
"native,Version=v0.0/win10-arm-aot": {},
|
|
7
|
-
"native,Version=v0.0/win10-arm64-aot": {},
|
|
8
|
-
"native,Version=v0.0/win10-x64": {},
|
|
9
|
-
"native,Version=v0.0/win10-x64-aot": {},
|
|
10
|
-
"native,Version=v0.0/win10-x86": {},
|
|
11
|
-
"native,Version=v0.0/win10-x86-aot": {}
|
|
12
|
-
}
|
|
13
|
-
}
|