From 0f1e2e7a844e04cee2a11050c6d1fdde536089ba Mon Sep 17 00:00:00 2001 From: Vladimir Morozov Date: Mon, 15 Dec 2025 17:53:13 -0800 Subject: [PATCH 1/3] Use HybridCRT for react-native-win32 --- vnext/Common/Common.Hybrid.vcxproj | 10 ++ vnext/Common/Common.vcxproj | 11 +- .../React.Windows.Desktop.DLL.vcxproj | 6 +- .../React.Windows.Desktop.Hybrid.vcxproj | 10 ++ vnext/Desktop/React.Windows.Desktop.vcxproj | 21 +++- vnext/Folly/Folly.Hybrid.vcxproj | 10 ++ vnext/Folly/Folly.vcxproj | 19 +-- vnext/FollyWin32/FollyWin32.Hybrid.vcxproj | 10 ++ vnext/FollyWin32/FollyWin32.vcxproj | 8 +- vnext/PropertySheets/HybridCRT.props | 48 ++++---- vnext/ReactCommon/ReactCommon.Hybrid.vcxproj | 10 ++ vnext/ReactCommon/ReactCommon.vcxproj | 19 ++- vnext/ReactWindows-Desktop.sln | 116 +++++++++++++++++- vnext/fmt/fmt.Hybrid.vcxproj | 10 ++ vnext/fmt/fmt.vcxproj | 12 +- 15 files changed, 264 insertions(+), 56 deletions(-) create mode 100644 vnext/Common/Common.Hybrid.vcxproj create mode 100644 vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj create mode 100644 vnext/Folly/Folly.Hybrid.vcxproj create mode 100644 vnext/FollyWin32/FollyWin32.Hybrid.vcxproj create mode 100644 vnext/ReactCommon/ReactCommon.Hybrid.vcxproj create mode 100644 vnext/fmt/fmt.Hybrid.vcxproj diff --git a/vnext/Common/Common.Hybrid.vcxproj b/vnext/Common/Common.Hybrid.vcxproj new file mode 100644 index 00000000000..1302a554add --- /dev/null +++ b/vnext/Common/Common.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6} + Common.Hybrid + StaticLibrary + true + + + diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj index 8c652366030..b5109e941c3 100644 --- a/vnext/Common/Common.vcxproj +++ b/vnext/Common/Common.vcxproj @@ -1,12 +1,12 @@ - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} - Common + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} + Common StaticLibrary - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -56,6 +56,7 @@ + diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 9252de6f3f3..9b72d0a87b1 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -41,9 +41,11 @@ true win32 10.0.22621.0 + true + DynamicLibrary @@ -159,8 +161,8 @@ - - {95048601-C3DC-475F-ADF8-7C0C764C10D5} + + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF} diff --git a/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj b/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj new file mode 100644 index 00000000000..d38c9bd3a56 --- /dev/null +++ b/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF} + React.Windows.Desktop.Hybrid + StaticLibrary + true + + + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 1b7b522c805..4d11b7ffccf 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -49,8 +49,8 @@ --> Microsoft.ReactNative true - {95048601-C3DC-475F-ADF8-7C0C764C10D5} - React.Windows.Desktop + {95048601-C3DC-475F-ADF8-7C0C764C10D5} + React.Windows.Desktop facebook.react en-US 17.0 @@ -88,6 +88,7 @@ + @@ -266,7 +267,7 @@ - + {fca38f3c-7c73-4c47-be4e-32f77fa8538d} @@ -280,6 +281,20 @@ {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} + + + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6} + + + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} + + + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56} + + + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5} + + diff --git a/vnext/Folly/Folly.Hybrid.vcxproj b/vnext/Folly/Folly.Hybrid.vcxproj new file mode 100644 index 00000000000..b7eb8b8afc3 --- /dev/null +++ b/vnext/Folly/Folly.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} + Folly.Hybrid + StaticLibrary + true + + + diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index ab9d5344d55..5d53e655542 100644 --- a/vnext/Folly/Folly.vcxproj +++ b/vnext/Folly/Folly.vcxproj @@ -1,14 +1,14 @@  - {a990658c-ce31-4bcc-976f-0fc6b1af693d} + {a990658c-ce31-4bcc-976f-0fc6b1af693d} StaticLibrary - Folly + Folly Folly en-US - Windows Store - 10.0 - true + Windows Store + 10.0 + true @@ -250,6 +250,7 @@ + @@ -259,6 +260,7 @@ Use + pch.h false true $(ReactNativeWindowsDir)stubs;$(FollyDir);$(FmtDir)\include;%(AdditionalIncludeDirectories) @@ -333,7 +335,10 @@ - - + + + + + \ No newline at end of file diff --git a/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj b/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj new file mode 100644 index 00000000000..3acdab9fe95 --- /dev/null +++ b/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56} + FollyWin32.Hybrid + StaticLibrary + true + + + diff --git a/vnext/FollyWin32/FollyWin32.vcxproj b/vnext/FollyWin32/FollyWin32.vcxproj index ef49708a792..a09345ff85f 100644 --- a/vnext/FollyWin32/FollyWin32.vcxproj +++ b/vnext/FollyWin32/FollyWin32.vcxproj @@ -1,7 +1,7 @@  - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} + {74085F13-2DDE-45E5-A0CA-927AC9D0B953} StaticLibrary FollyWin32 @@ -62,6 +62,7 @@ + @@ -84,7 +85,10 @@ - + + + + \ No newline at end of file diff --git a/vnext/PropertySheets/HybridCRT.props b/vnext/PropertySheets/HybridCRT.props index 610fd928118..1bf913c665d 100644 --- a/vnext/PropertySheets/HybridCRT.props +++ b/vnext/PropertySheets/HybridCRT.props @@ -1,34 +1,38 @@ + - - - - MultiThreadedDebug - - - + MultiThreadedDebug + + + - %(IgnoreSpecificDefaultLibraries);libucrtd.lib - %(AdditionalOptions) /defaultlib:ucrtd.lib - - - - - - MultiThreaded - - - + MultiThreaded + + + - %(IgnoreSpecificDefaultLibraries);libucrt.lib - %(AdditionalOptions) /defaultlib:ucrt.lib - - + %(IgnoreSpecificDefaultLibraries);libucrt.lib + %(AdditionalOptions) /defaultlib:ucrt.lib + + \ No newline at end of file diff --git a/vnext/ReactCommon/ReactCommon.Hybrid.vcxproj b/vnext/ReactCommon/ReactCommon.Hybrid.vcxproj new file mode 100644 index 00000000000..ae11ac2ee7f --- /dev/null +++ b/vnext/ReactCommon/ReactCommon.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5} + ReactCommon.Hybrid + StaticLibrary + true + + + diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 4a70c003acc..642a2ad323f 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -1,13 +1,13 @@ - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} StaticLibrary - ReactCommon + ReactCommon ReactCommon - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -57,6 +57,7 @@ + @@ -66,6 +67,7 @@ Use + pch.h false true @@ -189,11 +191,16 @@ - + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + + + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} + + diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 87c3b33978b..e5d73cae634 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -117,16 +117,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon.UnitTests", "Re EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Test.Website", "TestWebsite\Microsoft.ReactNative.Test.Website.csproj", "{C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt.Hybrid", "fmt\fmt.Hybrid.vcxproj", "{4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly.Hybrid", "Folly\Folly.Hybrid.vcxproj", "{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FollyWin32.Hybrid", "FollyWin32\FollyWin32.Hybrid.vcxproj", "{BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon.Hybrid", "ReactCommon\ReactCommon.Hybrid.vcxproj", "{5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Hybrid", "Common\Common.Hybrid.vcxproj", "{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.Hybrid", "Desktop\React.Windows.Desktop.Hybrid.vcxproj", "{5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Debug|ARM64 = Debug|ARM64 Debug|ARM64EC = Debug|ARM64EC - Release|x64 = Release|x64 - Release|x86 = Release|x86 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|ARM64 = Release|ARM64 Release|ARM64EC = Release|ARM64EC + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -359,6 +371,102 @@ Global {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x64.Build.0 = Release|Any CPU {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x86.ActiveCfg = Release|Any CPU {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x86.Build.0 = Release|Any CPU + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|ARM64.Build.0 = Debug|ARM64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x64.ActiveCfg = Debug|x64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x64.Build.0 = Debug|x64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x86.ActiveCfg = Debug|Win32 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x86.Build.0 = Debug|Win32 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64.ActiveCfg = Release|ARM64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64.Build.0 = Release|ARM64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64EC.Build.0 = Release|ARM64EC + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x64.ActiveCfg = Release|x64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x64.Build.0 = Release|x64 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x86.ActiveCfg = Release|Win32 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x86.Build.0 = Release|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64.Build.0 = Debug|ARM64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x64.ActiveCfg = Debug|x64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x64.Build.0 = Debug|x64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x86.ActiveCfg = Debug|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x86.Build.0 = Debug|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64.ActiveCfg = Release|ARM64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64.Build.0 = Release|ARM64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64EC.Build.0 = Release|ARM64EC + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x64.ActiveCfg = Release|x64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x64.Build.0 = Release|x64 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x86.ActiveCfg = Release|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x86.Build.0 = Release|Win32 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64.Build.0 = Debug|ARM64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x64.ActiveCfg = Debug|x64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x64.Build.0 = Debug|x64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x86.ActiveCfg = Debug|Win32 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x86.Build.0 = Debug|Win32 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64.ActiveCfg = Release|ARM64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64.Build.0 = Release|ARM64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64EC.Build.0 = Release|ARM64EC + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x64.ActiveCfg = Release|x64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x64.Build.0 = Release|x64 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x86.ActiveCfg = Release|Win32 + {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x86.Build.0 = Release|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64.Build.0 = Debug|ARM64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x64.ActiveCfg = Debug|x64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x64.Build.0 = Debug|x64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x86.ActiveCfg = Debug|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x86.Build.0 = Debug|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64.ActiveCfg = Release|ARM64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64.Build.0 = Release|ARM64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64EC.Build.0 = Release|ARM64EC + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x64.ActiveCfg = Release|x64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x64.Build.0 = Release|x64 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x86.ActiveCfg = Release|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x86.Build.0 = Release|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64.Build.0 = Debug|ARM64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x64.ActiveCfg = Debug|x64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x64.Build.0 = Debug|x64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x86.ActiveCfg = Debug|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x86.Build.0 = Debug|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64.ActiveCfg = Release|ARM64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64.Build.0 = Release|ARM64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64EC.Build.0 = Release|ARM64EC + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x64.ActiveCfg = Release|x64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x64.Build.0 = Release|x64 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x86.ActiveCfg = Release|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x86.Build.0 = Release|Win32 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64.Build.0 = Debug|ARM64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x64.ActiveCfg = Debug|x64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x64.Build.0 = Debug|x64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x86.ActiveCfg = Debug|Win32 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x86.Build.0 = Debug|Win32 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64.ActiveCfg = Release|ARM64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64.Build.0 = Release|ARM64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64EC.Build.0 = Release|ARM64EC + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x64.ActiveCfg = Release|x64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x64.Build.0 = Release|x64 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x86.ActiveCfg = Release|Win32 + {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/fmt/fmt.Hybrid.vcxproj b/vnext/fmt/fmt.Hybrid.vcxproj new file mode 100644 index 00000000000..b0273567834 --- /dev/null +++ b/vnext/fmt/fmt.Hybrid.vcxproj @@ -0,0 +1,10 @@ + + + + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239} + fmt.Hybrid + StaticLibrary + true + + + diff --git a/vnext/fmt/fmt.vcxproj b/vnext/fmt/fmt.vcxproj index 20f21859bc6..f7483794d1b 100644 --- a/vnext/fmt/fmt.vcxproj +++ b/vnext/fmt/fmt.vcxproj @@ -1,14 +1,14 @@  - {14b93dc8-fd93-4a6d-81cb-8bc96644501c} + {14b93dc8-fd93-4a6d-81cb-8bc96644501c} StaticLibrary - fmt + fmt fmt en-US - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -80,6 +80,7 @@ + @@ -89,6 +90,7 @@ Use + pch.h false true $(FmtDir)\include;%(AdditionalIncludeDirectories) From 958c13c22ae1182b8e22936d86329ca51d0cec1e Mon Sep 17 00:00:00 2001 From: Vladimir Morozov Date: Mon, 15 Dec 2025 17:53:56 -0800 Subject: [PATCH 2/3] Change files --- ...ative-windows-45b71ac8-193e-4478-85ad-df5bc0197d2a.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-45b71ac8-193e-4478-85ad-df5bc0197d2a.json diff --git a/change/react-native-windows-45b71ac8-193e-4478-85ad-df5bc0197d2a.json b/change/react-native-windows-45b71ac8-193e-4478-85ad-df5bc0197d2a.json new file mode 100644 index 00000000000..6cc5ea5d269 --- /dev/null +++ b/change/react-native-windows-45b71ac8-193e-4478-85ad-df5bc0197d2a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Use HybridCRT for react-native-win32", + "packageName": "react-native-windows", + "email": "vmorozov@microsoft.com", + "dependentChangeType": "patch" +} From 902ba1195e7e89643a26ef4bca7dd838e33710f3 Mon Sep 17 00:00:00 2001 From: Vladimir Morozov Date: Tue, 16 Dec 2025 17:52:22 -0800 Subject: [PATCH 3/3] All Desktop project to use HybridCRT --- vnext/Common/Common.vcxproj | 12 +- ...on.Hybrid.vcxproj => Common.win32.vcxproj} | 4 +- .../React.Windows.Desktop.DLL.vcxproj | 5 +- ...t.Windows.Desktop.IntegrationTests.vcxproj | 1 + .../React.Windows.Desktop.Test.DLL.vcxproj | 1 + .../React.Windows.Desktop.UnitTests.vcxproj | 1 + .../React.Windows.Desktop.Hybrid.vcxproj | 10 -- vnext/Desktop/React.Windows.Desktop.vcxproj | 32 ++-- vnext/Folly/Folly.vcxproj | 18 +-- ...lly.Hybrid.vcxproj => Folly.win32.vcxproj} | 4 +- vnext/FollyWin32/FollyWin32.Hybrid.vcxproj | 10 -- vnext/FollyWin32/FollyWin32.vcxproj | 11 +- vnext/FollyWin32/packages.lock.json | 26 +++ .../React.Windows.IntegrationTests.vcxproj | 9 +- .../ReactCommon.UnitTests.vcxproj | 5 +- vnext/ReactCommon/ReactCommon.vcxproj | 18 +-- ...brid.vcxproj => ReactCommon.win32.vcxproj} | 4 +- vnext/ReactWindows-Desktop.sln | 148 +++--------------- vnext/Test/React.Windows.Test.vcxproj | 1 + vnext/fmt/fmt.vcxproj | 12 +- .../{fmt.Hybrid.vcxproj => fmt.win32.vcxproj} | 4 +- 21 files changed, 109 insertions(+), 227 deletions(-) rename vnext/Common/{Common.Hybrid.vcxproj => Common.win32.vcxproj} (80%) delete mode 100644 vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj rename vnext/Folly/{Folly.Hybrid.vcxproj => Folly.win32.vcxproj} (80%) delete mode 100644 vnext/FollyWin32/FollyWin32.Hybrid.vcxproj create mode 100644 vnext/FollyWin32/packages.lock.json rename vnext/ReactCommon/{ReactCommon.Hybrid.vcxproj => ReactCommon.win32.vcxproj} (79%) rename vnext/fmt/{fmt.Hybrid.vcxproj => fmt.win32.vcxproj} (80%) diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj index b5109e941c3..23047df86da 100644 --- a/vnext/Common/Common.vcxproj +++ b/vnext/Common/Common.vcxproj @@ -1,12 +1,12 @@ - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} - Common + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} + Common StaticLibrary - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -56,7 +56,7 @@ - + diff --git a/vnext/Common/Common.Hybrid.vcxproj b/vnext/Common/Common.win32.vcxproj similarity index 80% rename from vnext/Common/Common.Hybrid.vcxproj rename to vnext/Common/Common.win32.vcxproj index 1302a554add..03b81d3d36f 100644 --- a/vnext/Common/Common.Hybrid.vcxproj +++ b/vnext/Common/Common.win32.vcxproj @@ -2,9 +2,9 @@ {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6} - Common.Hybrid + Common.win32 StaticLibrary - true + true diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 9b72d0a87b1..d9036bada55 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -41,7 +41,6 @@ true win32 10.0.22621.0 - true @@ -161,8 +160,8 @@ - - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF} + + {95048601-C3DC-475F-ADF8-7C0C764C10D5} diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index ca2cf7bb792..9fa682dd445 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -34,6 +34,7 @@ + DynamicLibrary false diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj index fda8c8cf40b..c003986a257 100644 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj +++ b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj @@ -40,6 +40,7 @@ + DynamicLibrary diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index deb48217dfc..68c9a880f51 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -38,6 +38,7 @@ + DynamicLibrary diff --git a/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj b/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj deleted file mode 100644 index d38c9bd3a56..00000000000 --- a/vnext/Desktop/React.Windows.Desktop.Hybrid.vcxproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF} - React.Windows.Desktop.Hybrid - StaticLibrary - true - - - diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 4d11b7ffccf..b2602d64b2a 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -49,8 +49,8 @@ --> Microsoft.ReactNative true - {95048601-C3DC-475F-ADF8-7C0C764C10D5} - React.Windows.Desktop + {95048601-C3DC-475F-ADF8-7C0C764C10D5} + React.Windows.Desktop facebook.react en-US 17.0 @@ -88,7 +88,7 @@ - + @@ -267,31 +267,17 @@ - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - - - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - - - + + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6} - + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} - - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56} + + {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5} diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index 5d53e655542..184604ca4d7 100644 --- a/vnext/Folly/Folly.vcxproj +++ b/vnext/Folly/Folly.vcxproj @@ -1,14 +1,14 @@  - {a990658c-ce31-4bcc-976f-0fc6b1af693d} + {a990658c-ce31-4bcc-976f-0fc6b1af693d} StaticLibrary - Folly + Folly Folly en-US - Windows Store - 10.0 - true + Windows Store + 10.0 + true @@ -250,7 +250,7 @@ - + @@ -335,10 +335,10 @@ - + - - + + \ No newline at end of file diff --git a/vnext/Folly/Folly.Hybrid.vcxproj b/vnext/Folly/Folly.win32.vcxproj similarity index 80% rename from vnext/Folly/Folly.Hybrid.vcxproj rename to vnext/Folly/Folly.win32.vcxproj index b7eb8b8afc3..c3f700bad9e 100644 --- a/vnext/Folly/Folly.Hybrid.vcxproj +++ b/vnext/Folly/Folly.win32.vcxproj @@ -2,9 +2,9 @@ {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} - Folly.Hybrid + Folly.win32 StaticLibrary - true + true diff --git a/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj b/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj deleted file mode 100644 index 3acdab9fe95..00000000000 --- a/vnext/FollyWin32/FollyWin32.Hybrid.vcxproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56} - FollyWin32.Hybrid - StaticLibrary - true - - - diff --git a/vnext/FollyWin32/FollyWin32.vcxproj b/vnext/FollyWin32/FollyWin32.vcxproj index a09345ff85f..9fa98991a9e 100644 --- a/vnext/FollyWin32/FollyWin32.vcxproj +++ b/vnext/FollyWin32/FollyWin32.vcxproj @@ -1,7 +1,7 @@  - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} + {74085F13-2DDE-45E5-A0CA-927AC9D0B953} StaticLibrary FollyWin32 @@ -62,7 +62,7 @@ - + @@ -85,10 +85,7 @@ - - - - - + + \ No newline at end of file diff --git a/vnext/FollyWin32/packages.lock.json b/vnext/FollyWin32/packages.lock.json new file mode 100644 index 00000000000..90a02952249 --- /dev/null +++ b/vnext/FollyWin32/packages.lock.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "dependencies": { + "native,Version=v0.0": { + "boost": { + "type": "Transitive", + "resolved": "1.83.0", + "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" + }, + "fmt.win32": { + "type": "Project" + }, + "folly.win32": { + "type": "Project", + "dependencies": { + "boost": "[1.83.0, )", + "fmt.win32": "[1.0.0, )" + } + } + }, + "native,Version=v0.0/win": {}, + "native,Version=v0.0/win-arm64": {}, + "native,Version=v0.0/win-x64": {}, + "native,Version=v0.0/win-x86": {} + } +} \ No newline at end of file diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index 2d2794ded96..a8a892a4627 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -52,6 +52,7 @@ + @@ -68,11 +69,11 @@ - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} + + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6} - - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} diff --git a/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj b/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj index 038707bf99a..db6a05a6c11 100644 --- a/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj +++ b/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj @@ -28,6 +28,7 @@ + Application @@ -164,12 +165,10 @@ EnableFastChecks - MultiThreadedDebugDLL - MultiThreadedDLL ProgramDatabase @@ -179,7 +178,7 @@ - + \ No newline at end of file diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 642a2ad323f..62b9784247f 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -1,13 +1,13 @@ - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} StaticLibrary - ReactCommon + ReactCommon ReactCommon - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -57,7 +57,7 @@ - + @@ -191,13 +191,13 @@ - + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - + + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} diff --git a/vnext/ReactCommon/ReactCommon.Hybrid.vcxproj b/vnext/ReactCommon/ReactCommon.win32.vcxproj similarity index 79% rename from vnext/ReactCommon/ReactCommon.Hybrid.vcxproj rename to vnext/ReactCommon/ReactCommon.win32.vcxproj index ae11ac2ee7f..8028e25329b 100644 --- a/vnext/ReactCommon/ReactCommon.Hybrid.vcxproj +++ b/vnext/ReactCommon/ReactCommon.win32.vcxproj @@ -2,9 +2,9 @@ {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5} - ReactCommon.Hybrid + ReactCommon.win32 StaticLibrary - true + true diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index e5d73cae634..1f63220fbaf 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -2,22 +2,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}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" - ProjectSection(ProjectDependencies) = postProject - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} = {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", "Desktop.DLL\React.Windows.Desktop.DLL.vcxproj", "{88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}" - ProjectSection(ProjectDependencies) = postProject - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} = {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.UnitTests", "Desktop.UnitTests\React.Windows.Desktop.UnitTests.vcxproj", "{96CD24DC-91C2-480A-BC26-EE2250DA80D7}" EndProject @@ -103,8 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.Test. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mso", "Mso", "{4DE630AE-EC50-4F21-942E-7B811A1C5FA3}" @@ -117,80 +100,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon.UnitTests", "Re EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Test.Website", "TestWebsite\Microsoft.ReactNative.Test.Website.csproj", "{C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt.Hybrid", "fmt\fmt.Hybrid.vcxproj", "{4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly.Hybrid", "Folly\Folly.Hybrid.vcxproj", "{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt.win32", "fmt\fmt.win32.vcxproj", "{4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FollyWin32.Hybrid", "FollyWin32\FollyWin32.Hybrid.vcxproj", "{BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly.win32", "Folly\Folly.win32.vcxproj", "{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon.Hybrid", "ReactCommon\ReactCommon.Hybrid.vcxproj", "{5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon.win32", "ReactCommon\ReactCommon.win32.vcxproj", "{5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Hybrid", "Common\Common.Hybrid.vcxproj", "{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.Hybrid", "Desktop\React.Windows.Desktop.Hybrid.vcxproj", "{5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.win32", "Common\Common.win32.vcxproj", "{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 - Debug|ARM64EC = Debug|ARM64EC Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM64 = Release|ARM64 - Release|ARM64EC = Release|ARM64EC + Debug|ARM64 = Debug|ARM64 + Debug|ARM64EC = Debug|ARM64EC Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM64 = Release|ARM64 + Release|ARM64EC = Release|ARM64EC EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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|ARM64EC.ActiveCfg = Debug|ARM64EC - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64EC.Build.0 = Release|ARM64EC - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64EC.Build.0 = Release|ARM64EC - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 - {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 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64EC.Build.0 = Release|ARM64EC - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64.Build.0 = Debug|ARM64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC @@ -317,22 +246,6 @@ Global {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.Build.0 = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64EC.Build.0 = Release|ARM64EC - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 @@ -379,6 +292,7 @@ Global {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x64.Build.0 = Debug|x64 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x86.ActiveCfg = Debug|Win32 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x86.Build.0 = Debug|Win32 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Debug|x86.Deploy.0 = Debug|Win32 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64.ActiveCfg = Release|ARM64 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64.Build.0 = Release|ARM64 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|ARM64EC.ActiveCfg = Release|ARM64EC @@ -387,6 +301,7 @@ Global {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x64.Build.0 = Release|x64 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x86.ActiveCfg = Release|Win32 {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x86.Build.0 = Release|Win32 + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}.Release|x86.Deploy.0 = Release|Win32 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64.ActiveCfg = Debug|ARM64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64.Build.0 = Debug|ARM64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC @@ -395,6 +310,7 @@ Global {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x64.Build.0 = Debug|x64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x86.ActiveCfg = Debug|Win32 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x86.Build.0 = Debug|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Debug|x86.Deploy.0 = Debug|Win32 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64.ActiveCfg = Release|ARM64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64.Build.0 = Release|ARM64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|ARM64EC.ActiveCfg = Release|ARM64EC @@ -403,22 +319,7 @@ Global {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x64.Build.0 = Release|x64 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x86.ActiveCfg = Release|Win32 {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x86.Build.0 = Release|Win32 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64.Build.0 = Debug|ARM64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x64.ActiveCfg = Debug|x64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x64.Build.0 = Debug|x64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x86.ActiveCfg = Debug|Win32 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Debug|x86.Build.0 = Debug|Win32 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64.ActiveCfg = Release|ARM64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64.Build.0 = Release|ARM64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|ARM64EC.Build.0 = Release|ARM64EC - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x64.ActiveCfg = Release|x64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x64.Build.0 = Release|x64 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x86.ActiveCfg = Release|Win32 - {BDA7C42C-73C2-4A21-9DA3-7B64B5ED4D56}.Release|x86.Build.0 = Release|Win32 + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}.Release|x86.Deploy.0 = Release|Win32 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64.Build.0 = Debug|ARM64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC @@ -427,6 +328,7 @@ Global {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x64.Build.0 = Debug|x64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x86.ActiveCfg = Debug|Win32 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x86.Build.0 = Debug|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Debug|x86.Deploy.0 = Debug|Win32 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64.ActiveCfg = Release|ARM64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64.Build.0 = Release|ARM64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|ARM64EC.ActiveCfg = Release|ARM64EC @@ -435,6 +337,7 @@ Global {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x64.Build.0 = Release|x64 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x86.ActiveCfg = Release|Win32 {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x86.Build.0 = Release|Win32 + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}.Release|x86.Deploy.0 = Release|Win32 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64.ActiveCfg = Debug|ARM64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64.Build.0 = Debug|ARM64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC @@ -443,6 +346,7 @@ Global {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x64.Build.0 = Debug|x64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x86.ActiveCfg = Debug|Win32 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x86.Build.0 = Debug|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Debug|x86.Deploy.0 = Debug|Win32 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64.ActiveCfg = Release|ARM64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64.Build.0 = Release|ARM64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC @@ -451,29 +355,12 @@ Global {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x64.Build.0 = Release|x64 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x86.ActiveCfg = Release|Win32 {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x86.Build.0 = Release|Win32 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64.Build.0 = Debug|ARM64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|ARM64EC.Build.0 = Debug|ARM64EC - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x64.ActiveCfg = Debug|x64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x64.Build.0 = Debug|x64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x86.ActiveCfg = Debug|Win32 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Debug|x86.Build.0 = Debug|Win32 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64.ActiveCfg = Release|ARM64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64.Build.0 = Release|ARM64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|ARM64EC.Build.0 = Release|ARM64EC - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x64.ActiveCfg = Release|x64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x64.Build.0 = Release|x64 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x86.ActiveCfg = Release|Win32 - {5C4D96D0-5E2A-43F4-8F8D-2C9C8B97F3AF}.Release|x86.Build.0 = Release|Win32 + {07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}.Release|x86.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {41F31595-2F20-4D6B-A6CF-60444415012A} - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {F90FDFD1-2C76-4DCD-B248-F6FB2BB15BDF} {74085F13-2DDE-45E5-A0CA-927AC9D0B953} = {41F31595-2F20-4D6B-A6CF-60444415012A} {43A78B84-278B-4B99-8887-4029D551173E} = {6F24927E-EE45-4DB2-91DA-DCC6E98B0C42} {102E37B8-4BE5-4DC1-A650-16706EFB3306} = {6F24927E-EE45-4DB2-91DA-DCC6E98B0C42} @@ -484,6 +371,9 @@ Global {4DE630AE-EC50-4F21-942E-7B811A1C5FA3} = {978A75A5-B8D2-4306-9AEF-D00793F33F5F} {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {4DE630AE-EC50-4F21-942E-7B811A1C5FA3} {B0941079-7441-4A69-868C-FE5EC62C2E9E} = {F90FDFD1-2C76-4DCD-B248-F6FB2BB15BDF} + {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239} = {978A75A5-B8D2-4306-9AEF-D00793F33F5F} + {BFF1EAC8-4C70-4A55-9A88-3810052E8FBA} = {41F31595-2F20-4D6B-A6CF-60444415012A} + {5CB3C038-4A3C-4F09-A36B-66DB8EC650F5} = {F90FDFD1-2C76-4DCD-B248-F6FB2BB15BDF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1055EEE-3785-4C0E-8934-FBAA21BFF90C} diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index a1046a4fbe1..fe23473f0a6 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -78,6 +78,7 @@ + diff --git a/vnext/fmt/fmt.vcxproj b/vnext/fmt/fmt.vcxproj index f7483794d1b..67e35e486b7 100644 --- a/vnext/fmt/fmt.vcxproj +++ b/vnext/fmt/fmt.vcxproj @@ -1,14 +1,14 @@  - {14b93dc8-fd93-4a6d-81cb-8bc96644501c} + {14b93dc8-fd93-4a6d-81cb-8bc96644501c} StaticLibrary - fmt + fmt fmt en-US - true - Windows Store - 10.0 + true + Windows Store + 10.0 @@ -80,7 +80,7 @@ - + diff --git a/vnext/fmt/fmt.Hybrid.vcxproj b/vnext/fmt/fmt.win32.vcxproj similarity index 80% rename from vnext/fmt/fmt.Hybrid.vcxproj rename to vnext/fmt/fmt.win32.vcxproj index b0273567834..22e30a59008 100644 --- a/vnext/fmt/fmt.Hybrid.vcxproj +++ b/vnext/fmt/fmt.win32.vcxproj @@ -2,9 +2,9 @@ {4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239} - fmt.Hybrid + fmt.win32 StaticLibrary - true + true