From aff03501d10ad9d404f7439d39830f3fe51c4b2f Mon Sep 17 00:00:00 2001 From: Keith Mahoney <41657372+kmahone@users.noreply.github.com> Date: Fri, 29 Oct 2021 12:28:58 -0700 Subject: [PATCH] Run WACK tests for ARM64 (#6184) --- .../MUX-NugetReleaseTest-Job.yml | 3 ++ .../MUX-WACKTests-Job.yml | 3 ++ .../AppThatUsesMUXIndirectly.csproj | 26 +++++++++++- .../MUXControlsReleaseTest.sln | 28 ++++++++----- .../NugetPackageTestApp.csproj | 26 +++++++++++- .../NugetPackageTestAppCX.vcxproj | 40 +++++++++++++++++++ .../RuntimeComponentThatUsesMUX.nuspec | 2 +- 7 files changed, 115 insertions(+), 13 deletions(-) diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml index f5ae1113de..1641774937 100644 --- a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml @@ -24,6 +24,9 @@ parameters: Release_arm: buildPlatform: 'arm' buildConfiguration: 'Release' + Release_arm64: + buildPlatform: 'arm64' + buildConfiguration: 'Release' jobs: - job: ${{ parameters.buildJobName }} diff --git a/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml b/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml index 3977fd4c15..079dae1c2f 100644 --- a/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml @@ -12,6 +12,9 @@ parameters: Release_Arm: buildPlatform: 'arm' buildConfiguration: 'Release' + Release_Arm64: + buildPlatform: 'arm64' + buildConfiguration: 'Release' jobs: - job: ${{ parameters.name }} dependsOn: ${{ parameters.dependsOn }} diff --git a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj index fb03b9f947..0a5178896f 100644 --- a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj +++ b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj @@ -15,7 +15,9 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.15063.0 + + $(SDKVersionRS3) 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -72,6 +74,28 @@ true true + + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP diff --git a/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln b/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln index eca0ef68e3..6b577bb7eb 100644 --- a/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln +++ b/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln @@ -88,7 +88,9 @@ Global {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.ActiveCfg = Debug|ARM {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.Build.0 = Debug|ARM {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.Deploy.0 = Debug|ARM - {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.ActiveCfg = Debug|Win32 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.ActiveCfg = Debug|ARM64 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.Build.0 = Debug|ARM64 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.Deploy.0 = Debug|ARM64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.ActiveCfg = Debug|x64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.Build.0 = Debug|x64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.Deploy.0 = Debug|x64 @@ -98,7 +100,9 @@ Global {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.ActiveCfg = Release|ARM {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.Build.0 = Release|ARM {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.Deploy.0 = Release|ARM - {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.ActiveCfg = Release|x64 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.ActiveCfg = Release|ARM64 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.Build.0 = Release|ARM64 + {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.Deploy.0 = Release|ARM64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.ActiveCfg = Release|x64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.Build.0 = Release|x64 {2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.Deploy.0 = Release|x64 @@ -118,7 +122,9 @@ Global {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.ActiveCfg = Debug|ARM {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.Build.0 = Debug|ARM {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.Deploy.0 = Debug|ARM - {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.ActiveCfg = Debug|x86 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.ActiveCfg = Debug|ARM64 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.Build.0 = Debug|ARM64 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.Deploy.0 = Debug|ARM64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.ActiveCfg = Debug|x64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Build.0 = Debug|x64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Deploy.0 = Debug|x64 @@ -128,7 +134,9 @@ Global {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.ActiveCfg = Release|ARM {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.Build.0 = Release|ARM {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.Deploy.0 = Release|ARM - {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.ActiveCfg = Release|x64 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.ActiveCfg = Release|ARM64 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.Build.0 = Release|ARM64 + {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.Deploy.0 = Release|ARM64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.ActiveCfg = Release|x64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Build.0 = Release|x64 {CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Deploy.0 = Release|x64 @@ -260,7 +268,9 @@ Global {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.ActiveCfg = Debug|ARM {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.Build.0 = Debug|ARM {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.Deploy.0 = Debug|ARM - {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.ActiveCfg = Debug|x86 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.ActiveCfg = Debug|ARM64 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.Build.0 = Debug|ARM64 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.Deploy.0 = Debug|ARM64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.ActiveCfg = Debug|x64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.Build.0 = Debug|x64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.Deploy.0 = Debug|x64 @@ -270,7 +280,9 @@ Global {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.ActiveCfg = Release|ARM {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.Build.0 = Release|ARM {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.Deploy.0 = Release|ARM - {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.ActiveCfg = Release|x86 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.ActiveCfg = Release|ARM64 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.Build.0 = Release|ARM64 + {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.Deploy.0 = Release|ARM64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.ActiveCfg = Release|x64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.Build.0 = Release|x64 {E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.Deploy.0 = Release|x64 @@ -288,7 +300,6 @@ Global {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|ARM.ActiveCfg = Debug|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|ARM.Build.0 = Debug|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|arm64.ActiveCfg = Debug|Any CPU - {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|arm64.Build.0 = Debug|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x64.ActiveCfg = Debug|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x64.Build.0 = Debug|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -296,7 +307,6 @@ Global {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|ARM.ActiveCfg = Release|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|ARM.Build.0 = Release|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|arm64.ActiveCfg = Release|Any CPU - {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|arm64.Build.0 = Release|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x64.ActiveCfg = Release|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x64.Build.0 = Release|Any CPU {A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x86.ActiveCfg = Release|Any CPU @@ -336,7 +346,6 @@ Global {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|ARM.ActiveCfg = Debug|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|ARM.Build.0 = Debug|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|arm64.ActiveCfg = Debug|Any CPU - {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|arm64.Build.0 = Debug|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x64.ActiveCfg = Debug|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x64.Build.0 = Debug|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -344,7 +353,6 @@ Global {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|ARM.ActiveCfg = Release|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|ARM.Build.0 = Release|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|arm64.ActiveCfg = Release|Any CPU - {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|arm64.Build.0 = Release|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x64.ActiveCfg = Release|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x64.Build.0 = Release|Any CPU {94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj index 6b4b1a102c..6a0b3e6647 100644 --- a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj +++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj @@ -15,7 +15,9 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.15063.0 + + $(SDKVersionRS3) 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -71,6 +73,28 @@ true true + + true + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + true DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj index 629abf06ba..6f50b18eba 100644 --- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj +++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj @@ -23,6 +23,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -35,6 +39,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -54,6 +62,11 @@ true v142 + + Application + true + v142 + Application true @@ -73,6 +86,13 @@ v142 true + + Application + false + true + v142 + true + Application false @@ -92,9 +112,15 @@ + + + + + + @@ -112,12 +138,24 @@ 4453;28204 + + + /bigobj %(AdditionalOptions) + 4453;28204 + + /bigobj %(AdditionalOptions) 4453;28204 + + + /bigobj %(AdditionalOptions) + 4453;28204 + + /bigobj %(AdditionalOptions) @@ -191,7 +229,9 @@ Create Create Create + Create Create + Create Create Create diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec index e0f5f51eaa..c0c5b28ed3 100644 --- a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec +++ b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec @@ -1,4 +1,4 @@ - + RuntimeComponentThatUsesMUX