From 07310a5aa06a0a72fd0a85c8cf697e24e3681df9 Mon Sep 17 00:00:00 2001 From: Khalef Hosany Date: Tue, 16 Jul 2019 14:00:11 -0700 Subject: [PATCH 01/21] Adding Arm64 build --- .ado/publish.yml | 6 ++++++ vnext/ReactWin32.nuspec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.ado/publish.yml b/.ado/publish.yml index ebcdd1fa23e..8758fb64044 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -69,6 +69,9 @@ jobs: ArmDebug: BuildConfiguration: Debug BuildPlatform: arm + Arm64Debug: + BuildConfiguration: Debug + BuildPlatform: arm64 X64Release: BuildConfiguration: Release BuildPlatform: x64 @@ -78,6 +81,9 @@ jobs: ArmRelease: BuildConfiguration: Release BuildPlatform: arm + Arm64Release: + BuildConfiguration: Release + BuildPlatform: arm64 pool: name: OE Standard Pool demands: diff --git a/vnext/ReactWin32.nuspec b/vnext/ReactWin32.nuspec index 7e3a91ca12e..c47d6634200 100644 --- a/vnext/ReactWin32.nuspec +++ b/vnext/ReactWin32.nuspec @@ -14,8 +14,10 @@ + + From cbcf7e007b7a7a03ef11b5bbb086b6ac2482e8bf Mon Sep 17 00:00:00 2001 From: Khalef Hosany Date: Tue, 16 Jul 2019 14:12:10 -0700 Subject: [PATCH 02/21] Publish arm64 --- .../publish-build-artifacts-for-nuget.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml index a081d6cec23..68bf4a82d2c 100644 --- a/.ado/templates/publish-build-artifacts-for-nuget.yml +++ b/.ado/templates/publish-build-artifacts-for-nuget.yml @@ -14,6 +14,20 @@ steps: arguments: '-TargetRoot $(Build.ArtifactStagingDirectory)' enabled: false + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: debug arm64' + inputs: + PathtoPublish: 'vnext\target\ARM64\Debug' + ArtifactName: 'ReactWindows-debug-arm64' + condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Debug'), eq(variables['BuildPlatform'], 'arm64')) + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: ship arm64' + inputs: + PathtoPublish: 'vnext\target\ARM64\Release' + ArtifactName: 'ReactWindows-ship-arm64' + condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'), eq(variables['BuildPlatform'], 'arm64')) + - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: debug arm' inputs: From 92f7e6d6ddfdf429fe8fe5056b0cf683a939070c Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 16 Jul 2019 14:24:28 -0700 Subject: [PATCH 03/21] Add ARM64 property sheets. --- vnext/PropertySheets/ARM64.props | 13 +++++++++++++ vnext/PropertySheets/Application/ARM64.props | 13 +++++++++++++ vnext/PropertySheets/DynamicLibrary/ARM64.props | 13 +++++++++++++ vnext/PropertySheets/StaticLibrary/ARM64.props | 13 +++++++++++++ vnext/ReactWindows.sln | 4 ++++ 5 files changed, 56 insertions(+) create mode 100644 vnext/PropertySheets/ARM64.props create mode 100644 vnext/PropertySheets/Application/ARM64.props create mode 100644 vnext/PropertySheets/DynamicLibrary/ARM64.props create mode 100644 vnext/PropertySheets/StaticLibrary/ARM64.props diff --git a/vnext/PropertySheets/ARM64.props b/vnext/PropertySheets/ARM64.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/ARM64.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/Application/ARM64.props b/vnext/PropertySheets/Application/ARM64.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/Application/ARM64.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/DynamicLibrary/ARM64.props b/vnext/PropertySheets/DynamicLibrary/ARM64.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/DynamicLibrary/ARM64.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/StaticLibrary/ARM64.props b/vnext/PropertySheets/StaticLibrary/ARM64.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/StaticLibrary/ARM64.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/ReactWindows.sln b/vnext/ReactWindows.sln index 2acfa2c4683..ae58858f6c5 100644 --- a/vnext/ReactWindows.sln +++ b/vnext/ReactWindows.sln @@ -59,6 +59,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" ProjectSection(SolutionItems) = preProject PropertySheets\ARM.props = PropertySheets\ARM.props + PropertySheets\ARM64.props = PropertySheets\ARM64.props PropertySheets\Debug.props = PropertySheets\Debug.props PropertySheets\React.Cpp.props = PropertySheets\React.Cpp.props PropertySheets\Release.props = PropertySheets\Release.props @@ -71,6 +72,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibrary", "{43A78B84-278B-4B99-8887-4029D551173E}" ProjectSection(SolutionItems) = preProject PropertySheets\StaticLibrary\ARM.props = PropertySheets\StaticLibrary\ARM.props + PropertySheets\StaticLibrary\ARM64.props = PropertySheets\StaticLibrary\ARM64.props PropertySheets\StaticLibrary\Debug.props = PropertySheets\StaticLibrary\Debug.props PropertySheets\StaticLibrary\Release.props = PropertySheets\StaticLibrary\Release.props PropertySheets\StaticLibrary\Win32.props = PropertySheets\StaticLibrary\Win32.props @@ -81,6 +83,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{102E37B8-4BE5-4DC1-A650-16706EFB3306}" ProjectSection(SolutionItems) = preProject PropertySheets\Application\ARM.props = PropertySheets\Application\ARM.props + PropertySheets\Application\ARM64.props = PropertySheets\Application\ARM64.props PropertySheets\Application\Debug.props = PropertySheets\Application\Debug.props PropertySheets\Application\Release.props = PropertySheets\Application\Release.props PropertySheets\Application\Win32.props = PropertySheets\Application\Win32.props @@ -91,6 +94,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLibrary", "{2EB5E646-7EB4-4FED-B1A8-0AEEF2D32268}" ProjectSection(SolutionItems) = preProject PropertySheets\DynamicLibrary\ARM.props = PropertySheets\DynamicLibrary\ARM.props + PropertySheets\DynamicLibrary\ARM64.props = PropertySheets\DynamicLibrary\ARM64.props PropertySheets\DynamicLibrary\Debug.props = PropertySheets\DynamicLibrary\Debug.props PropertySheets\DynamicLibrary\Release.props = PropertySheets\DynamicLibrary\Release.props PropertySheets\DynamicLibrary\Win32.props = PropertySheets\DynamicLibrary\Win32.props From dbee3c0ed4043c760ed2af74b10d3ff0e9c1b7e3 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 16 Jul 2019 20:20:22 -0700 Subject: [PATCH 04/21] Add ARM64 ProjectConfiguration instances. --- .../React.Windows.Desktop.DLL.vcxproj | 16 +++ vnext/Desktop/React.Windows.Desktop.vcxproj | 16 +++ vnext/Folly/Folly.vcxproj | 16 ++- vnext/FollyWin32/FollyWin32.vcxproj | 16 +++ .../React.Windows.IntegrationTests.vcxproj | 8 +- vnext/ReactCommon/ReactCommon.vcxproj | 30 +++-- vnext/ReactCommon/ReactCommon.vcxproj.filters | 24 +--- vnext/ReactUWP/ReactUWP.vcxproj | 16 ++- vnext/ReactWindows.sln | 112 ++++++++++++++---- .../ReactWindowsCore/ReactWindowsCore.vcxproj | 16 ++- .../React.Windows.Universal.SampleApp.vcxproj | 16 ++- 11 files changed, 211 insertions(+), 75 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 3b561231a6f..c78ffb4faa7 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -1,6 +1,22 @@ + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index e7b5cca7f1c..6d87c93f2fb 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -1,6 +1,22 @@ + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index 4f2f6f01941..ec3590c21fd 100644 --- a/vnext/Folly/Folly.vcxproj +++ b/vnext/Folly/Folly.vcxproj @@ -5,14 +5,22 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + ARM64 + + + Release + ARM64 + + + Debug + x64 + Release x64 diff --git a/vnext/FollyWin32/FollyWin32.vcxproj b/vnext/FollyWin32/FollyWin32.vcxproj index 2de37ed0685..583a3f07700 100644 --- a/vnext/FollyWin32/FollyWin32.vcxproj +++ b/vnext/FollyWin32/FollyWin32.vcxproj @@ -1,6 +1,22 @@  + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index bdfe12babac..88779881d37 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -5,14 +5,14 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + x64 + Release x64 diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 27f4c5edd4c..6864d2c237d 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -5,14 +5,22 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + ARM64 + + + Release + ARM64 + + + Debug + x64 + Release x64 @@ -108,9 +116,9 @@ - - - + + + @@ -144,10 +152,10 @@ true - - - - + + + + diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters index d2cd7070c8b..7893e64b29b 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj.filters +++ b/vnext/ReactCommon/ReactCommon.vcxproj.filters @@ -93,15 +93,10 @@ yoga - - jsi - - - jsi - - - jsi - + + + + @@ -209,15 +204,8 @@ yoga - - jsi - - - jsi - - - jsi - + + diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index a3fae6d8e5f..38c05dc4761 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -5,14 +5,22 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + ARM64 + + + Release + ARM64 + + + Debug + x64 + Release x64 diff --git a/vnext/ReactWindows.sln b/vnext/ReactWindows.sln index ae58858f6c5..8e1a713bfd7 100644 --- a/vnext/ReactWindows.sln +++ b/vnext/ReactWindows.sln @@ -139,23 +139,31 @@ Global Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.ActiveCfg = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Build.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Deploy.0 = Debug|ARM + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.Build.0 = Debug|ARM64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.Deploy.0 = Debug|ARM64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.ActiveCfg = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Build.0 = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Deploy.0 = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.ActiveCfg = Debug|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Build.0 = Debug|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Deploy.0 = Debug|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.ActiveCfg = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Build.0 = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Deploy.0 = Release|ARM + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.ActiveCfg = Debug|ARM + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Build.0 = Debug|ARM + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Deploy.0 = Debug|ARM + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.ActiveCfg = Debug|ARM64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.Build.0 = Debug|ARM64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.Deploy.0 = Debug|ARM64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.ActiveCfg = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Build.0 = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Deploy.0 = Release|x64 @@ -164,122 +172,169 @@ Global {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Deploy.0 = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM + {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|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|ARM.ActiveCfg = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Debug|ARM64 {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 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.ActiveCfg = Debug|ARM {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.Build.0 = Debug|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM64.Build.0 = Debug|ARM64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.ActiveCfg = Debug|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.Build.0 = Debug|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.ActiveCfg = Debug|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.Build.0 = Debug|Win32 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.ActiveCfg = Release|ARM - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.Build.0 = Release|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.ActiveCfg = Debug|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.Build.0 = Debug|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM64.ActiveCfg = Debug|ARM64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM64.Build.0 = Debug|ARM64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.ActiveCfg = Release|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.Build.0 = Release|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.ActiveCfg = Release|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.Build.0 = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM + {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 {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|ARM.ActiveCfg = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Debug|ARM64 {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 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Debug|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Debug|ARM64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.ActiveCfg = Debug|Win32 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.ActiveCfg = Debug|ARM + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.Build.0 = Debug|ARM + {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|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.Build.0 = Debug|Win32 - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM.ActiveCfg = Release|Win32 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM.ActiveCfg = Debug|Win32 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64.ActiveCfg = Debug|ARM64 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64.Build.0 = Debug|ARM64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.ActiveCfg = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.Build.0 = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.Build.0 = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM.ActiveCfg = Debug|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM64.ActiveCfg = Debug|ARM64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.ActiveCfg = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.Build.0 = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.Build.0 = Debug|Win32 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM.ActiveCfg = Release|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM.ActiveCfg = Debug|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.ActiveCfg = Debug|ARM64 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.Build.0 = Debug|ARM64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.ActiveCfg = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.Build.0 = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.Build.0 = Release|Win32 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|ARM.ActiveCfg = Debug|Win32 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|x64.ActiveCfg = Debug|x64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|x86.ActiveCfg = Debug|Win32 - {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM.ActiveCfg = Release|Win32 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM.ActiveCfg = Debug|Win32 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.ActiveCfg = Debug|ARM64 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.Build.0 = Debug|ARM64 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.Deploy.0 = Debug|ARM64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|x64.ActiveCfg = Release|x64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|x86.ActiveCfg = Release|Win32 - {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.ActiveCfg = Debug|Win32 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.ActiveCfg = Debug|ARM + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.Build.0 = Debug|ARM + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64.Build.0 = Debug|ARM64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.ActiveCfg = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.Build.0 = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.Build.0 = Debug|Win32 - {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM.ActiveCfg = Release|Win32 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM.ActiveCfg = Debug|Win32 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64.ActiveCfg = Debug|ARM64 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64.Build.0 = Debug|ARM64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.ActiveCfg = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.Build.0 = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.Build.0 = Release|Win32 - {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM.ActiveCfg = Debug|Win32 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM.ActiveCfg = Debug|ARM + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM.Build.0 = Debug|ARM + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64.Build.0 = Debug|ARM64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.ActiveCfg = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.Build.0 = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.Build.0 = Debug|Win32 - {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM.ActiveCfg = Release|Win32 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM.ActiveCfg = Debug|Win32 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64.ActiveCfg = Debug|ARM64 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64.Build.0 = Debug|ARM64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.ActiveCfg = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.Build.0 = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.Build.0 = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM.ActiveCfg = Debug|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.ActiveCfg = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.Build.0 = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.Build.0 = Debug|Win32 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM.ActiveCfg = Release|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM.ActiveCfg = Debug|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.ActiveCfg = Debug|ARM64 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.Build.0 = Debug|ARM64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.ActiveCfg = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.Build.0 = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.Build.0 = Release|Win32 - {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Debug|ARM.ActiveCfg = Debug|Any CPU + {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Debug|ARM.ActiveCfg = Release|Any CPU + {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Debug|ARM64.ActiveCfg = Release|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Debug|x64.ActiveCfg = Debug|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Debug|x86.ActiveCfg = Debug|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|ARM.ActiveCfg = Release|Any CPU + {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|ARM64.ActiveCfg = Release|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|x64.ActiveCfg = Release|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|x86.ActiveCfg = Release|Any CPU {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|ARM.ActiveCfg = Debug|Win32 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|ARM64.ActiveCfg = Debug|ARM64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.ActiveCfg = Debug|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.Build.0 = Debug|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.Deploy.0 = Debug|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x86.ActiveCfg = Debug|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x86.Build.0 = Debug|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x86.Deploy.0 = Debug|Win32 - {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM.ActiveCfg = Release|Win32 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM.ActiveCfg = Debug|Win32 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.ActiveCfg = Debug|ARM64 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.Build.0 = Debug|ARM64 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.Deploy.0 = Debug|ARM64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.ActiveCfg = Release|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.Build.0 = Release|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.Deploy.0 = Release|x64 @@ -287,22 +342,27 @@ Global {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x86.Build.0 = Release|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x86.Deploy.0 = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.Build.0 = Debug|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.Build.0 = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.Build.0 = Debug|Win32 - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.ActiveCfg = Release|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.Build.0 = Release|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.ActiveCfg = Debug|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.Build.0 = Debug|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.ActiveCfg = Debug|ARM64 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.Build.0 = Debug|ARM64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.ActiveCfg = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.Build.0 = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM.ActiveCfg = Debug|x64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM64.ActiveCfg = Debug|ARM64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.Build.0 = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x86.ActiveCfg = Debug|x64 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM.ActiveCfg = Release|x64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM.ActiveCfg = Debug|x64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM64.ActiveCfg = Debug|ARM64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM64.Build.0 = Debug|ARM64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.Build.0 = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x86.ActiveCfg = Release|x64 diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index 5fc2923f0c7..bf836333222 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj @@ -5,14 +5,22 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + ARM64 + + + Release + ARM64 + + + Debug + x64 + Release x64 diff --git a/vnext/Universal.SampleApp/React.Windows.Universal.SampleApp.vcxproj b/vnext/Universal.SampleApp/React.Windows.Universal.SampleApp.vcxproj index 26b5699ee72..b391a5346f3 100644 --- a/vnext/Universal.SampleApp/React.Windows.Universal.SampleApp.vcxproj +++ b/vnext/Universal.SampleApp/React.Windows.Universal.SampleApp.vcxproj @@ -14,14 +14,22 @@ Debug ARM - - Debug - x64 - Release ARM + + Debug + ARM64 + + + Release + ARM64 + + + Debug + x64 + Release x64 From cf3f6e9be773374bceb0b124f05d9b8cbec1d33b Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 19 Jul 2019 13:49:06 -0700 Subject: [PATCH 05/21] Add ARM64 to NUSPEC. --- vnext/Scripts/OpenSSL.nuspec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vnext/Scripts/OpenSSL.nuspec b/vnext/Scripts/OpenSSL.nuspec index a79adfe2c41..f56654a98d6 100644 --- a/vnext/Scripts/OpenSSL.nuspec +++ b/vnext/Scripts/OpenSSL.nuspec @@ -22,5 +22,11 @@ + + + + + + From 3a35305e885d0faba3d2929f03bf9ded01f2269e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 19 Jul 2019 13:49:46 -0700 Subject: [PATCH 06/21] Don't use Boost/Beast intrinsics on ARM64. --- vnext/PropertySheets/ARM64.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vnext/PropertySheets/ARM64.props b/vnext/PropertySheets/ARM64.props index 08f0406be02..829d7ba7aef 100644 --- a/vnext/PropertySheets/ARM64.props +++ b/vnext/PropertySheets/ARM64.props @@ -8,6 +8,9 @@ + + BOOST_BEAST_NO_INTRINSICS;%(PreprocessorDefinitions) + From a859e064569990633373f0c2e954997dd2b86a93 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 19 Jul 2019 23:00:27 -0700 Subject: [PATCH 07/21] Prevent from importing. --- vnext/PropertySheets/ARM64.props | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vnext/PropertySheets/ARM64.props b/vnext/PropertySheets/ARM64.props index 829d7ba7aef..e2d1df85724 100644 --- a/vnext/PropertySheets/ARM64.props +++ b/vnext/PropertySheets/ARM64.props @@ -9,7 +9,12 @@ - BOOST_BEAST_NO_INTRINSICS;%(PreprocessorDefinitions) + + BOOST_BEAST_NO_INTRINSICS;BOOST_PREDEF_HARDWARE_SIMD_H;%(PreprocessorDefinitions) From d23500c5445b9305352f7120de41eb73bc53ccae Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 19 Jul 2019 23:20:49 -0700 Subject: [PATCH 08/21] Remove Universal Sample App from ARM64 build. --- vnext/ReactWindows.sln | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/vnext/ReactWindows.sln b/vnext/ReactWindows.sln index 8e1a713bfd7..16631d9f85e 100644 --- a/vnext/ReactWindows.sln +++ b/vnext/ReactWindows.sln @@ -150,8 +150,6 @@ Global {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Build.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Deploy.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.Build.0 = Debug|ARM64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM64.Deploy.0 = Debug|ARM64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.ActiveCfg = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Build.0 = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Deploy.0 = Debug|x64 @@ -162,8 +160,6 @@ Global {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Build.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Deploy.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.ActiveCfg = Debug|ARM64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.Build.0 = Debug|ARM64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM64.Deploy.0 = Debug|ARM64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.ActiveCfg = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Build.0 = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Deploy.0 = Release|x64 @@ -263,13 +259,11 @@ Global {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.Build.0 = Release|Win32 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|ARM.ActiveCfg = Debug|Win32 - {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|ARM64.ActiveCfg = Debug|Win32 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|x64.ActiveCfg = Debug|x64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Debug|x86.ActiveCfg = Debug|Win32 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM.ActiveCfg = Debug|Win32 - {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.ActiveCfg = Debug|ARM64 - {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.Build.0 = Debug|ARM64 - {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.Deploy.0 = Debug|ARM64 + {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|ARM64.ActiveCfg = Release|Win32 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|x64.ActiveCfg = Release|x64 {6F713CA6-6BFE-4DF8-932D-4E49745C967E}.Release|x86.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.ActiveCfg = Debug|ARM @@ -324,7 +318,7 @@ Global {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|x64.ActiveCfg = Release|Any CPU {956D7AE7-0C64-44A1-B5BC-0936B23A3A32}.Release|x86.ActiveCfg = Release|Any CPU {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|ARM.ActiveCfg = Debug|Win32 - {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|ARM64.ActiveCfg = Debug|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.ActiveCfg = Debug|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.Build.0 = Debug|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x64.Deploy.0 = Debug|x64 @@ -332,9 +326,7 @@ Global {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x86.Build.0 = Debug|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Debug|x86.Deploy.0 = Debug|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM.ActiveCfg = Debug|Win32 - {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.ActiveCfg = Debug|ARM64 - {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.Build.0 = Debug|ARM64 - {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.Deploy.0 = Debug|ARM64 + {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|ARM64.ActiveCfg = Release|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.ActiveCfg = Release|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.Build.0 = Release|x64 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x64.Deploy.0 = Release|x64 @@ -342,27 +334,25 @@ Global {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x86.Build.0 = Release|Win32 {069986C5-80F3-4A56-AF79-F24EBB05941F}.Release|x86.Deploy.0 = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.Build.0 = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.Build.0 = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.ActiveCfg = Debug|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.Build.0 = Debug|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.ActiveCfg = Debug|ARM64 - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.Build.0 = Debug|ARM64 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.ActiveCfg = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.Build.0 = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM.ActiveCfg = Debug|x64 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM64.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.Build.0 = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x86.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM.ActiveCfg = Debug|x64 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM64.ActiveCfg = Debug|ARM64 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM64.Build.0 = Debug|ARM64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM64.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.Build.0 = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x86.ActiveCfg = Release|x64 From 6bf89512f3374ad69a9dd9b5ab1f70e241eebdac Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 19 Jul 2019 23:28:03 -0700 Subject: [PATCH 09/21] Use CRLF for SLN files. --- vnext/.editorconfig | 2 +- vnext/ReactWindows.sln | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/vnext/.editorconfig b/vnext/.editorconfig index 23941a10138..bd2a5cf57bc 100644 --- a/vnext/.editorconfig +++ b/vnext/.editorconfig @@ -10,7 +10,7 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.{c,cpp,h,hpp}] +[*.{c,cpp,h,hpp,sln}] end_of_line = crlf # Xml project files diff --git a/vnext/ReactWindows.sln b/vnext/ReactWindows.sln index 16631d9f85e..301e53c4a15 100644 --- a/vnext/ReactWindows.sln +++ b/vnext/ReactWindows.sln @@ -246,14 +246,13 @@ Global {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.Build.0 = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM.ActiveCfg = Debug|Win32 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM64.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.ActiveCfg = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.Build.0 = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.Build.0 = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM.ActiveCfg = Debug|Win32 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.ActiveCfg = Debug|ARM64 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.Build.0 = Debug|ARM64 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.ActiveCfg = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.Build.0 = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 @@ -297,14 +296,13 @@ Global {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.Build.0 = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM.ActiveCfg = Debug|Win32 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM64.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.ActiveCfg = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.Build.0 = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.Build.0 = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM.ActiveCfg = Debug|Win32 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.ActiveCfg = Debug|ARM64 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.Build.0 = Debug|ARM64 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.ActiveCfg = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.Build.0 = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.ActiveCfg = Release|Win32 From 017dff2ece8cf983cdd953cbd50efd1ef9b90711 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Sat, 20 Jul 2019 00:28:36 -0700 Subject: [PATCH 10/21] Upgrade to ChakraCore.Debugger.0.0.0.37. --- vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 4 ++-- vnext/Desktop.DLL/packages.config | 2 +- .../React.Windows.Desktop.IntegrationTests.vcxproj | 4 ++-- vnext/Desktop.IntegrationTests/packages.config | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 4 ++-- vnext/Desktop/packages.config | 2 +- vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj | 6 +++--- vnext/JSI.Desktop.UnitTests/packages.config | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index d121b52c182..304b3b11960 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -137,7 +137,7 @@ - + @@ -147,7 +147,7 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 7499fdef125..9044f5e18e7 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -2,7 +2,7 @@ - + diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index b17af254631..193261ad4ab 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -109,7 +109,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/vnext/Desktop.IntegrationTests/packages.config b/vnext/Desktop.IntegrationTests/packages.config index 7499fdef125..9044f5e18e7 100644 --- a/vnext/Desktop.IntegrationTests/packages.config +++ b/vnext/Desktop.IntegrationTests/packages.config @@ -2,7 +2,7 @@ - + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 743f88bfcce..c9d700415cc 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -183,7 +183,7 @@ - + @@ -194,7 +194,7 @@ - + diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 43242c90884..419bce36ad5 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -2,7 +2,7 @@ - + diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 43f3aabb86e..fe2da68cee2 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -44,7 +44,7 @@ REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports --> REACTWINDOWS_BUILD;BOOST_ASIO_HAS_IOCP;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;REACTNATIVEWIN32_EXPORTS;FOLLY_NO_CONFIG;NOMINMAX;GLOG_NO_ABBREVIATED_SEVERITIES;_HAS_AUTO_PTR_ETC;CHAKRACORE;RN_EXPORT=;GTEST_LANG_CXX11;%(PreprocessorDefinitions) - + REACTWINDOWS_BUILD;BOOST_ASIO_HAS_IOCP;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;REACTNATIVEWIN32_EXPORTS;FOLLY_NO_CONFIG;NOMINMAX;GLOG_NO_ABBREVIATED_SEVERITIES;_HAS_AUTO_PTR_ETC;CHAKRACORE;RN_EXPORT=;GTEST_LANG_CXX11;%(PreprocessorDefinitions) -