react-native-windows 0.82.3 → 0.82.8
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/Common/Common.vcxproj +1 -1
- package/Folly/Folly.vcxproj +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp +5 -0
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +4 -4
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +3 -0
- package/Microsoft.ReactNative/Fabric/Composition/TooltipService.cpp +80 -0
- package/Microsoft.ReactNative/Fabric/Composition/TooltipService.h +17 -0
- package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +2 -2
- package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.targets +2 -2
- package/PropertySheets/External/Microsoft.ReactNative.Composition.CppLib.targets +2 -2
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets +1 -1
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets +1 -1
- package/PropertySheets/Generated/PackageVersion.g.props +3 -3
- package/PropertySheets/JSEngine.props +3 -2
- package/ReactCommon/ReactCommon.vcxproj +1 -1
- package/Scripts/Tfs/Invoke-WebRequestWithRetry.ps1 +40 -0
- package/Scripts/Tfs/Layout-Desktop-Headers.ps1 +1 -15
- package/package.json +5 -5
- package/Scripts/OpenSSL.nuspec +0 -39
- package/Scripts/OpenSSL.targets +0 -36
package/Common/Common.vcxproj
CHANGED
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
</ItemGroup>
|
|
95
95
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
96
96
|
<ItemGroup>
|
|
97
|
-
<PackageReference Include="boost" Version="1.
|
|
97
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
98
98
|
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
|
|
99
99
|
</ItemGroup>
|
|
100
100
|
<ImportGroup Label="ExtensionTargets">
|
package/Folly/Folly.vcxproj
CHANGED
|
@@ -362,7 +362,7 @@
|
|
|
362
362
|
<TemporaryFollyPatchFiles Include="$(MSBuildThisFileDirectory)\TEMP_UntilFollyUpdate\**\*.*" />
|
|
363
363
|
</ItemGroup>
|
|
364
364
|
<ItemGroup>
|
|
365
|
-
<PackageReference Include="boost" Version="1.
|
|
365
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
366
366
|
</ItemGroup>
|
|
367
367
|
<Target Name="Deploy" />
|
|
368
368
|
<!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->
|
|
@@ -1064,6 +1064,11 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::get_SelectionContainer(I
|
|
|
1064
1064
|
*pRetVal = nullptr;
|
|
1065
1065
|
|
|
1066
1066
|
auto selectionContainerView = GetSelectionContainer();
|
|
1067
|
+
// Per UIA spec, returning S_OK with *pRetVal == nullptr is correct when the element
|
|
1068
|
+
// is not contained within a selection container.
|
|
1069
|
+
if (!selectionContainerView)
|
|
1070
|
+
return S_OK;
|
|
1071
|
+
|
|
1067
1072
|
auto uiaProvider =
|
|
1068
1073
|
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(selectionContainerView)
|
|
1069
1074
|
->EnsureUiaProvider();
|
|
@@ -1023,16 +1023,16 @@ void ScrollViewComponentView::OnKeyDown(
|
|
|
1023
1023
|
args.Handled(pageUp(true));
|
|
1024
1024
|
break;
|
|
1025
1025
|
case winrt::Windows::System::VirtualKey::Up:
|
|
1026
|
-
args.Handled(lineUp(
|
|
1026
|
+
args.Handled(lineUp(false));
|
|
1027
1027
|
break;
|
|
1028
1028
|
case winrt::Windows::System::VirtualKey::Down:
|
|
1029
|
-
args.Handled(lineDown(
|
|
1029
|
+
args.Handled(lineDown(false));
|
|
1030
1030
|
break;
|
|
1031
1031
|
case winrt::Windows::System::VirtualKey::Left:
|
|
1032
|
-
args.Handled(lineLeft(
|
|
1032
|
+
args.Handled(lineLeft(false));
|
|
1033
1033
|
break;
|
|
1034
1034
|
case winrt::Windows::System::VirtualKey::Right:
|
|
1035
|
-
args.Handled(lineRight(
|
|
1035
|
+
args.Handled(lineRight(false));
|
|
1036
1036
|
break;
|
|
1037
1037
|
}
|
|
1038
1038
|
|
package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp
CHANGED
|
@@ -1775,7 +1775,10 @@ void WindowsTextInputComponentView::DrawText() noexcept {
|
|
|
1775
1775
|
}
|
|
1776
1776
|
|
|
1777
1777
|
// TODO keep track of proper invalid rect
|
|
1778
|
+
// Prevent reentrancy: TxDrawD2D may call TxViewChange -> DrawText
|
|
1779
|
+
m_cDrawBlock++;
|
|
1778
1780
|
auto hrDraw = m_textServices->TxDrawD2D(d2dDeviceContext, &rc, nullptr, TXTVIEW_ACTIVE);
|
|
1781
|
+
m_cDrawBlock--;
|
|
1779
1782
|
winrt::check_hresult(hrDraw);
|
|
1780
1783
|
|
|
1781
1784
|
// draw placeholder text if needed
|
|
@@ -169,12 +169,22 @@ TooltipTracker::TooltipTracker(
|
|
|
169
169
|
view.PointerEntered({this, &TooltipTracker::OnPointerEntered});
|
|
170
170
|
view.PointerExited({this, &TooltipTracker::OnPointerExited});
|
|
171
171
|
view.PointerMoved({this, &TooltipTracker::OnPointerMoved});
|
|
172
|
+
view.GotFocus({this, &TooltipTracker::OnGotFocus});
|
|
173
|
+
view.LostFocus({this, &TooltipTracker::OnLostFocus});
|
|
172
174
|
view.Unmounted({this, &TooltipTracker::OnUnmounted});
|
|
173
175
|
}
|
|
174
176
|
|
|
175
177
|
TooltipTracker::~TooltipTracker() {
|
|
176
178
|
DestroyTimer();
|
|
177
179
|
DestroyTooltip();
|
|
180
|
+
m_outer->NotifyDismiss(this);
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
void TooltipTracker::DismissForExternalRequest() noexcept {
|
|
184
|
+
// Service is already updating its active slot; do not call back into it.
|
|
185
|
+
m_focusTooltip = false;
|
|
186
|
+
DestroyTimer();
|
|
187
|
+
DestroyTooltip();
|
|
178
188
|
}
|
|
179
189
|
|
|
180
190
|
facebook::react::Tag TooltipTracker::Tag() const noexcept {
|
|
@@ -192,6 +202,9 @@ void TooltipTracker::OnPointerEntered(
|
|
|
192
202
|
auto pp = args.GetCurrentPoint(-1);
|
|
193
203
|
m_pos = pp.Position();
|
|
194
204
|
|
|
205
|
+
// Claim the single tooltip slot, dismissing any other tracker's pending or visible tooltip.
|
|
206
|
+
m_outer->NotifyShow(this);
|
|
207
|
+
|
|
195
208
|
m_timer = winrt::Microsoft::ReactNative::Timer::Create(m_properties.Handle());
|
|
196
209
|
m_timer.Interval(std::chrono::milliseconds(toolTipTimeToShowMs));
|
|
197
210
|
m_timer.Tick({this, &TooltipTracker::OnTick});
|
|
@@ -225,6 +238,56 @@ void TooltipTracker::OnPointerExited(
|
|
|
225
238
|
return;
|
|
226
239
|
DestroyTimer();
|
|
227
240
|
DestroyTooltip();
|
|
241
|
+
m_outer->NotifyDismiss(this);
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
void TooltipTracker::OnGotFocus(
|
|
245
|
+
const winrt::Windows::Foundation::IInspectable & /*sender*/,
|
|
246
|
+
const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs & /*args*/) noexcept {
|
|
247
|
+
// Skip if a mouse-driven tooltip or its dwell timer is already in flight on this view.
|
|
248
|
+
if (m_hwndTip || m_timer) {
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
auto view = m_view.view();
|
|
253
|
+
if (!view) {
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
auto viewCompView = view.try_as<winrt::Microsoft::ReactNative::Composition::ViewComponentView>();
|
|
258
|
+
if (!viewCompView) {
|
|
259
|
+
return;
|
|
260
|
+
}
|
|
261
|
+
auto selfView =
|
|
262
|
+
winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>(viewCompView);
|
|
263
|
+
RECT rc = selfView->getClientRect();
|
|
264
|
+
auto scaleFactor = view.LayoutMetrics().PointScaleFactor;
|
|
265
|
+
if (scaleFactor <= 0) {
|
|
266
|
+
return;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
// Anchor in DIPs at the horizontal center of the view's top edge; ShowTooltip re-applies scaleFactor.
|
|
270
|
+
m_pos = {static_cast<float>(rc.left + rc.right) / 2.0f / scaleFactor, static_cast<float>(rc.top) / scaleFactor};
|
|
271
|
+
|
|
272
|
+
m_focusTooltip = true;
|
|
273
|
+
// Claim the single tooltip slot, dismissing any other tracker's pending or visible tooltip.
|
|
274
|
+
m_outer->NotifyShow(this);
|
|
275
|
+
m_timer = winrt::Microsoft::ReactNative::Timer::Create(m_properties.Handle());
|
|
276
|
+
m_timer.Interval(std::chrono::milliseconds(toolTipTimeToShowMs));
|
|
277
|
+
m_timer.Tick({this, &TooltipTracker::OnTick});
|
|
278
|
+
m_timer.Start();
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
void TooltipTracker::OnLostFocus(
|
|
282
|
+
const winrt::Windows::Foundation::IInspectable & /*sender*/,
|
|
283
|
+
const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs & /*args*/) noexcept {
|
|
284
|
+
if (!m_focusTooltip) {
|
|
285
|
+
return;
|
|
286
|
+
}
|
|
287
|
+
m_focusTooltip = false;
|
|
288
|
+
DestroyTimer();
|
|
289
|
+
DestroyTooltip();
|
|
290
|
+
m_outer->NotifyDismiss(this);
|
|
228
291
|
}
|
|
229
292
|
|
|
230
293
|
void TooltipTracker::OnUnmounted(
|
|
@@ -232,6 +295,7 @@ void TooltipTracker::OnUnmounted(
|
|
|
232
295
|
const winrt::Microsoft::ReactNative::ComponentView &) noexcept {
|
|
233
296
|
DestroyTimer();
|
|
234
297
|
DestroyTooltip();
|
|
298
|
+
m_outer->NotifyDismiss(this);
|
|
235
299
|
}
|
|
236
300
|
|
|
237
301
|
void TooltipTracker::ShowTooltip(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
|
|
@@ -326,6 +390,22 @@ void TooltipService::StopTracking(const winrt::Microsoft::ReactNative::Component
|
|
|
326
390
|
}
|
|
327
391
|
}
|
|
328
392
|
|
|
393
|
+
void TooltipService::NotifyShow(TooltipTracker *tracker) noexcept {
|
|
394
|
+
if (m_activeTracker == tracker) {
|
|
395
|
+
return;
|
|
396
|
+
}
|
|
397
|
+
if (m_activeTracker) {
|
|
398
|
+
m_activeTracker->DismissForExternalRequest();
|
|
399
|
+
}
|
|
400
|
+
m_activeTracker = tracker;
|
|
401
|
+
}
|
|
402
|
+
|
|
403
|
+
void TooltipService::NotifyDismiss(TooltipTracker *tracker) noexcept {
|
|
404
|
+
if (m_activeTracker == tracker) {
|
|
405
|
+
m_activeTracker = nullptr;
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
|
|
329
409
|
static const ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<TooltipService>>>
|
|
330
410
|
&TooltipServicePropertyId() noexcept {
|
|
331
411
|
static const ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<TooltipService>>> prop{
|
|
@@ -27,6 +27,12 @@ struct TooltipTracker {
|
|
|
27
27
|
void OnPointerExited(
|
|
28
28
|
const winrt::Windows::Foundation::IInspectable &sender,
|
|
29
29
|
const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
|
|
30
|
+
void OnGotFocus(
|
|
31
|
+
const winrt::Windows::Foundation::IInspectable &sender,
|
|
32
|
+
const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
|
|
33
|
+
void OnLostFocus(
|
|
34
|
+
const winrt::Windows::Foundation::IInspectable &sender,
|
|
35
|
+
const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
|
|
30
36
|
void OnTick(
|
|
31
37
|
const winrt::Windows::Foundation::IInspectable &,
|
|
32
38
|
const winrt::Windows::Foundation::IInspectable &) noexcept;
|
|
@@ -36,6 +42,10 @@ struct TooltipTracker {
|
|
|
36
42
|
|
|
37
43
|
facebook::react::Tag Tag() const noexcept;
|
|
38
44
|
|
|
45
|
+
// Cancel pending dwell timer and close any visible tooltip popup; used by the service when another tracker takes
|
|
46
|
+
// over.
|
|
47
|
+
void DismissForExternalRequest() noexcept;
|
|
48
|
+
|
|
39
49
|
private:
|
|
40
50
|
void ShowTooltip(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
|
|
41
51
|
void DestroyTimer() noexcept;
|
|
@@ -46,6 +56,7 @@ struct TooltipTracker {
|
|
|
46
56
|
::Microsoft::ReactNative::ReactTaggedView m_view;
|
|
47
57
|
winrt::Microsoft::ReactNative::ITimer m_timer;
|
|
48
58
|
HWND m_hwndTip{nullptr};
|
|
59
|
+
bool m_focusTooltip{false};
|
|
49
60
|
winrt::Microsoft::ReactNative::ReactPropertyBag m_properties;
|
|
50
61
|
};
|
|
51
62
|
|
|
@@ -54,12 +65,18 @@ struct TooltipService {
|
|
|
54
65
|
void StartTracking(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
|
|
55
66
|
void StopTracking(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
|
|
56
67
|
|
|
68
|
+
// Enforce "only one tooltip visible at a time": dismisses the previously active tracker, if any.
|
|
69
|
+
void NotifyShow(TooltipTracker *tracker) noexcept;
|
|
70
|
+
// Clears the active-tracker slot if it still points at `tracker`.
|
|
71
|
+
void NotifyDismiss(TooltipTracker *tracker) noexcept;
|
|
72
|
+
|
|
57
73
|
static std::shared_ptr<TooltipService> GetCurrent(
|
|
58
74
|
const winrt::Microsoft::ReactNative::ReactPropertyBag &properties) noexcept;
|
|
59
75
|
|
|
60
76
|
private:
|
|
61
77
|
std::vector<std::shared_ptr<TooltipTracker>> m_enteredTrackers;
|
|
62
78
|
std::vector<std::shared_ptr<TooltipTracker>> m_trackers;
|
|
79
|
+
TooltipTracker *m_activeTracker{nullptr};
|
|
63
80
|
winrt::Microsoft::ReactNative::ReactPropertyBag m_properties;
|
|
64
81
|
};
|
|
65
82
|
|
|
@@ -426,9 +426,9 @@
|
|
|
426
426
|
</ProjectReference>
|
|
427
427
|
</ItemGroup>
|
|
428
428
|
<ItemGroup>
|
|
429
|
-
<PackageReference Include="boost" Version="1.
|
|
429
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
430
430
|
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
|
|
431
|
-
<PackageReference Include="
|
|
431
|
+
<PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
|
|
432
432
|
<PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
|
|
433
433
|
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
|
|
434
434
|
</ItemGroup>
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets" />
|
|
22
22
|
|
|
23
23
|
<ItemGroup>
|
|
24
|
-
<PackageReference Include="boost" Version="1.
|
|
24
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
25
25
|
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
|
|
26
26
|
</ItemGroup>
|
|
27
27
|
|
|
28
|
-
</Project>
|
|
28
|
+
</Project>
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\Codegen.targets" />
|
|
24
24
|
|
|
25
25
|
<ItemGroup>
|
|
26
|
-
<PackageReference Include="boost" Version="1.
|
|
26
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
27
27
|
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
|
|
28
28
|
</ItemGroup>
|
|
29
29
|
|
|
30
|
-
</Project>
|
|
30
|
+
</Project>
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<!-- WinUI package name and version are set by WinUI.props -->
|
|
26
26
|
<PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
|
|
27
27
|
<!-- Hermes version is set by JSEngine.props -->
|
|
28
|
-
<PackageReference Include="
|
|
28
|
+
<PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
|
|
29
29
|
</ItemGroup>
|
|
30
30
|
|
|
31
31
|
<Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<!-- WinUI package name and version are set by WinUI.props -->
|
|
26
26
|
<PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
|
|
27
27
|
<!-- Hermes version is set by JSEngine.props -->
|
|
28
|
-
<PackageReference Include="
|
|
28
|
+
<PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
|
|
29
29
|
</ItemGroup>
|
|
30
30
|
|
|
31
31
|
<!-- The props file for bundling is not set up to be just defaults, it assumes to be run at the end of the project. -->
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.82.
|
|
13
|
+
<ReactNativeWindowsVersion>0.82.8</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>82</ReactNativeWindowsMinor>
|
|
16
|
-
<ReactNativeWindowsPatch>
|
|
16
|
+
<ReactNativeWindowsPatch>8</ReactNativeWindowsPatch>
|
|
17
17
|
<ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
|
|
18
|
-
<ReactNativeWindowsCommitId>
|
|
18
|
+
<ReactNativeWindowsCommitId>b807143eabddb6a29a21641a8ec3399c16b7f5e8</ReactNativeWindowsCommitId>
|
|
19
19
|
</PropertyGroup>
|
|
20
20
|
</Project>
|
|
@@ -6,9 +6,10 @@
|
|
|
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.0.0-
|
|
9
|
+
<HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2604.21001-94aa5e1d</HermesVersion>
|
|
10
|
+
<HermesPackageName Condition="'$(HermesPackageName)' == ''">Microsoft.JavaScript.Hermes</HermesPackageName>
|
|
10
11
|
<HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
|
|
11
|
-
<HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)
|
|
12
|
+
<HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\$(HermesPackageName)\$(HermesVersion)</HermesPackage>
|
|
12
13
|
<EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
|
|
13
14
|
<!-- Disable linking Hermes into the output in cases where we need to fully rely on HermesShim -->
|
|
14
15
|
<HermesNoLink Condition="'$(HermesNoLink)' == '' and '$(Configuration)' == 'Release' and '$(EnableHermesInspectorInReleaseFlavor)' != 'true'">true</HermesNoLink>
|
|
@@ -230,7 +230,7 @@
|
|
|
230
230
|
</ProjectReference>
|
|
231
231
|
</ItemGroup>
|
|
232
232
|
<ItemGroup>
|
|
233
|
-
<PackageReference Include="boost" Version="1.
|
|
233
|
+
<PackageReference Include="boost" Version="1.84.0.0" />
|
|
234
234
|
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
|
|
235
235
|
</ItemGroup>
|
|
236
236
|
<PropertyGroup>
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
# Copyright (c) Microsoft Corporation.
|
|
2
|
+
# Licensed under the MIT License.
|
|
3
|
+
|
|
4
|
+
<#
|
|
5
|
+
.SYNOPSIS
|
|
6
|
+
Downloads a file from a URI with retry logic.
|
|
7
|
+
|
|
8
|
+
.PARAMETER Uri
|
|
9
|
+
The URI to download from.
|
|
10
|
+
|
|
11
|
+
.PARAMETER OutFile
|
|
12
|
+
The output file path.
|
|
13
|
+
|
|
14
|
+
.PARAMETER MaxRetries
|
|
15
|
+
Maximum number of download attempts. Default is 3.
|
|
16
|
+
#>
|
|
17
|
+
param(
|
|
18
|
+
[Parameter(Mandatory)]
|
|
19
|
+
[string]$Uri,
|
|
20
|
+
|
|
21
|
+
[Parameter(Mandatory)]
|
|
22
|
+
[string]$OutFile,
|
|
23
|
+
|
|
24
|
+
[int]$MaxRetries = 3
|
|
25
|
+
)
|
|
26
|
+
|
|
27
|
+
Set-StrictMode -Version Latest
|
|
28
|
+
$ErrorActionPreference = 'Stop'
|
|
29
|
+
|
|
30
|
+
for ($i = 1; $i -le $MaxRetries; $i++) {
|
|
31
|
+
try {
|
|
32
|
+
Write-Host "Downloading $OutFile (attempt $i of $MaxRetries)"
|
|
33
|
+
Invoke-WebRequest -Uri $Uri -OutFile $OutFile
|
|
34
|
+
return
|
|
35
|
+
} catch {
|
|
36
|
+
Write-Host "Attempt $i failed: $_"
|
|
37
|
+
if ($i -eq $MaxRetries) { throw }
|
|
38
|
+
Start-Sleep -Seconds (5 * $i)
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -5,7 +5,7 @@ param(
|
|
|
5
5
|
[string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
|
|
6
6
|
[string] $TargetRoot = "$SourceRoot\vnext\target",
|
|
7
7
|
[System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext",
|
|
8
|
-
[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",
|
|
8
|
+
[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",
|
|
9
9
|
[string[]] $Extensions = ('h', 'hpp', 'def')
|
|
10
10
|
)
|
|
11
11
|
|
|
@@ -111,20 +111,6 @@ Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | Fo
|
|
|
111
111
|
-Force
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
# React.Windows.Test headers
|
|
115
|
-
Get-ChildItem -Path $ReactWindowsRoot\Test -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
|
|
116
|
-
-Path $ReactWindowsRoot\Test\$_ `
|
|
117
|
-
-Destination (New-Item -ItemType Directory $TargetRoot\inc\Test\$(Split-Path $_) -Force) `
|
|
118
|
-
-Force
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
# React.Windows.Test DLL DEF files
|
|
122
|
-
Get-ChildItem -Path $ReactWindowsRoot\Desktop.Test.DLL -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
|
|
123
|
-
-Path $ReactWindowsRoot\Desktop.Test.DLL\$_ `
|
|
124
|
-
-Destination (New-Item -ItemType Directory $TargetRoot\inc\$(Split-Path $_) -Force) `
|
|
125
|
-
-Force
|
|
126
|
-
}
|
|
127
|
-
|
|
128
114
|
# include headers
|
|
129
115
|
Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
|
|
130
116
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-windows",
|
|
3
|
-
"version": "0.82.
|
|
3
|
+
"version": "0.82.8",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@react-native-community/cli": "20.0.0",
|
|
27
27
|
"@react-native-community/cli-platform-android": "20.0.0",
|
|
28
28
|
"@react-native-community/cli-platform-ios": "20.0.0",
|
|
29
|
-
"@react-native-windows/cli": "0.82.
|
|
29
|
+
"@react-native-windows/cli": "0.82.1",
|
|
30
30
|
"@react-native/assets": "1.0.0",
|
|
31
31
|
"@react-native/assets-registry": "0.82.1",
|
|
32
32
|
"@react-native/codegen": "0.82.1",
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"yargs": "^17.6.2"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
|
-
"@react-native-windows/codegen": "0.82.
|
|
72
|
+
"@react-native-windows/codegen": "0.82.1",
|
|
73
73
|
"@react-native/metro-config": "0.82.1",
|
|
74
74
|
"@rnw-scripts/babel-react-native-config": "0.0.0",
|
|
75
75
|
"@rnw-scripts/eslint-config": "1.2.38",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"prettier": "2.8.8",
|
|
87
87
|
"react": "19.1.1",
|
|
88
88
|
"react-native": "0.82.1",
|
|
89
|
-
"react-native-platform-override": "0.82.
|
|
89
|
+
"react-native-platform-override": "0.82.1",
|
|
90
90
|
"react-refresh": "^0.14.0",
|
|
91
91
|
"typescript": "5.0.4"
|
|
92
92
|
},
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"react-native": "^0.82.0"
|
|
97
97
|
},
|
|
98
98
|
"beachball": {
|
|
99
|
-
"defaultNpmTag": "
|
|
99
|
+
"defaultNpmTag": "v0.82-stable",
|
|
100
100
|
"disallowedChangeTypes": [
|
|
101
101
|
"major",
|
|
102
102
|
"minor",
|
package/Scripts/OpenSSL.nuspec
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
-
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
|
3
|
-
<metadata>
|
|
4
|
-
<id>$id$</id>
|
|
5
|
-
<version>$version$</version>
|
|
6
|
-
<description>OpenSSL for Windows Desktop - Static Library.</description>
|
|
7
|
-
<authors>Microsoft</authors>
|
|
8
|
-
<projectUrl>https://www.openssl.org</projectUrl>
|
|
9
|
-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
|
10
|
-
<dependencies>
|
|
11
|
-
<group targetFramework="Windows8-x86" />
|
|
12
|
-
<group targetFramework="Windows8-x64" />
|
|
13
|
-
<group targetFramework="Windows8-ARM64" />
|
|
14
|
-
</dependencies>
|
|
15
|
-
<repository type="git" url="$repoUrl$" branch="$repoBranch$" commit="$repoCommit$" />
|
|
16
|
-
<license type="expression">OpenSSL</license>
|
|
17
|
-
</metadata>
|
|
18
|
-
<files>
|
|
19
|
-
<file src="OpenSSL.targets" target="build\native\$id$.targets" />
|
|
20
|
-
|
|
21
|
-
<file src="$vcpkgroot$\installed\x86-windows-static\include\openssl\**\*.*" target="include\x86\openssl" />
|
|
22
|
-
<file src="$vcpkgroot$\installed\x86-windows-static\debug\lib\libeay32.lib" target="lib\win8-x86\Debug" />
|
|
23
|
-
<file src="$vcpkgroot$\installed\x86-windows-static\debug\lib\ssleay32.lib" target="lib\win8-x86\Debug" />
|
|
24
|
-
<file src="$vcpkgroot$\installed\x86-windows-static\lib\libeay32.lib" target="lib\win8-x86\Release" />
|
|
25
|
-
<file src="$vcpkgroot$\installed\x86-windows-static\lib\ssleay32.lib" target="lib\win8-x86\Release" />
|
|
26
|
-
|
|
27
|
-
<file src="$vcpkgroot$\installed\x64-windows-static\include\openssl\**\*.*" target="include\x64\openssl" />
|
|
28
|
-
<file src="$vcpkgroot$\installed\x64-windows-static\debug\lib\libeay32.lib" target="lib\win8-x64\Debug" />
|
|
29
|
-
<file src="$vcpkgroot$\installed\x64-windows-static\debug\lib\ssleay32.lib" target="lib\win8-x64\Debug" />
|
|
30
|
-
<file src="$vcpkgroot$\installed\x64-windows-static\lib\libeay32.lib" target="lib\win8-x64\Release" />
|
|
31
|
-
<file src="$vcpkgroot$\installed\x64-windows-static\lib\ssleay32.lib" target="lib\win8-x64\Release" />
|
|
32
|
-
|
|
33
|
-
<file src="$vcpkgroot$\installed\arm64-windows-static\include\openssl\**\*.*" target="include\ARM64\openssl" />
|
|
34
|
-
<file src="$vcpkgroot$\installed\arm64-windows-static\debug\lib\libeay32.lib" target="lib\win8-arm64\Debug" />
|
|
35
|
-
<file src="$vcpkgroot$\installed\arm64-windows-static\debug\lib\ssleay32.lib" target="lib\win8-arm64\Debug" />
|
|
36
|
-
<file src="$vcpkgroot$\installed\arm64-windows-static\lib\libeay32.lib" target="lib\win8-arm64\Release" />
|
|
37
|
-
<file src="$vcpkgroot$\installed\arm64-windows-static\lib\ssleay32.lib" target="lib\win8-arm64\Release" />
|
|
38
|
-
</files>
|
|
39
|
-
</package>
|
package/Scripts/OpenSSL.targets
DELETED
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
-
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
|
|
3
|
-
<ItemDefinitionGroup>
|
|
4
|
-
<ClCompile>
|
|
5
|
-
<AdditionalIncludeDirectories Condition="'$(Platform)' != 'Win32'">
|
|
6
|
-
$(MSBuildThisFileDirectory)..\..\include\$(Platform);
|
|
7
|
-
%(AdditionalIncludeDirectories)
|
|
8
|
-
</AdditionalIncludeDirectories>
|
|
9
|
-
<AdditionalIncludeDirectories Condition="'$(Platform)' == 'Win32'">
|
|
10
|
-
$(MSBuildThisFileDirectory)..\..\include\x86;
|
|
11
|
-
%(AdditionalIncludeDirectories)
|
|
12
|
-
</AdditionalIncludeDirectories>
|
|
13
|
-
</ClCompile>
|
|
14
|
-
<Link>
|
|
15
|
-
<AdditionalLibraryDirectories Condition="'$(Platform)' != 'Win32'">
|
|
16
|
-
$(MSBuildThisFileDirectory)..\..\lib\win8-$(Platform)\$(Configuration);
|
|
17
|
-
%(AdditionalLibraryDirectories)
|
|
18
|
-
</AdditionalLibraryDirectories>
|
|
19
|
-
<AdditionalLibraryDirectories Condition="'$(Platform)' == 'Win32'">
|
|
20
|
-
$(MSBuildThisFileDirectory)..\..\lib\win8-x86\$(Configuration);
|
|
21
|
-
%(AdditionalLibraryDirectories)
|
|
22
|
-
</AdditionalLibraryDirectories>
|
|
23
|
-
<!--
|
|
24
|
-
libeay32.lib - Provided by this package
|
|
25
|
-
ssleay32.lib - Provided by this package
|
|
26
|
-
Crypt32.lib - Provided by Windows API
|
|
27
|
-
-->
|
|
28
|
-
<AdditionalDependencies>
|
|
29
|
-
libeay32.lib;
|
|
30
|
-
ssleay32.lib;
|
|
31
|
-
Crypt32.lib;
|
|
32
|
-
%(AdditionalDependencies)
|
|
33
|
-
</AdditionalDependencies>
|
|
34
|
-
</Link>
|
|
35
|
-
</ItemDefinitionGroup>
|
|
36
|
-
</Project>
|