Skip to content

Commit

Permalink
[0.73] Don't override Hermes platform for ARM64EC #13490 (#13496)
Browse files Browse the repository at this point in the history
* Don't override Hermes platform for ARM64EC (#13490)

* Don't override Hermes platform for ARM64EC

* Change files

* Upgrade Hermes to 0.1.23

* Update packages.lock

* Change files
  • Loading branch information
JunielKatarn committed Jul 26, 2024
1 parent dd2cca9 commit ed947f1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Don't override Hermes platform for ARM64EC (#13490)",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion vnext/Desktop.DLL/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions vnext/Desktop/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"folly": {
"type": "Project",
"dependencies": {
"Fmt": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
}
},
"follywin32": {
Expand All @@ -87,4 +87,4 @@
"native,Version=v0.0/win-x64": {},
"native,Version=v0.0/win-x86": {}
}
}
}
3 changes: 1 addition & 2 deletions vnext/PropertySheets/JSEngine.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
<!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
<UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
<!-- 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 -->
<HermesVersion Condition="'$(HermesVersion)' == ''">0.1.21</HermesVersion>
<HermesVersion Condition="'$(HermesVersion)' == ''">0.1.23</HermesVersion>
<HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
<HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
<EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
<!-- Disable linking Hermes into the output in cases where we need to fully rely on HermesShim -->
<HermesNoLink Condition="'$(HermesNoLink)' == '' and '$(Configuration)' == 'Release' and '$(EnableHermesInspectorInReleaseFlavor)' != 'true'">true</HermesNoLink>
<!-- Use Hermes bytecode bundles provided by metro hermes compiler when available -->
<EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
<HermesPlatform Condition="'$(Platform)' == 'ARM64EC'">x64</HermesPlatform>

<UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
<V8Version Condition="'$(V8Version)' == ''">0.71.8</V8Version>
Expand Down

0 comments on commit ed947f1

Please sign in to comment.