Skip to content

Commit 6de3996

Browse files
Nirmal4GNirmal4G
committed
Default AnyCPU Build to x64 for non-AnyCPU targets
- Everyone's on x64-bit system. So, It's time switch the default. - This only changes the default for AnyCPU solution target where architecture-agnostic target may not be available.
1 parent c2696ad commit 6de3996

File tree

13 files changed

+78
-48
lines changed

13 files changed

+78
-48
lines changed

‎CommunityToolkit.Windows.sln

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@ Global
172172
Release|x86 = Release|x86
173173
EndGlobalSection
174174
GlobalSection(ProjectConfigurationPlatforms) = postSolution
175-
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86
176-
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86
177-
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86
175+
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x64
178176
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM
179177
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM
180178
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -187,7 +185,7 @@ Global
187185
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.ActiveCfg = Debug|x86
188186
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86
189187
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86
190-
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
188+
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x64
191189
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
192190
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
193191
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -220,8 +218,8 @@ Global
220218
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x64.Build.0 = Release|Any CPU
221219
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.ActiveCfg = Release|Any CPU
222220
{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}.Release|x86.Build.0 = Release|Any CPU
223-
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x86
224-
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x86
221+
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.ActiveCfg = Debug|x64
222+
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|Any CPU.Build.0 = Debug|x64
225223
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.ActiveCfg = Debug|ARM
226224
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Build.0 = Debug|ARM
227225
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -234,8 +232,8 @@ Global
234232
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.ActiveCfg = Debug|x86
235233
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Build.0 = Debug|x86
236234
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Debug|x86.Deploy.0 = Debug|x86
237-
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x86
238-
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x86
235+
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.ActiveCfg = Release|x64
236+
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|Any CPU.Build.0 = Release|x64
239237
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.ActiveCfg = Release|ARM
240238
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Build.0 = Release|ARM
241239
{A139968E-AD78-4E8C-93B8-9A5523BCAC89}.Release|ARM.Deploy.0 = Release|ARM
@@ -328,8 +326,8 @@ Global
328326
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x64.Build.0 = Release|Any CPU
329327
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.ActiveCfg = Release|Any CPU
330328
{DAEB9CEC-C817-33B2-74B2-BC379380DB72}.Release|x86.Build.0 = Release|Any CPU
331-
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x86
332-
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x86
329+
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.ActiveCfg = Debug|x64
330+
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|Any CPU.Build.0 = Debug|x64
333331
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.ActiveCfg = Debug|ARM
334332
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Build.0 = Debug|ARM
335333
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -342,8 +340,8 @@ Global
342340
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.ActiveCfg = Debug|x86
343341
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Build.0 = Debug|x86
344342
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Debug|x86.Deploy.0 = Debug|x86
345-
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x86
346-
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x86
343+
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.ActiveCfg = Release|x64
344+
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|Any CPU.Build.0 = Release|x64
347345
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.ActiveCfg = Release|ARM
348346
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Build.0 = Release|ARM
349347
{BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|ARM.Deploy.0 = Release|ARM
@@ -515,7 +513,7 @@ Global
515513
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x64.Build.0 = Release|Any CPU
516514
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.ActiveCfg = Release|Any CPU
517515
{5BF75694-798A-43A0-8150-415DE195359C}.Release|x86.Build.0 = Release|Any CPU
518-
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86
516+
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x64
519517
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM
520518
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM
521519
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -528,7 +526,7 @@ Global
528526
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86
529527
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86
530528
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86
531-
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86
529+
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x64
532530
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM
533531
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM
534532
{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Deploy.0 = Release|ARM
@@ -583,19 +581,23 @@ Global
583581
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU
584582
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
585583
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
584+
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.Build.0 = Debug|Any CPU
586585
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
586+
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.Build.0 = Debug|Any CPU
587587
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU
588588
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU
589589
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU
590590
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU
591591
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
592592
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU
593+
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.Build.0 = Release|Any CPU
593594
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU
595+
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.Build.0 = Release|Any CPU
594596
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU
595597
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU
596598
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU
597599
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU
598-
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86
600+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x64
599601
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM
600602
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM
601603
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -608,16 +610,20 @@ Global
608610
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.ActiveCfg = Debug|x86
609611
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Build.0 = Debug|x86
610612
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|x86.Deploy.0 = Debug|x86
611-
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86
613+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x64
612614
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM
615+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Build.0 = Release|ARM
616+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Deploy.0 = Release|ARM
613617
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64
618+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Build.0 = Release|ARM64
619+
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Deploy.0 = Release|ARM64
614620
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.ActiveCfg = Release|x64
615621
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Build.0 = Release|x64
616622
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Deploy.0 = Release|x64
617623
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.ActiveCfg = Release|x86
618624
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Build.0 = Release|x86
619625
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x86.Deploy.0 = Release|x86
620-
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x86
626+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|Any CPU.ActiveCfg = Debug|x64
621627
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.ActiveCfg = Debug|ARM
622628
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Build.0 = Debug|ARM
623629
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -630,9 +636,13 @@ Global
630636
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.ActiveCfg = Debug|x86
631637
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Build.0 = Debug|x86
632638
{804D0681-52F6-4E61-864A-699F0AB44B20}.Debug|x86.Deploy.0 = Debug|x86
633-
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86
639+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x64
634640
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM
641+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Build.0 = Release|ARM
642+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Deploy.0 = Release|ARM
635643
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64
644+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Build.0 = Release|ARM64
645+
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Deploy.0 = Release|ARM64
636646
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.ActiveCfg = Release|x64
637647
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Build.0 = Release|x64
638648
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Deploy.0 = Release|x64
@@ -723,8 +733,8 @@ Global
723733
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU
724734
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU
725735
{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU
726-
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86
727-
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86
736+
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x64
737+
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x64
728738
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM
729739
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM
730740
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -737,8 +747,8 @@ Global
737747
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86
738748
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86
739749
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86
740-
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86
741-
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86
750+
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x64
751+
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x64
742752
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM
743753
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Build.0 = Release|ARM
744754
{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.Deploy.0 = Release|ARM

‎GazeInputTest/GazeInputTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
66
<ProjectGuid>{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}</ProjectGuid>
77
<OutputType>AppContainerExe</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
66
<ProjectGuid>{719C43C6-8753-4395-ADAA-2FCC70F76BF3}</ProjectGuid>
77
<OutputType>AppContainerExe</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>

‎SmokeTests/SmokeTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
1212
<PropertyGroup>
1313
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
14-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
14+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
1515
<ProjectGuid>{A6E4CB52-1025-4BBA-9C65-BB871D1FB53F}</ProjectGuid>
1616
<OutputType>AppContainerExe</OutputType>
1717
<AppDesignerFolder>Properties</AppDesignerFolder>

‎SmokeTests/SmokeTests.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<BuildPlatforms>x86</BuildPlatforms>
4+
<BuildPlatforms>x64</BuildPlatforms>
55
<BuildConfigurations>Release</BuildConfigurations>
66
<ToolkitPackages>
77
UWPBaseline;

‎UITests/UITests.App/UITests.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
66
<ProjectGuid>{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}</ProjectGuid>
77
<OutputType>AppContainerExe</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>

‎UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
5+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
66
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
77
</PropertyGroup>
88

‎UITests/UITests.Tests.Shared/UITestBase.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,33 @@ internal static TestApplicationInfo WinUICSharpUWPSampleApp
2828
{
2929
get
3030
{
31-
string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
32-
string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App");
31+
string assemblyDir = Path.GetDirectoryName(typeof(TestApplicationInfo).Assembly.Location);
32+
DirectoryInfo baseDirectory = Directory.GetParent(assemblyDir);
33+
34+
for (int i = 0; i < 10; i++)
35+
{
36+
if (baseDirectory.EnumerateDirectories().Any(d => d.Name.Equals("bin", StringComparison.OrdinalIgnoreCase)))
37+
{
38+
break;
39+
}
40+
41+
baseDirectory = baseDirectory.Parent;
42+
}
43+
44+
baseDirectory = Path.Combine(baseDirectory.FullName, "AppPackages", "UITests.App");
3345

3446
Log.Comment($"Base Package Search Directory = \"{baseDirectory}\"");
3547

36-
var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
37-
var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
48+
string[] exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" };
49+
string[] files = Directory.EnumerateFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains));
3850

39-
if (files.Count() == 0)
51+
if (!files.Any())
4052
{
41-
throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory));
53+
throw new Exception($"Failed to find '*.msix' in '{baseDirectory}'!");
4254
}
4355

44-
string mostRecentlyBuiltPackage = string.Empty;
45-
DateTime timeMostRecentlyBuilt = DateTime.MinValue;
56+
var mostRecentlyBuiltPackage = string.Empty;
57+
var timeMostRecentlyBuilt = DateTime.MinValue;
4658

4759
foreach (string file in files)
4860
{

‎UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,36 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<PlatformTarget>x86</PlatformTarget>
6-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
5+
<PlatformTarget>x64</PlatformTarget>
6+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
77
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
88
</PropertyGroup>
99

1010
<PropertyGroup>
1111
<IsTestHarness>true</IsTestHarness>
12+
<DefineConstants>USING_TAEF</DefineConstants>
1213
<EnableDefaultItems>false</EnableDefaultItems>
1314
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
14-
<DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
15-
<TaefRootDirectory>$(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\</TaefRootDirectory>
1615
</PropertyGroup>
1716

1817
<ItemGroup>
1918
<Compile Include="MainClass.cs" />
2019
</ItemGroup>
2120

21+
<PropertyGroup>
22+
<!-- Paths of UITests.App project -->
23+
<ParentProjectDirectory>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'UITests.App'))</ParentProjectDirectory>
24+
<ParentAppxPackageDir>$([MSBuild]::NormalizeDirectory('$(ParentProjectDirectory)', 'AppPackages'))</ParentAppxPackageDir>
25+
<!-- Paths of TAEF Support packages -->
26+
<MuxToolsDirectory>$([MSBuild]::NormalizeDirectory('$(PkgMUXCustomBuildTasks)', 'tools', '$(PlatformTarget)'))</MuxToolsDirectory>
27+
<TaefRootDirectory>$([MSBuild]::NormalizeDirectory('$(PkgTAEF_Redist_Wlk)', 'build', 'Binaries', '$(PlatformTarget)', 'CoreClr'))</TaefRootDirectory>
28+
</PropertyGroup>
29+
2230
<ItemGroup>
23-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\*.msix" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
24-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\AppPackages\*\Dependencies\$(PlatformTarget)\*.appx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
25-
<None Include="$(MSBuildThisFileDirectory)\..\UITests.App\*.pfx" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
26-
<None Include="$(PkgMUXCustomBuildTasks)\tools\$(PlatformTarget)\WttLog.dll" CopyToOutputDirectory="PreserveNewest" />
31+
<None CopyToOutputDirectory="PreserveNewest" Visible="False" Include="$(ParentProjectDirectory)*.pfx" />
32+
<None CopyToOutputDirectory="PreserveNewest" Visible="False" Include="$(ParentAppxPackageDir)*\*.msix" />
33+
<None CopyToOutputDirectory="PreserveNewest" Visible="False" Include="$(ParentAppxPackageDir)*\Dependencies\$(PlatformTarget)\*.appx" />
34+
<None CopyToOutputDirectory="PreserveNewest" Visible="False" Include="$(MuxToolsDirectory)WttLog.dll" />
2735
</ItemGroup>
2836

2937
<ItemGroup>

0 commit comments

Comments
 (0)