react-native-windows 0.69.22 → 0.69.24

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.
Files changed (6) hide show
  1. package/Directory.Build.props +19 -19
  2. package/Microsoft.ReactNative.Managed/packages.lock.json +24 -3
  3. package/PropertySheets/Generated/PackageVersion.g.props +3 -3
  4. package/Shared/Modules/BlobModule.cpp +4 -3
  5. package/Shared/Modules/BlobModule.h +4 -0
  6. package/package.json +1 -1
package/Directory.Build.props CHANGED
@@ -23,6 +23,25 @@
23
23
  <FmtCommitHash>7bdf0628b1276379886c7f6dda2cef2b3b374f0b</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>
package/Microsoft.ReactNative.Managed/packages.lock.json CHANGED
@@ -53,7 +53,7 @@
53
53
  "Microsoft.NETCore.Platforms": {
54
54
  "type": "Transitive",
55
55
  "resolved": "2.1.0",
56
- "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
56
+ "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
57
57
  },
58
58
  "Microsoft.SourceLink.Common": {
59
59
  "type": "Transitive",
@@ -63,11 +63,16 @@
63
63
  "NETStandard.Library": {
64
64
  "type": "Transitive",
65
65
  "resolved": "2.0.3",
66
- "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
66
+ "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
67
67
  "dependencies": {
68
68
  "Microsoft.NETCore.Platforms": "1.1.0"
69
69
  }
70
70
  },
71
+ "ReactNative.Hermes.Windows": {
72
+ "type": "Transitive",
73
+ "resolved": "0.0.0-2302.1002-2d4bf1df",
74
+ "contentHash": "4skpllUPEBkww7FN7iacP7NWrZlEGDNg83qIuFjKn4Sl8JpJQZqfUTrXcvh6tb4mHXkmwFoKhLw4Rc5Op7f+8w=="
75
+ },
71
76
  "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
72
77
  "type": "Transitive",
73
78
  "resolved": "2.2.7-rel-27913-00",
@@ -136,7 +141,23 @@
136
141
  "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
137
142
  },
138
143
  "microsoft.reactnative": {
139
- "type": "Project"
144
+ "type": "Project",
145
+ "dependencies": {
146
+ "Common": "[1.0.0, )",
147
+ "Folly": "[1.0.0, )",
148
+ "Microsoft.UI.Xaml": "[2.7.0, )",
149
+ "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
150
+ "ReactCommon": "[1.0.0, )",
151
+ "ReactNative.Hermes.Windows": "[0.0.0-2302.1002-2d4bf1df, )",
152
+ "boost": "[1.76.0, )"
153
+ }
154
+ },
155
+ "reactcommon": {
156
+ "type": "Project",
157
+ "dependencies": {
158
+ "Folly": "[1.0.0, )",
159
+ "boost": "[1.76.0, )"
160
+ }
140
161
  }
141
162
  },
142
163
  "UAP,Version=v10.0.16299/win10-arm": {
package/PropertySheets/Generated/PackageVersion.g.props CHANGED
@@ -10,11 +10,11 @@
10
10
  -->
11
11
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
12
12
  <PropertyGroup>
13
- <ReactNativeWindowsVersion>0.69.22</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.69.24</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
16
- <ReactNativeWindowsPatch>22</ReactNativeWindowsPatch>
16
+ <ReactNativeWindowsPatch>24</ReactNativeWindowsPatch>
17
17
  <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
18
- <ReactNativeWindowsCommitId>81b0dc4a3af48f114aea78419f7a9605f4d4e39c</ReactNativeWindowsCommitId>
18
+ <ReactNativeWindowsCommitId>6139c34cc334e411fe8e538dc3044f3767d56a80</ReactNativeWindowsCommitId>
19
19
  </PropertyGroup>
20
20
  </Project>
package/Shared/Modules/BlobModule.cpp CHANGED
@@ -12,6 +12,9 @@
12
12
  // React Native
13
13
  #include <cxxreact/JsArgumentHelpers.h>
14
14
 
15
+ // Boost Libriaries
16
+ #include <boost/uuid/uuid_io.hpp>
17
+
15
18
  // Windows API
16
19
  #include <winrt/Windows.Foundation.h>
17
20
  #include <winrt/Windows.Security.Cryptography.h>
@@ -33,7 +36,6 @@ using winrt::Microsoft::ReactNative::IReactPropertyBag;
33
36
  using winrt::Microsoft::ReactNative::ReactNonAbiValue;
34
37
  using winrt::Microsoft::ReactNative::ReactPropertyBag;
35
38
  using winrt::Microsoft::ReactNative::ReactPropertyId;
36
- using winrt::Windows::Foundation::GuidHelper;
37
39
  using winrt::Windows::Foundation::IInspectable;
38
40
  using winrt::Windows::Foundation::Uri;
39
41
  using winrt::Windows::Security::Cryptography::CryptographicBuffer;
@@ -249,8 +251,7 @@ void MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message, string &&blobI
249
251
  }
250
252
 
251
253
  string MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message) noexcept {
252
- // substr(1, 36) strips curly braces from a GUID.
253
- auto blobId = winrt::to_string(winrt::to_hstring(GuidHelper::CreateNewGuid())).substr(1, 36);
254
+ auto blobId = boost::uuids::to_string(m_guidGenerator());
254
255
 
255
256
  scoped_lock lock{m_mutex};
256
257
  m_blobs.insert_or_assign(blobId, std::move(message));
package/Shared/Modules/BlobModule.h CHANGED
@@ -11,6 +11,9 @@
11
11
  // React Native
12
12
  #include <cxxreact/CxxModule.h>
13
13
 
14
+ // Boost Libraries
15
+ #include <boost/uuid/uuid_generators.hpp>
16
+
14
17
  // Windows API
15
18
  #include <winrt/base.h>
16
19
 
@@ -26,6 +29,7 @@ namespace Microsoft::React {
26
29
  class MemoryBlobPersistor final : public IBlobPersistor {
27
30
  std::unordered_map<std::string, std::vector<uint8_t>> m_blobs;
28
31
  std::mutex m_mutex;
32
+ boost::uuids::random_generator m_guidGenerator;
29
33
 
30
34
  public:
31
35
  #pragma region IBlobPersistor
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.69.22",
3
+ "version": "0.69.24",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",