diff --git a/CommunityToolkit.Windows.sln b/CommunityToolkit.Windows.sln
index 2d1ca18b0cb..b858e40e1cd 100644
--- a/CommunityToolkit.Windows.sln
+++ b/CommunityToolkit.Windows.sln
@@ -172,9 +172,7 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86
+ {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -187,7 +185,7 @@ Global
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.ActiveCfg = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86
- {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
+ {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -220,8 +218,8 @@ Global
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x64.Build.0 = Release|Any CPU
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.ActiveCfg = Release|Any CPU
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.Build.0 = Release|Any CPU
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x86
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x64
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.ActiveCfg = Debug|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Build.0 = Debug|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -234,8 +232,8 @@ Global
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.ActiveCfg = Debug|x86
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Build.0 = Debug|x86
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Deploy.0 = Debug|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x86
- {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x86
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x64
+ {A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x64
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.ActiveCfg = Release|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Build.0 = Release|ARM
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Deploy.0 = Release|ARM
@@ -328,8 +326,8 @@ Global
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x64.Build.0 = Release|Any CPU
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.ActiveCfg = Release|Any CPU
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.Build.0 = Release|Any CPU
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x86
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x64
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.ActiveCfg = Debug|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Build.0 = Debug|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -342,8 +340,8 @@ Global
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.ActiveCfg = Debug|x86
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Build.0 = Debug|x86
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Deploy.0 = Debug|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x86
- {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x86
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x64
+ {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x64
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.ActiveCfg = Release|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Build.0 = Release|ARM
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Deploy.0 = Release|ARM
@@ -515,7 +513,7 @@ Global
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
- {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x64
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -528,7 +526,7 @@ Global
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86
- {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86
+ {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x64
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Deploy.0 = Release|ARM
@@ -583,19 +581,23 @@ Global
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU
- {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -608,16 +610,20 @@ Global
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.ActiveCfg = Debug|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Build.0 = Debug|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Deploy.0 = Debug|x86
- {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Build.0 = Release|ARM
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Deploy.0 = Release|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Build.0 = Release|ARM64
+ {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Deploy.0 = Release|ARM64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.ActiveCfg = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Build.0 = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Deploy.0 = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.ActiveCfg = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Build.0 = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Deploy.0 = Release|x86
- {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.ActiveCfg = Debug|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Build.0 = Debug|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -630,9 +636,13 @@ Global
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.ActiveCfg = Debug|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Build.0 = Debug|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Deploy.0 = Debug|x86
- {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Build.0 = Release|ARM
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Deploy.0 = Release|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Build.0 = Release|ARM64
+ {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Deploy.0 = Release|ARM64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.ActiveCfg = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Build.0 = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Deploy.0 = Release|x64
@@ -723,8 +733,8 @@ Global
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x64
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -737,8 +747,8 @@ Global
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86
- {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x64
+ {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x64
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
index 1f13dcf2402..570177c2a1f 100644
--- a/GazeInputTest/GazeInputTest.csproj
+++ b/GazeInputTest/GazeInputTest.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}
AppContainerExe
Properties
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 4cd1f7b7415..0bc15ef7042 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}
AppContainerExe
Properties
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 98bfa2ab298..6cd5fa0496e 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -11,7 +11,7 @@
Debug
- x86
+ x64
{A6E4CB52-1025-4BBA-9C65-BB871D1FB53F}
AppContainerExe
Properties
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index a0f485574ea..3c3dba7261e 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -1,7 +1,7 @@
- x86
+ x64
Release
UWPBaseline;
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index bf17fcc2109..0064fd8ad07 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}
AppContainerExe
Properties
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 429adb007c5..adfa0c71f50 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -2,7 +2,7 @@
Exe
- win10-x86
+ win10-x64
netcoreapp3.1
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
index 2a514deee8f..dc752fce6e4 100644
--- a/UITests/UITests.Tests.Shared/UITestBase.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -27,21 +27,33 @@ internal static TestApplicationInfo WinUICSharpUWPSampleApp
{
get
{
- string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
- string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App");
+ string assemblyDir = Path.GetDirectoryName(typeof(TestApplicationInfo).Assembly.Location);
+ DirectoryInfo baseDir = Directory.GetParent(assemblyDir);
- Log.Comment($"Base Package Search Directory = \"{baseDirectory}\"");
+ for (int i = 0; i < 10; i++)
+ {
+ if (baseDir.EnumerateDirectories().Any(d => d.Name.Equals("bin", StringComparison.OrdinalIgnoreCase)))
+ {
+ break;
+ }
+
+ baseDir = baseDir.Parent;
+ }
+
+ string publishDir = Path.Combine(baseDir.FullName, "AppPackages", "UITests.App");
+
+ Log.Comment($"Base Package Search Directory = \"{publishDir}\"");
- var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
- var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
+ var excludes = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
+ var files = Directory.EnumerateFiles(publishDir, "*.msix", SearchOption.AllDirectories).Where(f => !excludes.Any(Path.GetFileNameWithoutExtension(f).Contains));
- if (files.Count() == 0)
+ if (!files.Any())
{
- throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory));
+ throw new Exception($"Failed to find '*.msix' in '{publishDir}'!");
}
- string mostRecentlyBuiltPackage = string.Empty;
- DateTime timeMostRecentlyBuilt = DateTime.MinValue;
+ var mostRecentlyBuiltPackage = string.Empty;
+ var timeMostRecentlyBuilt = DateTime.MinValue;
foreach (string file in files)
{
@@ -62,7 +74,7 @@ internal static TestApplicationInfo WinUICSharpUWPSampleApp
processName: "UITests.App.exe",
installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty),
certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d",
- baseAppxDir: baseDirectory);
+ baseAppxDir: publishDir);
}
}
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 70718b662e4..fc5cdf8d50f 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -2,28 +2,36 @@
Exe
- x86
- win10-x86
+ x64
+ win10-x64
netcoreapp3.1
true
+ USING_TAEF
false
true
- $(DefineConstants);USING_TAEF
- $(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\
+
+
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'UITests.App'))
+ $([MSBuild]::NormalizeDirectory('$(ParentProjectDirectory)', 'AppPackages'))
+
+ $([MSBuild]::NormalizeDirectory('$(PkgMUXCustomBuildTasks)', 'tools', '$(PlatformTarget)'))
+ $([MSBuild]::NormalizeDirectory('$(PkgTAEF_Redist_Wlk)', 'build', 'Binaries', '$(PlatformTarget)', 'CoreClr'))
+
+
-
-
-
-
+
+
+
+
diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
index fd7c2179258..f3772633157 100644
--- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
+++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}
AppContainerExe
Properties
diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
index 4c6066bd4fd..b838245b2e6 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
+++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{EFA96B3C-857E-4659-B942-6BEF7719F4CA}
AppContainerExe
Properties
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 4e542c98a9f..f1a818e5dd2 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}
AppContainerExe
Properties
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 631f489d6fe..7707d9d53d6 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -2,7 +2,7 @@
Debug
- x86
+ x64
{804D0681-52F6-4E61-864A-699F0AB44B20}
AppContainerExe
Properties