Skip to content

Commit 5617c83

Browse files
bpulliambpulliam
authored
Fixes for ARM64 (#310)
1 parent 3844ef4 commit 5617c83

File tree

80 files changed

+122
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+122
-262
lines changed

‎Samples/AppLifecycle/Activation/cpp-win32-packaged/CppWinMainActivationPkg.sln

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,23 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13-
Debug|ARM = Debug|ARM
1413
Debug|ARM64 = Debug|ARM64
1514
Debug|x64 = Debug|x64
1615
Debug|x86 = Debug|x86
1716
Release|Any CPU = Release|Any CPU
18-
Release|ARM = Release|ARM
1917
Release|ARM64 = Release|ARM64
2018
Release|x64 = Release|x64
2119
Release|x86 = Release|x86
2220
EndGlobalSection
2321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2422
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|Any CPU.ActiveCfg = Debug|Win32
25-
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|ARM.ActiveCfg = Debug|Win32
2623
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|ARM64.ActiveCfg = Debug|ARM64
2724
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|ARM64.Build.0 = Debug|ARM64
2825
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|x64.ActiveCfg = Debug|x64
2926
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|x64.Build.0 = Debug|x64
3027
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|x86.ActiveCfg = Debug|Win32
3128
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Debug|x86.Build.0 = Debug|Win32
3229
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Release|Any CPU.ActiveCfg = Release|Win32
33-
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Release|ARM.ActiveCfg = Release|Win32
3430
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Release|ARM64.ActiveCfg = Release|ARM64
3531
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Release|ARM64.Build.0 = Release|ARM64
3632
{11400D28-21EB-4F92-AE9E-0EE652C98400}.Release|x64.ActiveCfg = Release|x64
@@ -40,9 +36,6 @@ Global
4036
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4137
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
4238
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
43-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM.ActiveCfg = Debug|ARM
44-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM.Build.0 = Debug|ARM
45-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM.Deploy.0 = Debug|ARM
4639
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM64.ActiveCfg = Debug|ARM64
4740
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM64.Build.0 = Debug|ARM64
4841
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Debug|ARM64.Deploy.0 = Debug|ARM64
@@ -55,9 +48,6 @@ Global
5548
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
5649
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|Any CPU.Build.0 = Release|Any CPU
5750
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|Any CPU.Deploy.0 = Release|Any CPU
58-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM.ActiveCfg = Release|ARM
59-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM.Build.0 = Release|ARM
60-
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM.Deploy.0 = Release|ARM
6151
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM64.ActiveCfg = Release|ARM64
6252
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM64.Build.0 = Release|ARM64
6353
{3409AE3C-9FB4-4B98-BBBE-B73684613C7A}.Release|ARM64.Deploy.0 = Release|ARM64

‎Samples/AppLifecycle/Activation/cpp-win32-packaged/CppWinMainActivationPkg/CppWinMainActivationPkg.wapproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
<Configuration>Release</Configuration>
2121
<Platform>x64</Platform>
2222
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Debug|ARM">
24-
<Configuration>Debug</Configuration>
25-
<Platform>ARM</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Release|ARM">
28-
<Configuration>Release</Configuration>
29-
<Platform>ARM</Platform>
30-
</ProjectConfiguration>
3123
<ProjectConfiguration Include="Debug|ARM64">
3224
<Configuration>Debug</Configuration>
3325
<Platform>ARM64</Platform>

‎Samples/AppLifecycle/Activation/cs-winforms-unpackaged/CsWinFormsActivation/CsWinFormsActivation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
7-
<Platforms>x64;x86</Platforms>
8-
<RuntimeIdentifiers>win10-x64;win10-x86</RuntimeIdentifiers>
7+
<Platforms>x64;x86;ARM64</Platforms>
8+
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
99
<ApplicationIcon>D.ico</ApplicationIcon>
1010
</PropertyGroup>
1111

‎Samples/AppLifecycle/Activation/cs-winui-packaged/CsWinUiDesktopActivation/CsWinUiDesktopActivation/CsWinUiDesktopActivation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<RootNamespace>CsWinUiDesktopActivation</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
8-
<Platforms>x86;x64;arm64</Platforms>
8+
<Platforms>x86;x64;ARM64</Platforms>
99
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1010
<UseWinUI>true</UseWinUI>
1111
</PropertyGroup>

‎Samples/AppLifecycle/Activation/cs-wpf-packaged/CsWpfActivation/CsWpfActivation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
7-
<Platforms>x64;x86</Platforms>
8-
<RuntimeIdentifiers>win10-x64;win10-x86;win-x86;win-x64</RuntimeIdentifiers>
7+
<Platforms>x64;x86;ARM64</Platforms>
8+
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64;win-x86;win-x64;win-arm64</RuntimeIdentifiers>
99
<StartupObject>CsWpfActivation.Program</StartupObject>
1010
</PropertyGroup>
1111

‎Samples/AppLifecycle/Activation/cs-wpf-packaged/CsWpfActivationPkg.sln

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,34 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13-
Debug|ARM = Debug|ARM
1413
Debug|ARM64 = Debug|ARM64
1514
Debug|x64 = Debug|x64
1615
Debug|x86 = Debug|x86
1716
Release|Any CPU = Release|Any CPU
18-
Release|ARM = Release|ARM
1917
Release|ARM64 = Release|ARM64
2018
Release|x64 = Release|x64
2119
Release|x86 = Release|x86
2220
EndGlobalSection
2321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2422
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|Any CPU.ActiveCfg = Debug|x64
2523
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|Any CPU.Build.0 = Debug|x64
26-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM.ActiveCfg = Debug|x86
27-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM64.ActiveCfg = Debug|x86
24+
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM64.ActiveCfg = Debug|ARM64
25+
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|ARM64.Build.0 = Debug|ARM64
2826
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x64.ActiveCfg = Debug|x64
2927
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x64.Build.0 = Debug|x64
3028
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x86.ActiveCfg = Debug|x86
3129
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Debug|x86.Build.0 = Debug|x86
3230
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|Any CPU.ActiveCfg = Release|Any CPU
3331
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM.ActiveCfg = Release|Any CPU
35-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM.Build.0 = Release|Any CPU
36-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.ActiveCfg = Release|Any CPU
37-
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.Build.0 = Release|Any CPU
32+
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.ActiveCfg = Release|ARM64
33+
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|ARM64.Build.0 = Release|ARM64
3834
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x64.ActiveCfg = Release|x64
3935
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x64.Build.0 = Release|x64
4036
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x86.ActiveCfg = Release|x86
4137
{79B87D31-A3CC-4830-A631-6CEB6EE7CE28}.Release|x86.Build.0 = Release|x86
4238
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4339
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4440
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
45-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM.ActiveCfg = Debug|ARM
46-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM.Build.0 = Debug|ARM
47-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM.Deploy.0 = Debug|ARM
4841
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM64.ActiveCfg = Debug|ARM64
4942
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM64.Build.0 = Debug|ARM64
5043
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Debug|ARM64.Deploy.0 = Debug|ARM64
@@ -57,9 +50,6 @@ Global
5750
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
5851
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|Any CPU.Build.0 = Release|Any CPU
5952
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|Any CPU.Deploy.0 = Release|Any CPU
60-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM.ActiveCfg = Release|ARM
61-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM.Build.0 = Release|ARM
62-
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM.Deploy.0 = Release|ARM
6353
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM64.ActiveCfg = Release|ARM64
6454
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM64.Build.0 = Release|ARM64
6555
{CDA89BD7-C508-4AFF-B184-E06FE48860FB}.Release|ARM64.Deploy.0 = Release|ARM64

‎Samples/AppLifecycle/Activation/cs-wpf-packaged/CsWpfActivationPkg/CsWpfActivationPkg.wapproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
<Configuration>Release</Configuration>
2121
<Platform>x64</Platform>
2222
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Debug|ARM">
24-
<Configuration>Debug</Configuration>
25-
<Platform>ARM</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Release|ARM">
28-
<Configuration>Release</Configuration>
29-
<Platform>ARM</Platform>
30-
</ProjectConfiguration>
3123
<ProjectConfiguration Include="Debug|ARM64">
3224
<Configuration>Debug</Configuration>
3325
<Platform>ARM64</Platform>

‎Samples/AppLifecycle/Activation/cs-wpf-unpackaged/CsWpfActivation/CsWpfActivation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
7-
<Platforms>x64;x86</Platforms>
8-
<RuntimeIdentifiers>win10-x64;win10-x86</RuntimeIdentifiers>
7+
<Platforms>x64;x86;ARM64</Platforms>
8+
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
99
<StartupObject>CsWpfActivation.Program</StartupObject>
1010
<ApplicationIcon>E.ico</ApplicationIcon>
1111
</PropertyGroup>

‎Samples/AppLifecycle/EnvironmentVariables/cpp-console-unpackaged/CppWinRtConsoleEnv.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppWinRtConsoleEnv", "CppWi
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|ARM = Debug|ARM
10+
Debug|ARM64 = Debug|ARM64
1111
Debug|x64 = Debug|x64
1212
Debug|x86 = Debug|x86
13-
Release|ARM = Release|ARM
13+
Release|ARM64 = Release|ARM64
1414
Release|x64 = Release|x64
1515
Release|x86 = Release|x86
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|ARM.ActiveCfg = Debug|ARM
19-
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|ARM.Build.0 = Debug|ARM
18+
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
19+
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|ARM64.Build.0 = Debug|ARM64
2020
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|x64.ActiveCfg = Debug|x64
2121
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|x64.Build.0 = Debug|x64
2222
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|x86.ActiveCfg = Debug|Win32
2323
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Debug|x86.Build.0 = Debug|Win32
24-
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|ARM.ActiveCfg = Release|ARM
25-
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|ARM.Build.0 = Release|ARM
24+
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|ARM64.ActiveCfg = Release|ARM64
25+
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|ARM64.Build.0 = Release|ARM64
2626
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|x64.ActiveCfg = Release|x64
2727
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|x64.Build.0 = Release|x64
2828
{4C7D2F94-CA7C-4D5D-852D-986389EF3E2B}.Release|x86.ActiveCfg = Release|Win32

‎Samples/AppLifecycle/EnvironmentVariables/cpp-console-unpackaged/CppWinRtConsoleEnv/CppWinRtConsoleEnv.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
</PropertyGroup>
2424
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2525
<ItemGroup Label="ProjectConfigurations">
26-
<ProjectConfiguration Include="Debug|ARM">
26+
<ProjectConfiguration Include="Debug|ARM64">
2727
<Configuration>Debug</Configuration>
28-
<Platform>ARM</Platform>
28+
<Platform>ARM64</Platform>
2929
</ProjectConfiguration>
3030
<ProjectConfiguration Include="Debug|Win32">
3131
<Configuration>Debug</Configuration>
3232
<Platform>Win32</Platform>
3333
</ProjectConfiguration>
34-
<ProjectConfiguration Include="Release|ARM">
34+
<ProjectConfiguration Include="Release|ARM64">
3535
<Configuration>Release</Configuration>
36-
<Platform>ARM</Platform>
36+
<Platform>ARM64</Platform>
3737
</ProjectConfiguration>
3838
<ProjectConfiguration Include="Release|Win32">
3939
<Configuration>Release</Configuration>

0 commit comments

Comments
 (0)