Merge branch 'dev-v2.25-windows'

birdofpreyru · May 6, 2024 · 70c3e0b · 70c3e0b
2 parents 1e7ecd3 + bdbc224
commit 70c3e0b
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 76 deletions.
diff --git a/example/metro.config.js b/example/metro.config.js
@@ -52,6 +52,8 @@ const config = {
         inlineRequires: true,
       },
     }),
+    // This fixes the 'missing-asset-registry-path` error (see https://github.com/microsoft/react-native-windows/issues/11437)
+    assetRegistryPath: 'react-native/Libraries/Image/AssetRegistry',
   },
 };
 

diff --git a/example/package.json b/example/package.json
@@ -18,7 +18,7 @@
     "lodash": "^4.17.21",
     "react": "18.3.1",
     "react-native": "0.74.1",
-    "react-native-windows": "^0.74.2"
+    "react-native-windows": "0.74.2"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",

diff --git a/example/windows/ReactNativeFsExample.sln b/example/windows/ReactNativeFsExample.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFsExample", "ReactNativeFsExample\ReactNativeFsExample.vcxproj", "{ED4E1B3B-892A-4E15-BB7E-80E13993474F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFsExample", "ReactNativeFsExample\ReactNativeFsExample.vcxproj", "{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
 	EndProjectSection
@@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\reac
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFs", "..\..\windows\ReactNativeFs\ReactNativeFs.vcxproj", "{F912EBDD-F19A-48C7-A32C-49D2956FCE22}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFs", "..\..\windows\ReactNativeFs\ReactNativeFs.vcxproj", "{64DEFCC0-2495-420F-BECB-78D19C734E25}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeStaticServer", "..\node_modules\@dr.pogodin\react-native-static-server\windows\ReactNativeStaticServer\ReactNativeStaticServer.vcxproj", "{85449ABF-3212-44B4-BE33-D3C6629FD017}"
 EndProject
@@ -58,24 +58,24 @@ Global
 		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x64.ActiveCfg = Debug|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x64.Build.0 = Debug|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x64.Deploy.0 = Debug|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x86.ActiveCfg = Debug|Win32
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x86.Build.0 = Debug|Win32
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Debug|x86.Deploy.0 = Debug|Win32
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|ARM64.Build.0 = Release|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|ARM64.Deploy.0 = Release|ARM64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x64.ActiveCfg = Release|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x64.Build.0 = Release|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x64.Deploy.0 = Release|x64
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x86.ActiveCfg = Release|Win32
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x86.Build.0 = Release|Win32
-		{ED4E1B3B-892A-4E15-BB7E-80E13993474F}.Release|x86.Deploy.0 = Release|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x64.ActiveCfg = Debug|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x64.Build.0 = Debug|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x64.Deploy.0 = Debug|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x86.ActiveCfg = Debug|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x86.Build.0 = Debug|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Debug|x86.Deploy.0 = Debug|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|ARM64.Build.0 = Release|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|ARM64.Deploy.0 = Release|ARM64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x64.ActiveCfg = Release|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x64.Build.0 = Release|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x64.Deploy.0 = Release|x64
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x86.ActiveCfg = Release|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x86.Build.0 = Release|Win32
+		{83C5AA44-D8CB-4C78-B8AE-6B1251D57A1D}.Release|x86.Deploy.0 = Release|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
@@ -138,18 +138,18 @@ Global
 		{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32
 		{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32
 		{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x64.ActiveCfg = Debug|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x64.Build.0 = Debug|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x86.ActiveCfg = Debug|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x86.Build.0 = Debug|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x64.ActiveCfg = Release|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x64.Build.0 = Release|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x86.ActiveCfg = Release|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x86.Build.0 = Release|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|ARM64.Build.0 = Release|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x64.ActiveCfg = Debug|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x64.Build.0 = Debug|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x86.ActiveCfg = Debug|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x86.Build.0 = Debug|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|ARM64.Build.0 = Debug|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x64.ActiveCfg = Release|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x64.Build.0 = Release|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x86.ActiveCfg = Release|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x86.Build.0 = Release|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|ARM64.ActiveCfg = Release|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|ARM64.Build.0 = Release|ARM64
 		{85449ABF-3212-44B4-BE33-D3C6629FD017}.Debug|x64.ActiveCfg = Debug|x64
 		{85449ABF-3212-44B4-BE33-D3C6629FD017}.Debug|x64.Build.0 = Debug|x64
 		{85449ABF-3212-44B4-BE33-D3C6629FD017}.Debug|x86.ActiveCfg = Debug|Win32

diff --git a/example/windows/ReactNativeFsExample/App.cpp b/example/windows/ReactNativeFsExample/App.cpp
@@ -22,17 +22,17 @@ App::App() noexcept
 {
 #if BUNDLE
     JavaScriptBundleFile(L"index.windows");
-    InstanceSettings().UseWebDebugger(false);
     InstanceSettings().UseFastRefresh(false);
 #else
     JavaScriptBundleFile(L"index");
-    InstanceSettings().UseWebDebugger(true);
     InstanceSettings().UseFastRefresh(true);
 #endif
 
 #if _DEBUG
+    InstanceSettings().UseDirectDebugger(true);
     InstanceSettings().UseDeveloperSupport(true);
 #else
+    InstanceSettings().UseDirectDebugger(false);
     InstanceSettings().UseDeveloperSupport(false);
 #endif
 

diff --git a/example/windows/ReactNativeFsExample/AutolinkedNativeModules.g.targets b/example/windows/ReactNativeFsExample/AutolinkedNativeModules.g.targets
@@ -4,7 +4,7 @@
   <ItemGroup>
     <!-- Projects from @dr.pogodin/react-native-fs -->
     <ProjectReference Include="$(ProjectDir)..\..\..\windows\ReactNativeFs\ReactNativeFs.vcxproj">
-      <Project>{f912ebdd-f19a-48c7-a32c-49d2956fce22}</Project>
+      <Project>{64defcc0-2495-420f-becb-78d19c734e25}</Project>
     </ProjectReference>
     <!-- Projects from @dr.pogodin/react-native-static-server -->
     <ProjectReference Include="$(ProjectDir)..\..\node_modules\@dr.pogodin\react-native-static-server\windows\ReactNativeStaticServer\ReactNativeStaticServer.vcxproj">

diff --git a/example/windows/ReactNativeFsExample/Package.appxmanifest b/example/windows/ReactNativeFsExample/Package.appxmanifest
@@ -7,11 +7,11 @@
   IgnorableNamespaces="uap mp">
 
   <Identity
-    Name="5f89a857-81b9-4136-abe7-f5909fe474f9"
+    Name="9c9fc8f3-0afc-4328-9ac5-341258a8bb13"
     Publisher="CN=drpog"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="5f89a857-81b9-4136-abe7-f5909fe474f9" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="9c9fc8f3-0afc-4328-9ac5-341258a8bb13" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>ReactNativeFsExample</DisplayName>

diff --git a/example/windows/ReactNativeFsExample/ReactNativeFsExample.vcxproj b/example/windows/ReactNativeFsExample/ReactNativeFsExample.vcxproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This project was created with react-native-windows 0.73.2 -->
+<!-- This project was created with react-native-windows 0.74.2 -->
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <MinimalCoreWin>true</MinimalCoreWin>
-    <ProjectGuid>{ed4e1b3b-892a-4e15-bb7e-80e13993474f}</ProjectGuid>
+    <ProjectGuid>{83c5aa44-d8cb-4c78-b8ae-6b1251d57a1d}</ProjectGuid>
     <ProjectName>ReactNativeFsExample</ProjectName>
     <RootNamespace>ReactNativeFsExample</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>

diff --git a/example/windows/ReactNativeFsExample/packages.lock.json b/example/windows/ReactNativeFsExample/packages.lock.json
@@ -19,9 +19,9 @@
       },
       "Microsoft.Windows.CppWinRT": {
         "type": "Direct",
-        "requested": "[2.0.211028.7, )",
-        "resolved": "2.0.211028.7",
-        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+        "requested": "[2.0.230706.1, )",
+        "resolved": "2.0.230706.1",
+        "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
       },
       "boost": {
         "type": "Transitive",
@@ -34,7 +34,10 @@
         "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
       },
       "common": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "boost": "[1.76.0, )"
+        }
       },
       "fmt": {
         "type": "Project"

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "react": "18.3.1",
     "react-native": "0.74.1",
     "react-native-builder-bob": "^0.23.2",
-    "react-native-windows": "^0.74.2",
+    "react-native-windows": "0.74.2",
     "typescript": "^5.4.5"
   },
   "resolutions": {

diff --git a/windows/ReactNativeFs.sln b/windows/ReactNativeFs.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFs", "ReactNativeFs\ReactNativeFs.vcxproj", "{F912EBDD-F19A-48C7-A32C-49D2956FCE22}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeFs", "ReactNativeFs\ReactNativeFs.vcxproj", "{64DEFCC0-2495-420F-BECB-78D19C734E25}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
 	EndProjectSection
@@ -54,24 +54,24 @@ Global
 		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x64.ActiveCfg = Debug|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x64.Build.0 = Debug|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x64.Deploy.0 = Debug|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x86.ActiveCfg = Debug|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x86.Build.0 = Debug|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Debug|x86.Deploy.0 = Debug|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|ARM64.Build.0 = Release|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|ARM64.Deploy.0 = Release|ARM64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x64.ActiveCfg = Release|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x64.Build.0 = Release|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x64.Deploy.0 = Release|x64
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x86.ActiveCfg = Release|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x86.Build.0 = Release|Win32
-		{F912EBDD-F19A-48C7-A32C-49D2956FCE22}.Release|x86.Deploy.0 = Release|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|ARM64.Build.0 = Debug|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x64.ActiveCfg = Debug|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x64.Build.0 = Debug|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x64.Deploy.0 = Debug|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x86.ActiveCfg = Debug|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x86.Build.0 = Debug|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Debug|x86.Deploy.0 = Debug|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|ARM64.ActiveCfg = Release|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|ARM64.Build.0 = Release|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|ARM64.Deploy.0 = Release|ARM64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x64.ActiveCfg = Release|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x64.Build.0 = Release|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x64.Deploy.0 = Release|x64
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x86.ActiveCfg = Release|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x86.Build.0 = Release|Win32
+		{64DEFCC0-2495-420F-BECB-78D19C734E25}.Release|x86.Deploy.0 = Release|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/windows/ReactNativeFs/ReactNativeFs.vcxproj b/windows/ReactNativeFs/ReactNativeFs.vcxproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This project was created with react-native-windows 0.73.2 -->
+<!-- This project was created with react-native-windows 0.74.2 -->
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <MinimalCoreWin>true</MinimalCoreWin>
-    <ProjectGuid>{f912ebdd-f19a-48c7-a32c-49d2956fce22}</ProjectGuid>
+    <ProjectGuid>{64defcc0-2495-420f-becb-78d19c734e25}</ProjectGuid>
     <ProjectName>ReactNativeFs</ProjectName>
     <RootNamespace>ReactNativeFs</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -65,8 +65,7 @@
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings"></ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -147,4 +146,4 @@
     <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props'))" />
     <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/windows/ReactNativeFs/packages.lock.json b/windows/ReactNativeFs/packages.lock.json
@@ -13,9 +13,9 @@
       },
       "Microsoft.Windows.CppWinRT": {
         "type": "Direct",
-        "requested": "[2.0.211028.7, )",
-        "resolved": "2.0.211028.7",
-        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+        "requested": "[2.0.230706.1, )",
+        "resolved": "2.0.230706.1",
+        "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
       },
       "boost": {
         "type": "Transitive",
@@ -33,7 +33,10 @@
         "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
       },
       "common": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "boost": "[1.76.0, )"
+        }
       },
       "fmt": {
         "type": "Project"

diff --git a/yarn.lock b/yarn.lock
@@ -1845,7 +1845,7 @@ __metadata:
     metro-config: ^0.80.9
     react: 18.3.1
     react-native: 0.74.1
-    react-native-windows: ^0.74.2
+    react-native-windows: 0.74.2
   languageName: unknown
   linkType: soft
 
@@ -1867,7 +1867,7 @@ __metadata:
     react: 18.3.1
     react-native: 0.74.1
     react-native-builder-bob: ^0.23.2
-    react-native-windows: ^0.74.2
+    react-native-windows: 0.74.2
     typescript: ^5.4.5
   peerDependencies:
     react: "*"
@@ -9348,7 +9348,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-windows@npm:^0.74.2":
+"react-native-windows@npm:0.74.2":
   version: 0.74.2
   resolution: "react-native-windows@npm:0.74.2"
   dependencies:
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,8 @@ const config = { @@
             inlineRequires: true,
           },
         }),
+        // This fixes the 'missing-asset-registry-path` error (see https://github.com/microsoft/react-native-windows/issues/11437)
+        assetRegistryPath: 'react-native/Libraries/Image/AssetRegistry',
       },
     };
@@ Expand Down @@