Skip to content

ARM64 support for Universal #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
13 commits merged into from
Jan 22, 2020
Merged

ARM64 support for Universal #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8a27719
Added ARM64 property sheets.
JunielKatarn Jan 18, 2020
2d8d1ea
Added ARM64.props files to solution.
JunielKatarn Jan 18, 2020
b6d00f2
Added ARM64 variant to Universal projects.
JunielKatarn Jan 18, 2020
11386aa
Add ARM64 support in pipelines.
JunielKatarn Jan 18, 2020
a5eeb1d
Change files
JunielKatarn Jan 18, 2020
1d9146b
Enabled ARM64 for CLI template.
JunielKatarn Jan 21, 2020
0977655
Update current C# projects.
JunielKatarn Jan 21, 2020
54f2091
Set WebViewBridge min Win version to 10.0.16299.0.
JunielKatarn Jan 21, 2020
71c70ac
Disambiguate Threadpool class in TimingTests.
JunielKatarn Jan 21, 2020
013f4ec
Update Min Win version to 10.0.16299.0.
JunielKatarn Jan 21, 2020
df2ea99
Merge branch 'master' of github.com:microsoft/react-native-windows in…
JunielKatarn Jan 22, 2020
7a4d588
Revert current to master branch state.
JunielKatarn Jan 22, 2020
f0de25b
Skip ARM64 in current.
JunielKatarn Jan 22, 2020
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
8 changes: 7 additions & 1 deletion .ado/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ jobs:
ArmDebug:
BuildConfiguration: Debug
BuildPlatform: arm
Arm64Debug:
BuildConfiguration: Debug
BuildPlatform: arm64
X64Release:
BuildConfiguration: Release
BuildPlatform: x64
Expand All @@ -135,6 +138,9 @@ jobs:
ArmRelease:
BuildConfiguration: Release
BuildPlatform: arm
Arm64Release:
BuildConfiguration: Release
BuildPlatform: arm64
pool:
vmImage: $(VmImage)

Expand All @@ -152,7 +158,7 @@ jobs:
- template: templates/build-rnw.yml
parameters:
project: vnext/ReactWindows-Universal.sln
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64

- template: templates/publish-build-artifacts-for-nuget.yml
parameters:
Expand Down
13 changes: 9 additions & 4 deletions .ado/windows-vs-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,14 @@ jobs:
BuildConfiguration: Release
BuildPlatform: x86
UseRNFork: true
ArmRelease:
# Temporarily omitting to save disk space.
# ArmRelease:
# BuildConfiguration: Release
# BuildPlatform: arm
# UseRNFork: true
Arm64Release:
BuildConfiguration: Release
BuildPlatform: arm
BuildPlatform: arm64
UseRNFork: true
Comment thread
JunielKatarn marked this conversation as resolved.
PublicRNX86Debug:
BuildConfiguration: Debug
Expand All @@ -70,7 +75,7 @@ jobs:
useRnFork: $(UseRNFork)
yarnBuildCmd: build
project: vnext/ReactWindows-Universal.sln
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64

- template: templates/publish-build-artifacts-for-nuget.yml
parameters:
Expand Down Expand Up @@ -106,7 +111,7 @@ jobs:
- template: templates/prepare-env.yml
parameters:
useRnFork: $(UseRNFork)
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
yarnBuildCmd: build

- task: NuGetCommand@2
Expand Down
9 changes: 9 additions & 0 deletions change/react-native-windows-2020-01-17-18-03-33-arm64-uwp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"comment": "Added ARM64 variant to Universal projects.",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"commit": "11386aab48341e3c57029cbd6934349bff0b9595",
"dependentChangeType": "patch",
"date": "2020-01-18T02:03:33.212Z"
}
8 changes: 8 additions & 0 deletions vnext/Common/Common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
Comment thread
JunielKatarn marked this conversation as resolved.
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}</ProjectGuid>
Expand Down
16 changes: 12 additions & 4 deletions vnext/Folly/Folly.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,22 @@
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
Expand Down
8 changes: 8 additions & 0 deletions vnext/JSI/Universal/JSI.Universal.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
<Configuration>Release</Configuration>
<Platform>ARM</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>{A62D504A-16B8-41D2-9F19-E2E86019E5E4}</ProjectGuid>
Expand Down
22 changes: 15 additions & 7 deletions vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,30 @@
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
Expand Down
13 changes: 13 additions & 0 deletions vnext/PropertySheets/ARM64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="Globals">
</PropertyGroup>

<PropertyGroup Label="Configuration">
</PropertyGroup>

<ItemDefinitionGroup>
</ItemDefinitionGroup>

</Project>
13 changes: 13 additions & 0 deletions vnext/PropertySheets/Application/ARM64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="Globals">
</PropertyGroup>

<PropertyGroup Label="Configuration">
</PropertyGroup>

<ItemDefinitionGroup>
</ItemDefinitionGroup>

</Project>
13 changes: 13 additions & 0 deletions vnext/PropertySheets/DynamicLibrary/ARM64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="Globals">
</PropertyGroup>

<PropertyGroup Label="Configuration">
</PropertyGroup>

<ItemDefinitionGroup>
</ItemDefinitionGroup>

</Project>
13 changes: 13 additions & 0 deletions vnext/PropertySheets/StaticLibrary/ARM64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="Globals">
</PropertyGroup>

<PropertyGroup Label="Configuration">
</PropertyGroup>

<ItemDefinitionGroup>
</ItemDefinitionGroup>

</Project>
16 changes: 12 additions & 4 deletions vnext/ReactCommon/ReactCommon.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,22 @@
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
Expand Down
8 changes: 8 additions & 0 deletions vnext/ReactUWP/ReactUWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
Expand Down
Loading