Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Use HybridCRT for react-native-win32",
"packageName": "react-native-windows",
"email": "vmorozov@microsoft.com",
"dependentChangeType": "patch"
}
11 changes: 6 additions & 5 deletions vnext/Common/Common.vcxproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}</ProjectGuid>
<ProjectName>Common</ProjectName>
<ProjectGuid Condition="'$(ReactTargetWin32)' != 'true'">{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}</ProjectGuid>
<ProjectName Condition="'$(ReactTargetWin32)' != 'true'">Common</ProjectName>
<Keyword>StaticLibrary</Keyword>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<AppContainerApplication Condition="'$(ReactTargetWin32)' != 'true'">true</AppContainerApplication>
<ApplicationType Condition="'$(ReactTargetWin32)' != 'true'">Windows Store</ApplicationType>
<ApplicationTypeRevision Condition="'$(ReactTargetWin32)' != 'true'">10.0</ApplicationTypeRevision>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
Expand Down Expand Up @@ -56,6 +56,7 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" Condition="'$(ReactTargetWin32)' == 'true'" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Expand Down
10 changes: 10 additions & 0 deletions vnext/Common/Common.win32.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}</ProjectGuid>
<ProjectName>Common.win32</ProjectName>
<Keyword>StaticLibrary</Keyword>
<ReactTargetWin32>true</ReactTargetWin32>
</PropertyGroup>
<Import Project="Common.vcxproj" />
</Project>
20 changes: 10 additions & 10 deletions vnext/Desktop.ABITests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,38 +67,38 @@
"resolved": "0.71.8",
"contentHash": "ksHjshj05AMAQ/v7Wet5Dwcwn9Up2BTOIrTv1yEW7+D23FQX0yILW5Zw0bmlWtV8MEtdY611z+06U3Xvu2ygSA=="
},
"common": {
"common.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"fmt.win32": {
"type": "Project"
},
"folly": {
"folly.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
"fmt.win32": "[1.0.0, )"
}
},
"follywin32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly.win32": "[1.0.0, )"
}
},
"react.windows.desktop": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Common.win32": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.0.0-2604.21001-94aa5e1d, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.7.250401001, )",
"ReactCommon": "[1.0.0, )",
"ReactCommon.win32": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
}
Expand All @@ -113,10 +113,10 @@
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"reactcommon.win32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
}
Expand Down
1 change: 1 addition & 0 deletions vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\Generated\PackageVersion.g.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
Expand Down
20 changes: 10 additions & 10 deletions vnext/Desktop.DLL/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,46 +59,46 @@
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
},
"common": {
"common.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"fmt.win32": {
"type": "Project"
},
"folly": {
"folly.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
"fmt.win32": "[1.0.0, )"
}
},
"follywin32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly.win32": "[1.0.0, )"
}
},
"react.windows.desktop": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Common.win32": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.0.0-2604.21001-94aa5e1d, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.7.250401001, )",
"ReactCommon": "[1.0.0, )",
"ReactCommon.win32": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"reactcommon.win32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
Expand Down
24 changes: 12 additions & 12 deletions vnext/Desktop.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,38 +68,38 @@
"resolved": "0.71.8",
"contentHash": "ksHjshj05AMAQ/v7Wet5Dwcwn9Up2BTOIrTv1yEW7+D23FQX0yILW5Zw0bmlWtV8MEtdY611z+06U3Xvu2ygSA=="
},
"common": {
"common.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"fmt.win32": {
"type": "Project"
},
"folly": {
"folly.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
"fmt.win32": "[1.0.0, )"
}
},
"follywin32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly.win32": "[1.0.0, )"
}
},
"react.windows.desktop": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Common.win32": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.0.0-2604.21001-94aa5e1d, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.7.250401001, )",
"ReactCommon": "[1.0.0, )",
"ReactCommon.win32": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
}
Expand All @@ -117,8 +117,8 @@
"react.windows.integrationtests": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Common.win32": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
Expand All @@ -129,10 +129,10 @@
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"reactcommon.win32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions vnext/Desktop.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,46 +68,46 @@
"resolved": "0.71.8",
"contentHash": "ksHjshj05AMAQ/v7Wet5Dwcwn9Up2BTOIrTv1yEW7+D23FQX0yILW5Zw0bmlWtV8MEtdY611z+06U3Xvu2ygSA=="
},
"common": {
"common.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"fmt.win32": {
"type": "Project"
},
"folly": {
"folly.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
"fmt.win32": "[1.0.0, )"
}
},
"follywin32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly.win32": "[1.0.0, )"
}
},
"react.windows.desktop": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Common.win32": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.0.0-2604.21001-94aa5e1d, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.7.250401001, )",
"ReactCommon": "[1.0.0, )",
"ReactCommon.win32": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"reactcommon.win32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
}
Expand Down
13 changes: 7 additions & 6 deletions vnext/Desktop/React.Windows.Desktop.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\PropertySheets\WinUI.props" Condition="'$(UseWinUI3)'=='true'" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Expand Down Expand Up @@ -267,17 +268,17 @@
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
<ProjectReference Include="..\Common\Common.win32.vcxproj">
<Project>{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}</Project>
</ProjectReference>
<ProjectReference Include="..\Folly\Folly.vcxproj">
<Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
<ProjectReference Include="..\Folly\Folly.win32.vcxproj">
<Project>{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}</Project>
</ProjectReference>
<ProjectReference Include="..\FollyWin32\FollyWin32.vcxproj">
<Project>{74085F13-2DDE-45E5-A0CA-927AC9D0B953}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
<Project>{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</Project>
<ProjectReference Include="..\ReactCommon\ReactCommon.win32.vcxproj">
<Project>{5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions vnext/Desktop/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,32 @@
"resolved": "10.0.22621.756",
"contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
},
"common": {
"common.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"fmt.win32": {
"type": "Project"
},
"folly": {
"folly.win32": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
"fmt.win32": "[1.0.0, )"
}
},
"follywin32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly.win32": "[1.0.0, )"
}
},
"reactcommon": {
"reactcommon.win32": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"Folly.win32": "[1.0.0, )",
"boost": "[1.83.0, )"
}
}
Expand Down
Loading
Loading