From 8a2771937c057e7fcbbb3e78d1535aebc4b5d7e5 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 17 Jan 2020 17:26:55 -0800 Subject: [PATCH 01/12] Added 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 +++++++++++++ 4 files changed, 52 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 @@ + + + + + + + + + + + + + From 2d8d1ea5f2e349356283c87f6d0835f14f24b56e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 17 Jan 2020 17:28:49 -0800 Subject: [PATCH 02/12] Added ARM64.props files to solution. --- vnext/ReactWindows-Universal.sln | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 69af7ca6b07..5a6eb03a5e7 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -24,6 +24,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 @@ -36,6 +37,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 @@ -46,6 +48,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 @@ -56,6 +59,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 b6d00f2c28a72167dff8f25931393730381e9dc2 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 17 Jan 2020 17:46:13 -0800 Subject: [PATCH 03/12] Added ARM64 variant to Universal projects. --- vnext/Common/Common.vcxproj | 8 +++++ vnext/Folly/Folly.vcxproj | 16 ++++++--- vnext/JSI/Universal/JSI.Universal.vcxproj | 8 +++++ .../Microsoft.ReactNative.vcxproj | 22 ++++++++---- vnext/ReactCommon/ReactCommon.vcxproj | 16 ++++++--- vnext/ReactUWP/ReactUWP.vcxproj | 8 +++++ vnext/ReactWindows-Universal.sln | 34 +++++++++++++++++-- .../ReactWindowsCore/ReactWindowsCore.vcxproj | 16 ++++++--- 8 files changed, 107 insertions(+), 21 deletions(-) diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj index 83146d458ce..156bcac26d5 100644 --- a/vnext/Common/Common.vcxproj +++ b/vnext/Common/Common.vcxproj @@ -25,6 +25,14 @@ Release ARM + + Debug + ARM64 + + + Release + ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index fb188be872d..2ed33305649 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/JSI/Universal/JSI.Universal.vcxproj b/vnext/JSI/Universal/JSI.Universal.vcxproj index 5303a4928ec..66a844ab12b 100644 --- a/vnext/JSI/Universal/JSI.Universal.vcxproj +++ b/vnext/JSI/Universal/JSI.Universal.vcxproj @@ -25,6 +25,14 @@ Release ARM + + Debug + ARM64 + + + Release + ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4} diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 055339bb54f..697cc8c60c3 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -24,22 +24,30 @@ Debug ARM - - Debug - Win32 + + Release + ARM - + Debug - x64 + ARM64 - + Release - ARM + ARM64 + + + Debug + Win32 Release Win32 + + Debug + x64 + Release x64 diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index d15ef78d05e..6057678daca 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 diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 77b629307ba..bc9a57165d8 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -10,6 +10,14 @@ Release ARM + + Debug + ARM64 + + + Release + ARM64 + Debug x64 diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 5a6eb03a5e7..1425d30c087 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -110,58 +110,76 @@ Global Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM + 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 {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|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|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|ARM64.ActiveCfg = Release|ARM64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM64.Build.0 = Release|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|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|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|ARM64.ActiveCfg = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|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 @@ -212,36 +230,48 @@ Global {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index 9ef5c4250d9..a0a35ff3b17 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 From 11386aab48341e3c57029cbd6934349bff0b9595 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 17 Jan 2020 18:02:55 -0800 Subject: [PATCH 04/12] Add ARM64 support in pipelines. --- .ado/publish.yml | 8 +++++++- .ado/windows-vs-pr.yml | 12 ++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index 58ffc92a069..98b58255edc 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -126,6 +126,9 @@ jobs: ArmDebug: BuildConfiguration: Debug BuildPlatform: arm + Arm64Debug: + BuildConfiguration: Debug + BuildPlatform: arm64 X64Release: BuildConfiguration: Release BuildPlatform: x64 @@ -135,6 +138,9 @@ jobs: ArmRelease: BuildConfiguration: Release BuildPlatform: arm + Arm64Release: + BuildConfiguration: Release + BuildPlatform: arm64 pool: vmImage: $(VmImage) @@ -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: diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 3af8ebb365e..0a5ccd42725 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -51,6 +51,10 @@ jobs: BuildConfiguration: Release BuildPlatform: arm UseRNFork: true + Arm64Release: + BuildConfiguration: Release + BuildPlatform: arm64 + UseRNFork: true PublicRNX86Debug: BuildConfiguration: Debug BuildPlatform: x86 @@ -70,7 +74,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: @@ -106,7 +110,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 @@ -437,6 +441,10 @@ jobs: BuildConfiguration: Debug BuildPlatform: ARM UTTestOutputConfigDir: Debug + Arm64Debug: + BuildConfiguration: Debug + BuildPlatform: ARM64 + UTTestOutputConfigDir: Debug X86Debug: BuildConfiguration: Debug BuildPlatform: x86 From a5eeb1d3f1608eafd017d82912421c9aeb73a399 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 17 Jan 2020 18:03:33 -0800 Subject: [PATCH 05/12] Change files --- ...act-native-windows-2020-01-17-18-03-33-arm64-uwp.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 change/react-native-windows-2020-01-17-18-03-33-arm64-uwp.json diff --git a/change/react-native-windows-2020-01-17-18-03-33-arm64-uwp.json b/change/react-native-windows-2020-01-17-18-03-33-arm64-uwp.json new file mode 100644 index 00000000000..b72c137e6c7 --- /dev/null +++ b/change/react-native-windows-2020-01-17-18-03-33-arm64-uwp.json @@ -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" +} \ No newline at end of file From 1d9146bed18fd833cb60fb07d23d449ff7d30430 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 12:28:46 -0800 Subject: [PATCH 06/12] Enabled ARM64 for CLI template. --- .ado/windows-vs-pr.yml | 9 ++- current/ReactWindows/ReactNative.sln | 80 +++++++++++++++++++ .../templates/cpp/proj/MyApp.sln | 32 ++++++++ .../templates/cpp/proj/MyApp.vcxproj | 8 ++ .../templates/cs/proj/MyApp.csproj | 23 ++++++ .../templates/cs/proj/MyApp.sln | 32 ++++++++ 6 files changed, 180 insertions(+), 4 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 0a5ccd42725..d07b275ce5e 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -47,10 +47,11 @@ jobs: BuildConfiguration: Release BuildPlatform: x86 UseRNFork: true - ArmRelease: - BuildConfiguration: Release - BuildPlatform: arm - UseRNFork: true + # Temporarily omitting to save disk space. + # ArmRelease: + # BuildConfiguration: Release + # BuildPlatform: arm + # UseRNFork: true Arm64Release: BuildConfiguration: Release BuildPlatform: arm64 diff --git a/current/ReactWindows/ReactNative.sln b/current/ReactWindows/ReactNative.sln index d3d9ef60ebb..9bf5f1722cd 100644 --- a/current/ReactWindows/ReactNative.sln +++ b/current/ReactWindows/ReactNative.sln @@ -54,15 +54,19 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 DebugBundle|ARM = DebugBundle|ARM + DebugBundle|ARM64 = DebugBundle|ARM64 DebugBundle|x64 = DebugBundle|x64 DebugBundle|x86 = DebugBundle|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 ReleaseBundle|ARM = ReleaseBundle|ARM + ReleaseBundle|ARM64 = ReleaseBundle|ARM64 ReleaseBundle|x64 = ReleaseBundle|x64 ReleaseBundle|x86 = ReleaseBundle|x86 EndGlobalSection @@ -70,6 +74,9 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.ActiveCfg = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Build.0 = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Deploy.0 = Debug|ARM + {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.Build.0 = Debug|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.Deploy.0 = Debug|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.ActiveCfg = Debug|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.Build.0 = Debug|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.Deploy.0 = Debug|x64 @@ -79,6 +86,9 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.ActiveCfg = DebugBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.Build.0 = DebugBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.Deploy.0 = DebugBundle|ARM + {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.ActiveCfg = DebugBundle|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.Build.0 = DebugBundle|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.Deploy.0 = DebugBundle|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.Build.0 = DebugBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.Deploy.0 = DebugBundle|x64 @@ -88,6 +98,9 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.ActiveCfg = Release|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.Build.0 = Release|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.Deploy.0 = Release|ARM + {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.ActiveCfg = Release|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.Build.0 = Release|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.Deploy.0 = Release|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.ActiveCfg = Release|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.Build.0 = Release|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.Deploy.0 = Release|x64 @@ -97,6 +110,9 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.Deploy.0 = ReleaseBundle|ARM + {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.ActiveCfg = ReleaseBundle|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.Build.0 = ReleaseBundle|ARM64 + {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.Deploy.0 = ReleaseBundle|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.Deploy.0 = ReleaseBundle|x64 @@ -105,24 +121,32 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM.ActiveCfg = Debug|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM.Build.0 = Debug|ARM + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM64.Build.0 = Debug|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x64.ActiveCfg = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x64.Build.0 = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x86.ActiveCfg = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x86.Build.0 = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM.ActiveCfg = Debug|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM.Build.0 = Debug|ARM + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x64.ActiveCfg = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x64.Build.0 = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x86.ActiveCfg = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x86.Build.0 = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM.ActiveCfg = Release|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM.Build.0 = Release|ARM + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM64.ActiveCfg = Release|ARM64 + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM64.Build.0 = Release|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x64.ActiveCfg = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x64.Build.0 = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.ActiveCfg = Release|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.Build.0 = Release|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM.Build.0 = Release|ARM + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x64.ActiveCfg = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x64.Build.0 = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x86.ActiveCfg = Release|x86 @@ -130,6 +154,9 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.ActiveCfg = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Build.0 = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Deploy.0 = Debug|ARM + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.Build.0 = Debug|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.Deploy.0 = Debug|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.ActiveCfg = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.Build.0 = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.Deploy.0 = Debug|x64 @@ -139,6 +166,9 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.ActiveCfg = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.Build.0 = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.Deploy.0 = Debug|ARM + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.Build.0 = Debug|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.Deploy.0 = Debug|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.ActiveCfg = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.Build.0 = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.Deploy.0 = Debug|x64 @@ -157,6 +187,9 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.Build.0 = Release|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.Deploy.0 = Release|ARM + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 + {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.Deploy.0 = Release|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.ActiveCfg = Release|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.Build.0 = Release|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.Deploy.0 = Release|x64 @@ -165,87 +198,110 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x86.Deploy.0 = Release|x86 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM.ActiveCfg = Debug|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM.Build.0 = Debug|ARM + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM64.Build.0 = Debug|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x64.ActiveCfg = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x64.Build.0 = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x86.ActiveCfg = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x86.Build.0 = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM.ActiveCfg = Debug|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM.Build.0 = Debug|ARM + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x64.ActiveCfg = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x64.Build.0 = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x86.ActiveCfg = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x86.Build.0 = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM.ActiveCfg = Release|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM.Build.0 = Release|ARM + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM64.ActiveCfg = Release|ARM64 + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM64.Build.0 = Release|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x64.ActiveCfg = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x64.Build.0 = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x86.ActiveCfg = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x86.Build.0 = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM.Build.0 = Release|ARM + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x64.ActiveCfg = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x64.Build.0 = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x86.ActiveCfg = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x86.Build.0 = Release|Win32 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM.ActiveCfg = Debug|ARM + {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM64.ActiveCfg = Debug|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.ActiveCfg = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.Build.0 = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.ActiveCfg = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.Build.0 = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM.ActiveCfg = Release|ARM + {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.ActiveCfg = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.Build.0 = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.ActiveCfg = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.Build.0 = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM.ActiveCfg = Release|ARM + {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.ActiveCfg = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.Build.0 = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.ActiveCfg = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.Build.0 = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM.ActiveCfg = Release|ARM + {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.ActiveCfg = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.Build.0 = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x86.ActiveCfg = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x86.Build.0 = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|ARM.ActiveCfg = Debug|ARM + {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|ARM64.ActiveCfg = Debug|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x64.ActiveCfg = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x64.Build.0 = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x86.ActiveCfg = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x86.Build.0 = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x64.ActiveCfg = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x64.Build.0 = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x86.ActiveCfg = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x86.Build.0 = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|ARM.ActiveCfg = Release|ARM + {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|ARM64.ActiveCfg = Release|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x64.ActiveCfg = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x64.Build.0 = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x86.ActiveCfg = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x86.Build.0 = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|ARM.ActiveCfg = Release|ARM + {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x64.ActiveCfg = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x64.Build.0 = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x86.ActiveCfg = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x86.Build.0 = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM.ActiveCfg = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM64.ActiveCfg = Debug|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.ActiveCfg = Debug|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.Build.0 = Debug|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.ActiveCfg = Debug|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.Build.0 = Debug|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.ActiveCfg = Debug|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.Build.0 = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.Build.0 = DebugBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.ActiveCfg = DebugBundle|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.Build.0 = DebugBundle|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.ActiveCfg = Release|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.Build.0 = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM64.ActiveCfg = Release|ARM64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM64.Build.0 = Release|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.ActiveCfg = Release|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.Build.0 = Release|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.ActiveCfg = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.Build.0 = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.Build.0 = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|x86 @@ -253,72 +309,96 @@ Global {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM.ActiveCfg = Debug|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM.Build.0 = Debug|ARM + {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM64.Build.0 = Debug|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x64.ActiveCfg = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x64.Build.0 = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x86.ActiveCfg = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x86.Build.0 = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM.ActiveCfg = Debug|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM.Build.0 = Debug|ARM + {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x64.ActiveCfg = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x64.Build.0 = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x86.ActiveCfg = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x86.Build.0 = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM.ActiveCfg = Release|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM.Build.0 = Release|ARM + {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM64.ActiveCfg = Release|ARM64 + {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM64.Build.0 = Release|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x64.ActiveCfg = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x64.Build.0 = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x86.ActiveCfg = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x86.Build.0 = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM.Build.0 = Release|ARM + {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x64.ActiveCfg = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x64.Build.0 = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.ActiveCfg = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.Build.0 = Release|x86 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.ActiveCfg = Debug|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.Build.0 = Debug|ARM + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM64.Build.0 = Debug|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.ActiveCfg = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.Build.0 = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.ActiveCfg = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.Build.0 = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.ActiveCfg = Debug|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.Build.0 = Debug|ARM + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.ActiveCfg = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.Build.0 = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.ActiveCfg = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.Build.0 = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.ActiveCfg = Release|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.Build.0 = Release|ARM + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM64.ActiveCfg = Release|ARM64 + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM64.Build.0 = Release|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.ActiveCfg = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.Build.0 = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.ActiveCfg = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.Build.0 = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.Build.0 = Release|ARM + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.ActiveCfg = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.Build.0 = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.ActiveCfg = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.Build.0 = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM64.Build.0 = Debug|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM.Build.0 = Debug|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x64.ActiveCfg = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x64.Build.0 = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM64.ActiveCfg = Release|ARM64 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM64.Build.0 = Release|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM.Build.0 = Release|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x86.ActiveCfg = Release|Win32 diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln index e9ac1ef06fb..f6f8915ed8a 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln @@ -53,9 +53,11 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection @@ -63,6 +65,9 @@ Global {<%=projectGuidUpper%>}.Debug|ARM.ActiveCfg = Debug|ARM {<%=projectGuidUpper%>}.Debug|ARM.Build.0 = Debug|ARM {<%=projectGuidUpper%>}.Debug|ARM.Deploy.0 = Debug|ARM + {<%=projectGuidUpper%>}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {<%=projectGuidUpper%>}.Debug|ARM64.Build.0 = Debug|ARM64 + {<%=projectGuidUpper%>}.Debug|ARM64.Deploy.0 = Debug|ARM64 {<%=projectGuidUpper%>}.Debug|x64.ActiveCfg = Debug|x64 {<%=projectGuidUpper%>}.Debug|x64.Build.0 = Debug|x64 {<%=projectGuidUpper%>}.Debug|x64.Deploy.0 = Debug|x64 @@ -72,6 +77,9 @@ Global {<%=projectGuidUpper%>}.Release|ARM.ActiveCfg = Release|ARM {<%=projectGuidUpper%>}.Release|ARM.Build.0 = Release|ARM {<%=projectGuidUpper%>}.Release|ARM.Deploy.0 = Release|ARM + {<%=projectGuidUpper%>}.Release|ARM64.ActiveCfg = Release|ARM64 + {<%=projectGuidUpper%>}.Release|ARM64.Build.0 = Release|ARM64 + {<%=projectGuidUpper%>}.Release|ARM64.Deploy.0 = Release|ARM64 {<%=projectGuidUpper%>}.Release|x64.ActiveCfg = Release|x64 {<%=projectGuidUpper%>}.Release|x64.Build.0 = Release|x64 {<%=projectGuidUpper%>}.Release|x64.Deploy.0 = Release|x64 @@ -80,72 +88,96 @@ Global {<%=projectGuidUpper%>}.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|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|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 {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|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|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|ARM64.ActiveCfg = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|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 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index 28458fdb7c5..cb66797db55 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -25,6 +25,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -37,6 +41,10 @@ Release ARM + + Release + ARM64 + Release Win32 diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj index 421b67c1443..72846308178 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj @@ -70,6 +70,29 @@ true true + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + true bin\x64\Debug\ diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln index e6a31a68c5a..2326f71fe61 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln @@ -50,9 +50,11 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection @@ -60,6 +62,9 @@ Global {<%=projectGuidUpper%>}.Debug|ARM.ActiveCfg = Debug|ARM {<%=projectGuidUpper%>}.Debug|ARM.Build.0 = Debug|ARM {<%=projectGuidUpper%>}.Debug|ARM.Deploy.0 = Debug|ARM + {<%=projectGuidUpper%>}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {<%=projectGuidUpper%>}.Debug|ARM64.Build.0 = Debug|ARM64 + {<%=projectGuidUpper%>}.Debug|ARM64.Deploy.0 = Debug|ARM64 {<%=projectGuidUpper%>}.Debug|x64.ActiveCfg = Debug|x64 {<%=projectGuidUpper%>}.Debug|x64.Build.0 = Debug|x64 {<%=projectGuidUpper%>}.Debug|x64.Deploy.0 = Debug|x64 @@ -69,6 +74,9 @@ Global {<%=projectGuidUpper%>}.Release|ARM.ActiveCfg = Release|ARM {<%=projectGuidUpper%>}.Release|ARM.Build.0 = Release|ARM {<%=projectGuidUpper%>}.Release|ARM.Deploy.0 = Release|ARM + {<%=projectGuidUpper%>}.Release|ARM64.ActiveCfg = Release|ARM64 + {<%=projectGuidUpper%>}.Release|ARM64.Build.0 = Release|ARM64 + {<%=projectGuidUpper%>}.Release|ARM64.Deploy.0 = Release|ARM64 {<%=projectGuidUpper%>}.Release|x64.ActiveCfg = Release|x64 {<%=projectGuidUpper%>}.Release|x64.Build.0 = Release|x64 {<%=projectGuidUpper%>}.Release|x64.Deploy.0 = Release|x64 @@ -77,72 +85,96 @@ Global {<%=projectGuidUpper%>}.Release|x86.Deploy.0 = Release|x86 {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|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|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 {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|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|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|ARM64.ActiveCfg = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|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 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 From 09776557b31cc5a5c0034d368a067b7d594512c0 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 13:17:30 -0800 Subject: [PATCH 07/12] Update current C# projects. --- .../ChakraBridge/ChakraBridge.vcxproj | 63 +++++++++++++++++++ .../Playground.Net46/Playground.Net46.csproj | 27 ++++++++ .../ReactWindows/Playground/Playground.csproj | 50 +++++++++++++++ .../ReactNative.Net46.Tests.csproj | 22 +++++++ .../ReactNative.Net46.csproj | 14 +++++ .../ReactNative.Tests.csproj | 23 +++++++ .../ReactNative/ReactNative.csproj | 24 +++++++ .../ReactNativeWebViewBridge.csproj | 22 +++++++ 8 files changed, 245 insertions(+) diff --git a/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj b/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj index a1552f51a11..3a19f432784 100644 --- a/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj +++ b/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -49,6 +57,11 @@ true v141 + + DynamicLibrary + true + v141 + DynamicLibrary true @@ -66,6 +79,12 @@ true v141 + + DynamicLibrary + false + true + v141 + DynamicLibrary false @@ -89,6 +108,12 @@ + + + + + + @@ -109,6 +134,12 @@ false + + false + + + false + false @@ -175,6 +206,36 @@ false + + + Use + _WINRT_DLL;USE_EDGEMODE_JSRT;%(PreprocessorDefinitions) + pch.h + $(IntDir)pch.pch + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) + /bigobj %(AdditionalOptions) + 28204 + + + Console + false + + + + + Use + _WINRT_DLL;USE_EDGEMODE_JSRT;NDEBUG;%(PreprocessorDefinitions) + pch.h + $(IntDir)pch.pch + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) + /bigobj %(AdditionalOptions) + 28204 + + + Console + false + + Use @@ -228,6 +289,8 @@ Create Create Create + Create + Create Create Create diff --git a/current/ReactWindows/Playground.Net46/Playground.Net46.csproj b/current/ReactWindows/Playground.Net46/Playground.Net46.csproj index e81ee0586d5..2a1e379d084 100644 --- a/current/ReactWindows/Playground.Net46/Playground.Net46.csproj +++ b/current/ReactWindows/Playground.Net46/Playground.Net46.csproj @@ -76,6 +76,17 @@ + + ARM64 + bin\ARM64\Debug\ + DEBUG + + + ARM64 + bin\ARM64\Release\ + + + bin\x86\ReleaseBundle\ TRACE;NET46;BUNDLE @@ -102,6 +113,13 @@ MinimumRecommendedRules.ruleset true + + bin\ARM64\ReleaseBundle\ + TRACE;NET46;BUNDLE + ARM64 + MinimumRecommendedRules.ruleset + true + true bin\x86\DebugBundle\ @@ -130,6 +148,15 @@ MinimumRecommendedRules.ruleset true + + true + bin\ARM64\DebugBundle\ + TRACE;DEBUG;NET46;BUNDLE + DEBUG + ARM64 + MinimumRecommendedRules.ruleset + true + $(SolutionDir)\packages\Facebook.Yoga.1.5.0-pre1\lib\net45\Facebook.Yoga.dll diff --git a/current/ReactWindows/Playground/Playground.csproj b/current/ReactWindows/Playground/Playground.csproj index 7192bd33f1e..e4b78aac907 100644 --- a/current/ReactWindows/Playground/Playground.csproj +++ b/current/ReactWindows/Playground/Playground.csproj @@ -72,6 +72,29 @@ true false + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + false + true bin\x64\Debug\ @@ -123,6 +146,20 @@ true true + + bin\ARM64\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE + true + ;2008 + true + pdbonly + ARM64 + false + prompt + MinimumRecommendedRules.ruleset + true + true + bin\x64\ReleaseBundle\ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE @@ -163,6 +200,19 @@ MinimumRecommendedRules.ruleset true + + true + bin\ARM64\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE + ;2008 + true + full + ARM64 + false + prompt + MinimumRecommendedRules.ruleset + true + true bin\x64\DebugBundle\ diff --git a/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj b/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj index 364fa5de9fa..11f2b83d027 100644 --- a/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj +++ b/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj @@ -78,6 +78,28 @@ bin\ARM\Release\ ARM + + true + full + false + DEBUG; + prompt + 4 + false + true + bin\ARM64\Debug\ + ARM64 + + + true + full + prompt + 4 + false + true + bin\ARM64\Release\ + ARM64 + $(SolutionDir)\packages\Facebook.Yoga.1.5.0-pre1\lib\net45\Facebook.Yoga.dll diff --git a/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj b/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj index ba4096c6d79..b67bf9afa6c 100644 --- a/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj +++ b/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj @@ -59,6 +59,20 @@ + + ARM64 + bin\ARM64\Debug\ + bin\ARM64\Debug\ReactNative.Net46.XML + DEBUG + pdbonly + + + ARM64 + bin\ARM64\Release\ + bin\ARM64\Release\ReactNative.Net46.XML + + + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj index ff85d2e0c3e..b0225033ce7 100644 --- a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj +++ b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj @@ -73,6 +73,29 @@ true true + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + true bin\x64\Debug\ diff --git a/current/ReactWindows/ReactNative/ReactNative.csproj b/current/ReactWindows/ReactNative/ReactNative.csproj index 064fd219709..939d7e97586 100644 --- a/current/ReactWindows/ReactNative/ReactNative.csproj +++ b/current/ReactWindows/ReactNative/ReactNative.csproj @@ -65,6 +65,30 @@ prompt bin\ARM\Release\ReactNative.XML + + ARM64 + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINDOWS_UWP_ARM64 + ;2008 + full + ARM64 + false + prompt + bin\ARM64\Debug\ReactNative.XML + + + ARM64 + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP;CREATE_LAYOUT_THREAD;WINDOWS_UWP_ARM64 + true + ;2008 + pdbonly + ARM64 + false + prompt + bin\ARM64\Release\ReactNative.XML + x64 true diff --git a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj index 40af13754e8..a161997d5ba 100644 --- a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj +++ b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj @@ -62,6 +62,28 @@ false prompt + + ARM64 + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + + + ARM64 + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + x64 true From 54f2091ccb4afdbbd89c1f2126d3a7d2e6028aa7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 14:07:01 -0800 Subject: [PATCH 08/12] Set WebViewBridge min Win version to 10.0.16299.0. ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj --- .../ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj index a161997d5ba..be41d7587e8 100644 --- a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj +++ b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.14393.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} From 71c70ac14dbbc50eee5ee806e1b141ad9ace057a Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 14:38:11 -0800 Subject: [PATCH 09/12] Disambiguate Threadpool class in TimingTests. --- .../ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs b/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs index 1307d51897c..fc4895710c7 100644 --- a/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs +++ b/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs @@ -154,7 +154,7 @@ public async Task Timing_Repeat() ids.AddRange((IList)args[0]); if (countdown.CurrentCount > 0) { - var t = ThreadPool.RunAsync(_ => countdown.Signal()); + var t = Windows.System.Threading.ThreadPool.RunAsync(_ => countdown.Signal()); } })); From 013f4ec5a95bc7b123af434ed1f8a215380cb20a Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 14:38:55 -0800 Subject: [PATCH 10/12] Update Min Win version to 10.0.16299.0. --- current/ReactWindows/Playground/Playground.csproj | 2 +- .../ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj | 3 ++- current/ReactWindows/ReactNative/ReactNative.csproj | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/current/ReactWindows/Playground/Playground.csproj b/current/ReactWindows/Playground/Playground.csproj index e4b78aac907..3da0bf23382 100644 --- a/current/ReactWindows/Playground/Playground.csproj +++ b/current/ReactWindows/Playground/Playground.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.14393.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj index b0225033ce7..16ea595a1a3 100644 --- a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj +++ b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj @@ -12,7 +12,8 @@ en-US UAP 10.0.18362.0 - 10.0.14393.0 + 10.0.16299.0 + win10-x64;win10-x86;win10-arm;win10-arm64 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/current/ReactWindows/ReactNative/ReactNative.csproj b/current/ReactWindows/ReactNative/ReactNative.csproj index 939d7e97586..8a4d1abf591 100644 --- a/current/ReactWindows/ReactNative/ReactNative.csproj +++ b/current/ReactWindows/ReactNative/ReactNative.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.14393.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} From 7a4d588768c8164f049e646ebf7ee0a5d7e12203 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 16:35:43 -0800 Subject: [PATCH 11/12] Revert current to master branch state. --- .../ChakraBridge/ChakraBridge.vcxproj | 63 --------------- .../Playground.Net46/Playground.Net46.csproj | 27 ------- .../ReactWindows/Playground/Playground.csproj | 52 +----------- .../ReactNative.Net46.Tests.csproj | 22 ----- .../ReactNative.Net46.csproj | 14 ---- .../Modules/Core/TimingTests.cs | 2 +- .../ReactNative.Tests.csproj | 26 +----- current/ReactWindows/ReactNative.sln | 80 ------------------- .../ReactNative/ReactNative.csproj | 26 +----- .../ReactNativeWebViewBridge.csproj | 24 +----- 10 files changed, 5 insertions(+), 331 deletions(-) diff --git a/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj b/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj index 3a19f432784..a1552f51a11 100644 --- a/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj +++ b/current/ReactWindows/ChakraBridge/ChakraBridge.vcxproj @@ -5,10 +5,6 @@ Debug ARM - - Debug - ARM64 - Debug Win32 @@ -21,10 +17,6 @@ Release ARM - - Release - ARM64 - Release Win32 @@ -57,11 +49,6 @@ true v141 - - DynamicLibrary - true - v141 - DynamicLibrary true @@ -79,12 +66,6 @@ true v141 - - DynamicLibrary - false - true - v141 - DynamicLibrary false @@ -108,12 +89,6 @@ - - - - - - @@ -134,12 +109,6 @@ false - - false - - - false - false @@ -206,36 +175,6 @@ false - - - Use - _WINRT_DLL;USE_EDGEMODE_JSRT;%(PreprocessorDefinitions) - pch.h - $(IntDir)pch.pch - $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj %(AdditionalOptions) - 28204 - - - Console - false - - - - - Use - _WINRT_DLL;USE_EDGEMODE_JSRT;NDEBUG;%(PreprocessorDefinitions) - pch.h - $(IntDir)pch.pch - $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj %(AdditionalOptions) - 28204 - - - Console - false - - Use @@ -289,8 +228,6 @@ Create Create Create - Create - Create Create Create diff --git a/current/ReactWindows/Playground.Net46/Playground.Net46.csproj b/current/ReactWindows/Playground.Net46/Playground.Net46.csproj index 2a1e379d084..e81ee0586d5 100644 --- a/current/ReactWindows/Playground.Net46/Playground.Net46.csproj +++ b/current/ReactWindows/Playground.Net46/Playground.Net46.csproj @@ -76,17 +76,6 @@ - - ARM64 - bin\ARM64\Debug\ - DEBUG - - - ARM64 - bin\ARM64\Release\ - - - bin\x86\ReleaseBundle\ TRACE;NET46;BUNDLE @@ -113,13 +102,6 @@ MinimumRecommendedRules.ruleset true - - bin\ARM64\ReleaseBundle\ - TRACE;NET46;BUNDLE - ARM64 - MinimumRecommendedRules.ruleset - true - true bin\x86\DebugBundle\ @@ -148,15 +130,6 @@ MinimumRecommendedRules.ruleset true - - true - bin\ARM64\DebugBundle\ - TRACE;DEBUG;NET46;BUNDLE - DEBUG - ARM64 - MinimumRecommendedRules.ruleset - true - $(SolutionDir)\packages\Facebook.Yoga.1.5.0-pre1\lib\net45\Facebook.Yoga.dll diff --git a/current/ReactWindows/Playground/Playground.csproj b/current/ReactWindows/Playground/Playground.csproj index 3da0bf23382..7192bd33f1e 100644 --- a/current/ReactWindows/Playground/Playground.csproj +++ b/current/ReactWindows/Playground/Playground.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.16299.0 + 10.0.14393.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -72,29 +72,6 @@ true false - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - false - true bin\x64\Debug\ @@ -146,20 +123,6 @@ true true - - bin\ARM64\ReleaseBundle\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE - true - ;2008 - true - pdbonly - ARM64 - false - prompt - MinimumRecommendedRules.ruleset - true - true - bin\x64\ReleaseBundle\ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE @@ -200,19 +163,6 @@ MinimumRecommendedRules.ruleset true - - true - bin\ARM64\DebugBundle\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;BUNDLE - ;2008 - true - full - ARM64 - false - prompt - MinimumRecommendedRules.ruleset - true - true bin\x64\DebugBundle\ diff --git a/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj b/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj index 11f2b83d027..364fa5de9fa 100644 --- a/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj +++ b/current/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj @@ -78,28 +78,6 @@ bin\ARM\Release\ ARM - - true - full - false - DEBUG; - prompt - 4 - false - true - bin\ARM64\Debug\ - ARM64 - - - true - full - prompt - 4 - false - true - bin\ARM64\Release\ - ARM64 - $(SolutionDir)\packages\Facebook.Yoga.1.5.0-pre1\lib\net45\Facebook.Yoga.dll diff --git a/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj b/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj index b67bf9afa6c..ba4096c6d79 100644 --- a/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj +++ b/current/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj @@ -59,20 +59,6 @@ - - ARM64 - bin\ARM64\Debug\ - bin\ARM64\Debug\ReactNative.Net46.XML - DEBUG - pdbonly - - - ARM64 - bin\ARM64\Release\ - bin\ARM64\Release\ReactNative.Net46.XML - - - $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs b/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs index fc4895710c7..1307d51897c 100644 --- a/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs +++ b/current/ReactWindows/ReactNative.Tests/Modules/Core/TimingTests.cs @@ -154,7 +154,7 @@ public async Task Timing_Repeat() ids.AddRange((IList)args[0]); if (countdown.CurrentCount > 0) { - var t = Windows.System.Threading.ThreadPool.RunAsync(_ => countdown.Signal()); + var t = ThreadPool.RunAsync(_ => countdown.Signal()); } })); diff --git a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj index 16ea595a1a3..ff85d2e0c3e 100644 --- a/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj +++ b/current/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj @@ -12,8 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.16299.0 - win10-x64;win10-x86;win10-arm;win10-arm64 + 10.0.14393.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -74,29 +73,6 @@ true true - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - true - true bin\x64\Debug\ diff --git a/current/ReactWindows/ReactNative.sln b/current/ReactWindows/ReactNative.sln index 9bf5f1722cd..d3d9ef60ebb 100644 --- a/current/ReactWindows/ReactNative.sln +++ b/current/ReactWindows/ReactNative.sln @@ -54,19 +54,15 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 DebugBundle|ARM = DebugBundle|ARM - DebugBundle|ARM64 = DebugBundle|ARM64 DebugBundle|x64 = DebugBundle|x64 DebugBundle|x86 = DebugBundle|x86 Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 ReleaseBundle|ARM = ReleaseBundle|ARM - ReleaseBundle|ARM64 = ReleaseBundle|ARM64 ReleaseBundle|x64 = ReleaseBundle|x64 ReleaseBundle|x86 = ReleaseBundle|x86 EndGlobalSection @@ -74,9 +70,6 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.ActiveCfg = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Build.0 = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Deploy.0 = Debug|ARM - {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.Build.0 = Debug|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM64.Deploy.0 = Debug|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.ActiveCfg = Debug|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.Build.0 = Debug|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|x64.Deploy.0 = Debug|x64 @@ -86,9 +79,6 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.ActiveCfg = DebugBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.Build.0 = DebugBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM.Deploy.0 = DebugBundle|ARM - {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.ActiveCfg = DebugBundle|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.Build.0 = DebugBundle|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|ARM64.Deploy.0 = DebugBundle|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.Build.0 = DebugBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.DebugBundle|x64.Deploy.0 = DebugBundle|x64 @@ -98,9 +88,6 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.ActiveCfg = Release|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.Build.0 = Release|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM.Deploy.0 = Release|ARM - {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.ActiveCfg = Release|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.Build.0 = Release|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.Release|ARM64.Deploy.0 = Release|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.ActiveCfg = Release|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.Build.0 = Release|x64 {D52267B5-396F-424A-BB26-C9E750032846}.Release|x64.Deploy.0 = Release|x64 @@ -110,9 +97,6 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM.Deploy.0 = ReleaseBundle|ARM - {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.ActiveCfg = ReleaseBundle|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.Build.0 = ReleaseBundle|ARM64 - {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|ARM64.Deploy.0 = ReleaseBundle|ARM64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x64.Deploy.0 = ReleaseBundle|x64 @@ -121,32 +105,24 @@ Global {D52267B5-396F-424A-BB26-C9E750032846}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM.ActiveCfg = Debug|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM.Build.0 = Debug|ARM - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|ARM64.Build.0 = Debug|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x64.ActiveCfg = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x64.Build.0 = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x86.ActiveCfg = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Debug|x86.Build.0 = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM.ActiveCfg = Debug|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM.Build.0 = Debug|ARM - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x64.ActiveCfg = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x64.Build.0 = Debug|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x86.ActiveCfg = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.DebugBundle|x86.Build.0 = Debug|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM.ActiveCfg = Release|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM.Build.0 = Release|ARM - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM64.ActiveCfg = Release|ARM64 - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|ARM64.Build.0 = Release|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x64.ActiveCfg = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x64.Build.0 = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.ActiveCfg = Release|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.Build.0 = Release|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM.Build.0 = Release|ARM - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x64.ActiveCfg = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x64.Build.0 = Release|x64 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.ReleaseBundle|x86.ActiveCfg = Release|x86 @@ -154,9 +130,6 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.ActiveCfg = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Build.0 = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Deploy.0 = Debug|ARM - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.Build.0 = Debug|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM64.Deploy.0 = Debug|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.ActiveCfg = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.Build.0 = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x64.Deploy.0 = Debug|x64 @@ -166,9 +139,6 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.ActiveCfg = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.Build.0 = Debug|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM.Deploy.0 = Debug|ARM - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.Build.0 = Debug|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|ARM64.Deploy.0 = Debug|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.ActiveCfg = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.Build.0 = Debug|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.DebugBundle|x64.Deploy.0 = Debug|x64 @@ -187,9 +157,6 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.Build.0 = Release|ARM {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM.Deploy.0 = Release|ARM - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 - {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|ARM64.Deploy.0 = Release|ARM64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.ActiveCfg = Release|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.Build.0 = Release|x64 {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x64.Deploy.0 = Release|x64 @@ -198,110 +165,87 @@ Global {5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.ReleaseBundle|x86.Deploy.0 = Release|x86 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM.ActiveCfg = Debug|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM.Build.0 = Debug|ARM - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|ARM64.Build.0 = Debug|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x64.ActiveCfg = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x64.Build.0 = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x86.ActiveCfg = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Debug|x86.Build.0 = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM.ActiveCfg = Debug|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM.Build.0 = Debug|ARM - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x64.ActiveCfg = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x64.Build.0 = Debug|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x86.ActiveCfg = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.DebugBundle|x86.Build.0 = Debug|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM.ActiveCfg = Release|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM.Build.0 = Release|ARM - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM64.ActiveCfg = Release|ARM64 - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|ARM64.Build.0 = Release|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x64.ActiveCfg = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x64.Build.0 = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x86.ActiveCfg = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.Release|x86.Build.0 = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM.Build.0 = Release|ARM - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x64.ActiveCfg = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x64.Build.0 = Release|x64 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x86.ActiveCfg = Release|Win32 {4B72C796-16D5-4E3A-81C0-3E36F531E578}.ReleaseBundle|x86.Build.0 = Release|Win32 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM.ActiveCfg = Debug|ARM - {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM64.ActiveCfg = Debug|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.ActiveCfg = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.Build.0 = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.ActiveCfg = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.Build.0 = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM.ActiveCfg = Release|ARM - {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.ActiveCfg = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.Build.0 = Debug|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.ActiveCfg = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.Build.0 = Debug|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM.ActiveCfg = Release|ARM - {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.ActiveCfg = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.Build.0 = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.ActiveCfg = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.Build.0 = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM.ActiveCfg = Release|ARM - {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.ActiveCfg = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.Build.0 = Release|x64 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x86.ActiveCfg = Release|x86 {22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x86.Build.0 = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|ARM.ActiveCfg = Debug|ARM - {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|ARM64.ActiveCfg = Debug|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x64.ActiveCfg = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x64.Build.0 = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x86.ActiveCfg = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Debug|x86.Build.0 = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|ARM.ActiveCfg = Debug|ARM - {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x64.ActiveCfg = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x64.Build.0 = Debug|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x86.ActiveCfg = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.DebugBundle|x86.Build.0 = Debug|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|ARM.ActiveCfg = Release|ARM - {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|ARM64.ActiveCfg = Release|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x64.ActiveCfg = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x64.Build.0 = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x86.ActiveCfg = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.Release|x86.Build.0 = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|ARM.ActiveCfg = Release|ARM - {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x64.ActiveCfg = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x64.Build.0 = Release|x64 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x86.ActiveCfg = Release|x86 {9249E9FD-F19A-4B90-8B74-41C151A6AB30}.ReleaseBundle|x86.Build.0 = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM.ActiveCfg = Debug|ARM - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM64.ActiveCfg = Debug|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.ActiveCfg = Debug|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.Build.0 = Debug|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.ActiveCfg = Debug|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.Build.0 = Debug|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.ActiveCfg = Debug|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.Build.0 = Debug|ARM - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.Build.0 = DebugBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.ActiveCfg = DebugBundle|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.Build.0 = DebugBundle|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.ActiveCfg = Release|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.Build.0 = Release|ARM - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM64.ActiveCfg = Release|ARM64 - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM64.Build.0 = Release|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.ActiveCfg = Release|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.Build.0 = Release|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.ActiveCfg = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.Build.0 = Release|x86 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.Build.0 = Release|ARM - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|x86 @@ -309,96 +253,72 @@ Global {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM.ActiveCfg = Debug|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM.Build.0 = Debug|ARM - {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|ARM64.Build.0 = Debug|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x64.ActiveCfg = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x64.Build.0 = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x86.ActiveCfg = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Debug|x86.Build.0 = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM.ActiveCfg = Debug|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM.Build.0 = Debug|ARM - {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x64.ActiveCfg = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x64.Build.0 = Debug|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x86.ActiveCfg = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.DebugBundle|x86.Build.0 = Debug|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM.ActiveCfg = Release|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM.Build.0 = Release|ARM - {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM64.ActiveCfg = Release|ARM64 - {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|ARM64.Build.0 = Release|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x64.ActiveCfg = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x64.Build.0 = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x86.ActiveCfg = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.Release|x86.Build.0 = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM.Build.0 = Release|ARM - {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x64.ActiveCfg = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x64.Build.0 = Release|x64 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.ActiveCfg = Release|x86 {7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.Build.0 = Release|x86 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.ActiveCfg = Debug|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.Build.0 = Debug|ARM - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM64.Build.0 = Debug|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.ActiveCfg = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.Build.0 = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.ActiveCfg = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.Build.0 = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.ActiveCfg = Debug|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.Build.0 = Debug|ARM - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.ActiveCfg = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.Build.0 = Debug|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.ActiveCfg = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.Build.0 = Debug|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.ActiveCfg = Release|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.Build.0 = Release|ARM - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM64.ActiveCfg = Release|ARM64 - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM64.Build.0 = Release|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.ActiveCfg = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.Build.0 = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.ActiveCfg = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.Build.0 = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.Build.0 = Release|ARM - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.ActiveCfg = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.Build.0 = Release|x64 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.ActiveCfg = Release|Win32 {2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.Build.0 = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM64.Build.0 = Debug|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM.Build.0 = Debug|ARM - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM64.ActiveCfg = Debug|ARM64 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|ARM64.Build.0 = Debug|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x64.ActiveCfg = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x64.Build.0 = Debug|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.DebugBundle|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM64.ActiveCfg = Release|ARM64 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM64.Build.0 = Release|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM.ActiveCfg = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM.Build.0 = Release|ARM - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM64.ActiveCfg = Release|ARM64 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|ARM64.Build.0 = Release|ARM64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.ReleaseBundle|x86.ActiveCfg = Release|Win32 diff --git a/current/ReactWindows/ReactNative/ReactNative.csproj b/current/ReactWindows/ReactNative/ReactNative.csproj index 8a4d1abf591..064fd219709 100644 --- a/current/ReactWindows/ReactNative/ReactNative.csproj +++ b/current/ReactWindows/ReactNative/ReactNative.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.16299.0 + 10.0.14393.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -65,30 +65,6 @@ prompt bin\ARM\Release\ReactNative.XML - - ARM64 - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINDOWS_UWP_ARM64 - ;2008 - full - ARM64 - false - prompt - bin\ARM64\Debug\ReactNative.XML - - - ARM64 - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;CREATE_LAYOUT_THREAD;WINDOWS_UWP_ARM64 - true - ;2008 - pdbonly - ARM64 - false - prompt - bin\ARM64\Release\ReactNative.XML - x64 true diff --git a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj index be41d7587e8..40af13754e8 100644 --- a/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj +++ b/current/ReactWindows/ReactNativeWebViewBridge/ReactNativeWebViewBridge.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.18362.0 - 10.0.16299.0 + 10.0.14393.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -62,28 +62,6 @@ false prompt - - ARM64 - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - - - ARM64 - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - x64 true From f0de25b911b71e2a43ecff9fba2cba9fd5e0122e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 21 Jan 2020 16:45:45 -0800 Subject: [PATCH 12/12] Skip ARM64 in current. --- .ado/windows-vs-pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index d07b275ce5e..a4f62cceca8 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -442,10 +442,6 @@ jobs: BuildConfiguration: Debug BuildPlatform: ARM UTTestOutputConfigDir: Debug - Arm64Debug: - BuildConfiguration: Debug - BuildPlatform: ARM64 - UTTestOutputConfigDir: Debug X86Debug: BuildConfiguration: Debug BuildPlatform: x86