[0.73] Port Desktop DLL to ARM64EC (#13478)

* Upgrade Desktop solution/projects to Win SDK 10.0.22621.0 (#13326) * /t:Vars - Log SolutionName * Remove OpenSSL from Desktop LIB and DLL * Port Desktop DLL to ARM64EC (#13320) * Upgrade WinSDK version for C/C++ projects Older SDK versions do not contain softintrin.h See http://www.emulators.com/docs/abc_arm64ec_explained.htm * Make V8Platform x64 for ARM64EC * Override HermesPlatform for ARM64EC * Override WinAppSDK platforms for ARM64EC * Skip React.Windows.IntegrationTests on ARM64EC * Add ARM64EC to StripAdditionalPlatformsFromNuspec.ps1 --------- Co-authored-by: Jon Thysell <jthysell@microsoft.com>
microsoft · Jul 20, 2024 · 0c34c3b · 0c34c3b
1 parent be4fbd8
commit 0c34c3b
Show file tree

Hide file tree

Showing 30 changed files with 312 additions and 49 deletions.
diff --git a/.ado/config/PoliCheckExclusions.xml b/.ado/config/PoliCheckExclusions.xml
@@ -8,7 +8,7 @@ NOTE: Use ALL CAPS for excluded terms below else it will silently ignore them. A
 <PoliCheckExclusions>
 	<!-- Each of these exclusions is a folder name -if \[name]\exists in the file path, it will be skipped -->
 	<Exclusion Type="FolderPathFull">
-		.GIT|ARM|ARM64|BUILD|DIST|GENERATED FILES|NODE_MODULES|OUTPUT|TARGET|X64|X86|PATCHES|LIB-COMMONJS
+		.GIT|ARM|ARM64|ARM64EC|BUILD|DIST|GENERATED FILES|NODE_MODULES|OUTPUT|TARGET|X64|X86|PATCHES|LIB-COMMONJS
 	</Exclusion>
 	<!-- Each of these exclusions is a folder name -if any folder or file starts with "\[name]", it will be skipped -->
 	<Exclusion Type="FolderPathStart">

diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml
@@ -23,12 +23,12 @@ parameters:
           - Name: X86Debug
             BuildConfiguration: Debug
             BuildPlatform: x86
-          - Name: Arm64Debug
+          - Name: ARM64ECDebug
             BuildConfiguration: Debug
-            BuildPlatform: ARM64
-          - Name: Arm64Release
+            BuildPlatform: ARM64EC
+          - Name: ARM64ECRelease
             BuildConfiguration: Release
-            BuildPlatform: ARM64
+            BuildPlatform: ARM64EC
           - Name: X86Release
             BuildConfiguration: Release
             BuildPlatform: x86
@@ -47,19 +47,19 @@ parameters:
           - Name: X86Debug
             BuildConfiguration: Debug
             BuildPlatform: x86
-          - Name: Arm64Debug
+          - Name: ARM64ECDebug
             BuildConfiguration: Debug
-            BuildPlatform: ARM64
-          - Name: Arm64Release
+            BuildPlatform: ARM64EC
+          - Name: ARM64ECRelease
             BuildConfiguration: Release
-            BuildPlatform: ARM64
+            BuildPlatform: ARM64EC
           - Name: X86Release
             BuildConfiguration: Release
             BuildPlatform: x86
-          - X86ReleaseFabric:
+          - Name: X86ReleaseFabric # Specifically built so binskim / tests get run on fabric
             BuildConfiguration: Release
             BuildPlatform: x86
-            UseFabric: true            
+            UseFabric: true
 
 jobs:
   - ${{ each config in parameters.buildMatrix }}:
@@ -137,7 +137,7 @@ jobs:
 
             - template: ../templates/discover-google-test-adapter.yml
 
-            - ${{ if ne(matrix.BuildPlatform, 'ARM64') }}:
+            - ${{ if ne(matrix.BuildPlatform, 'ARM64EC') }}:
               - task: VSTest@2
                 displayName: Run Desktop Unit Tests
                 timeoutInMinutes: 5 # Set smaller timeout , due to hangs
@@ -159,7 +159,7 @@ jobs:
                   failOnMinTestsNotRun: true
 
               # Suspected debug assert in TestRunner hanging tests randomly. Run only on Release for now.
-            - ${{ if and(eq(matrix.BuildConfiguration, 'Release'), ne(variables['Desktop.IntegrationTests.SkipRNTester'], true), ne(matrix.BuildPlatform, 'ARM64')) }}:
+            - ${{ if and(eq(matrix.BuildConfiguration, 'Release'), ne(variables['Desktop.IntegrationTests.SkipRNTester'], true), ne(matrix.BuildPlatform, 'ARM64EC')) }}:
               - task: PowerShell@2
                 displayName: Set up test servers
                 inputs:

diff --git a/.ado/jobs/nuget-desktop.yml b/.ado/jobs/nuget-desktop.yml
@@ -9,6 +9,7 @@ jobs:
     dependsOn:
       - DesktopX64Release
       - DesktopX86Debug
+      - DesktopARM64ECRelease
 
     pool: ${{ parameters.AgentPool.Small }}
     timeoutInMinutes: 30 # how long to run the job before automatically cancelling
@@ -31,3 +32,5 @@ jobs:
               configuration: Release
             - platform: x86
               configuration: Debug
+            - platform: ARM64EC
+              configuration: Release
diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -42,13 +42,13 @@ parameters:
       BuildConfiguration: Release
       BuildPlatform: x86
       UseFabric: false
-    - Name: ARM64Debug
+    - Name: ARM64ECDebug
       BuildConfiguration: Debug
-      BuildPlatform: ARM64
+      BuildPlatform: ARM64EC
       UseFabric: false
-    - Name: ARM64Release
+    - Name: ARM64ECRelease
       BuildConfiguration: Release
-      BuildPlatform: ARM64
+      BuildPlatform: ARM64EC
       UseFabric: false
     - Name: X64DebugFabric
       BuildConfiguration: Debug
@@ -110,7 +110,7 @@ jobs:
           persistCredentials: false # We're going to use rnbot's git creds to publish
 
       - powershell: gci env:/BUILD_*
-        displayName: Show build information  
+        displayName: Show build information
 
       - template: templates/prepare-js-env.yml
 
@@ -159,13 +159,13 @@ jobs:
         displayName: 📒 Generate Manifest Npm
         inputs:
           BuildDropPath: $(System.DefaultWorkingDirectory)
-    
+
       - task: PublishPipelineArtifact@1
         displayName: 📒 Publish Manifest Npm
         inputs:
           artifactName: SBom-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/_manifest
-    
+
       - template: templates/publish-version-vars.yml
 
   - ${{ each matrix in parameters.desktopBuildMatrix }}:
@@ -232,7 +232,7 @@ jobs:
           BuildPlatform: x86
         Arm64Debug:
           BuildConfiguration: Debug
-          BuildPlatform: ARM64          
+          BuildPlatform: ARM64
     pool: ${{ parameters.AgentPool.Large }}
 
     steps:
@@ -318,7 +318,7 @@ jobs:
             - platform: x86
               configuration: Release
             - platform: ARM64
-              configuration: Release  
+              configuration: Release
             - platform: x64
               configuration: Debug
             - platform: x86

diff --git a/.ado/templates/prepare-build-env.yml b/.ado/templates/prepare-build-env.yml
@@ -8,6 +8,7 @@ parameters:
     #  - x86
     #  - x64
     #  - ARM64
+    #  - ARM64EC
   - name: configuration
     type: string
     # Publish still using runtime matrix

diff --git a/change/react-native-windows-0f37d22b-b875-4d1e-a374-8dd312f6aaba.json b/change/react-native-windows-0f37d22b-b875-4d1e-a374-8dd312f6aaba.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Port Desktop DLL to ARM64EC (#13320)",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj
@@ -11,10 +11,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>

diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>

diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
@@ -5,6 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -13,6 +17,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -99,6 +107,12 @@
         WindowsApp_downlevel.lib;
         %(AdditionalDependencies)
       </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Platform)' == 'ARM64EC'">
+        %(AdditionalDependencies);
+        Bcrypt.lib;
+        Chakrart.lib;
+        Pathcch.lib
+      </AdditionalDependencies>
       <DelayLoadDLLs>Chakra.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <Link Condition="'$(UseFabric)' == 'true'">
@@ -116,6 +130,11 @@
       <ModuleDefinitionFile>react-native-win32.x64.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM64EC'">
+    <Link>
+      <ModuleDefinitionFile>react-native-win32.x64.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="('$(Platform)'=='Win32' OR '$(Platform)'=='x86')">
     <Link>
       <ModuleDefinitionFile>react-native-win32.x86.def</ModuleDefinitionFile>
@@ -155,7 +174,6 @@
   <ItemGroup>
     <PackageReference Include="boost" Version="1.76.0.0" />
     <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
-    <PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
     <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
   </ItemGroup>
   <Choose>
@@ -171,4 +189,4 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="GetTargetFileName" Returns="$(OutDir)$(TargetName).dll" />
-</Project>
+</Project>
diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>

diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>

diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj
@@ -7,10 +7,18 @@
     <EnableWinRtLeanAndMean>false</EnableWinRtLeanAndMean>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>

diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj
@@ -5,6 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -13,6 +17,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -275,7 +283,6 @@
     <PackageReference Include="boost" Version="1.76.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
-    <PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
     <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(UseWinUI3)'=='true'" />
   </ItemGroup>

diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets
@@ -21,4 +21,9 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
   </Target>
 
+  <PropertyGroup Label="WindowsAppSDKOverrides" Condition="'$(Platform)' == 'ARM64EC'">
+    <Ixp-Platform>win10-x64</Ixp-Platform>
+    <_WindowsAppSDKFoundationPlatform>x64</_WindowsAppSDKFoundationPlatform>
+    <_MrtCoreRuntimeIdentifier>x64</_MrtCoreRuntimeIdentifier>
+  </PropertyGroup>
 </Project>
diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj
@@ -17,6 +17,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
@@ -25,6 +29,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -279,7 +287,7 @@
       SourceUrl="https://github.com/facebook/folly/archive/v$(FollyVersion).zip"
       DestinationFileName="$(FollyZipFile)"
       DestinationFolder="$(FollyZipDir)"
-      Retries="10"/>
+      Retries="10" />
   </Target>
   <Target Name="UnzipFolly" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly">
     <Message Condition="!Exists('$(FollyDir)folly\dynamic.h')" Importance="High" Text="Unzipping folly to $([MSBuild]::NormalizePath($(FollyDir)..))." />