[0.64] Add ARM64 support to React.Windows.Desktop.Test.DLL (#8765)

* Add ARM64 support to React.Windows.Desktop.Test.DLL * Change files * Add ARM64 support to React.Windows.Desktop.Test.DLL (#8762) * Add ARM64 support to React.Windows.Desktop.Test.DLL * Change files * Add solution entry * Update nuspec * Update DEF
microsoft · Oct 6, 2021 · 52156e9 · 52156e9
1 parent 8379699
commit 52156e9
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 6 deletions.
diff --git a/change/react-native-windows-f87fbf24-d6b4-4a78-9571-d7ae209a1942.json b/change/react-native-windows-f87fbf24-d6b4-4a78-9571-d7ae209a1942.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "[0.64] Add ARM64 support to React.Windows.Desktop.Test.DLL",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.ARM64.def b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.ARM64.def
@@ -0,0 +1,27 @@
+EXPORTS
+
+; Microsoft::React::Test::WebSocketServer
+??0WebSocketServer@Test@React@Microsoft@@QEAA@G_N@Z
+??0WebSocketServer@Test@React@Microsoft@@QEAA@H_N@Z
+?Accept@WebSocketServer@Test@React@Microsoft@@AEAAXXZ
+?OnAccept@WebSocketServer@Test@React@Microsoft@@AEAAXVerror_code@system@boost@@V?$basic_stream_socket@Vtcp@ip@asio@boost@@Vexecutor@34@@asio@7@@Z
+?SetMessageFactory@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6A?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@$$QEAV12@@Z@std@@@Z
+?SetOnConnection@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXXZ@std@@@Z
+?SetOnError@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AX$$QEAUError@IWebSocketResource@React@Microsoft@@@Z@std@@@Z
+?SetOnHandshake@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXAEAV?$message@$0A@U?$basic_string_body@DU?$char_traits@D@std@@V?$allocator@D@2@@http@beast@boost@@V?$basic_fields@V?$allocator@D@std@@@234@@http@beast@boost@@@Z@std@@@Z
+?SetOnMessage@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z@std@@@Z
+?Start@WebSocketServer@Test@React@Microsoft@@QEAAXXZ
+?Stop@WebSocketServer@Test@React@Microsoft@@QEAAXXZ
+
+; Microsoft::React::Test::HttpServer
+??0HttpServer@Test@React@Microsoft@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@G@Z
+??1HttpServer@Test@React@Microsoft@@QEAA@XZ
+?Accept@HttpServer@Test@React@Microsoft@@QEAAXXZ
+?OnAccept@HttpServer@Test@React@Microsoft@@AEAAXVerror_code@system@boost@@V?$basic_stream_socket@Vtcp@ip@asio@boost@@Vexecutor@34@@asio@7@@Z
+?SetOnGet@HttpServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6A?AV?$message@$0A@U?$basic_dynamic_body@V?$basic_multi_buffer@V?$allocator@D@std@@@beast@boost@@@http@beast@boost@@V?$basic_fields@V?$allocator@D@std@@@234@@http@beast@boost@@AEBV?$message@$00U?$basic_string_body@DU?$char_traits@D@std@@V?$allocator@D@2@@http@beast@boost@@V?$basic_fields@V?$allocator@D@std@@@234@@234@@Z@std@@@Z
+?SetOnResponseSent@HttpServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXXZ@std@@@Z
+?Start@HttpServer@Test@React@Microsoft@@QEAAXXZ
+?Stop@HttpServer@Test@React@Microsoft@@QEAAXXZ
+
+; Free functions
+?CreateStringResponseBody@Test@React@Microsoft@@YA?AV?$basic_multi_buffer@V?$allocator@D@std@@@beast@boost@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
@@ -18,6 +18,14 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}</ProjectGuid>

diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln
@@ -145,6 +145,20 @@ Global
 		{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|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|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|x64.ActiveCfg = Debug|x64
@@ -255,12 +269,14 @@ Global
 		{CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.Build.0 = Release|x64
 		{CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.ActiveCfg = Release|Win32
 		{CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.Build.0 = Release|Win32
-		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.ActiveCfg = Debug|Win32
+		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.Build.0 = Debug|ARM64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.ActiveCfg = Debug|x64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.Build.0 = Debug|x64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.ActiveCfg = Debug|Win32
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.Build.0 = Debug|Win32
-		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.ActiveCfg = Release|Win32
+		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.Build.0 = Release|ARM64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.ActiveCfg = Release|x64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64
 		{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32

diff --git a/vnext/Scripts/OfficeReact.Win32.nuspec b/vnext/Scripts/OfficeReact.Win32.nuspec
@@ -28,10 +28,12 @@
     <file src="$nugetroot$\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
     <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64"/>
 
-    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\x86"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\x64"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\x86"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\x64"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\debug\x86"    exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\debug\x64"    exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\ARM64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\ARM64"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\ship\x86"     exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\ship\x64"     exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\ARM64"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
 
     <file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
     <file src="$nugetroot$\inc\runtimeexecutor\ReactCommon\RuntimeExecutor.h" target="inc\ReactCommon"/>