Skip to content

Commit 2689f47

Browse files
committed
Fix a bunch of stale arm32 references when converting over to arm64
1 parent 9afc8c3 commit 2689f47

File tree

7 files changed

+86
-42
lines changed

7 files changed

+86
-42
lines changed

test/nuget/ConsoleApplication1/ConsoleApplication1.vcxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@
1313
</PropertyGroup>
1414
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1515
<ItemGroup Label="ProjectConfigurations">
16+
<ProjectConfiguration Include="Debug|ARM64">
17+
<Configuration>Debug</Configuration>
18+
<Platform>ARM64</Platform>
19+
</ProjectConfiguration>
1620
<ProjectConfiguration Include="Debug|Win32">
1721
<Configuration>Debug</Configuration>
1822
<Platform>Win32</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|ARM64">
25+
<Configuration>Release</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="Release|Win32">
2129
<Configuration>Release</Configuration>
2230
<Platform>Win32</Platform>

test/nuget/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<GeneratedFilesDir>$(IntDir)Generated Files\</GeneratedFilesDir>
2424
<CppWinRTVerbosity>high</CppWinRTVerbosity>
2525
<CppWinRTPlatform>$(Platform)</CppWinRTPlatform>
26-
<CppWinRTPlatform Condition="'$(Platform)'=='Win32' or ''$(Platform)'=='ARM64'">x86</CppWinRTPlatform>
26+
<CppWinRTPlatform Condition="'$(Platform)'=='Win32' or '$(Platform)'=='ARM64'">x86</CppWinRTPlatform>
2727
<CppWinRTPath>$(SolutionDir)..\..\_build\$(CppWinRTPlatform)\$(Configuration)\</CppWinRTPath>
2828
</PropertyGroup>
2929

test/nuget/NuGetTest.sln

Lines changed: 58 additions & 38 deletions
Large diffs are not rendered by default.

test/nuget/TestApp/TestApp.vcxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
</PropertyGroup>
1717
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1818
<ItemGroup Label="ProjectConfigurations">
19+
<ProjectConfiguration Include="Debug|ARM64">
20+
<Configuration>Debug</Configuration>
21+
<Platform>ARM64</Platform>
22+
</ProjectConfiguration>
1923
<ProjectConfiguration Include="Debug|Win32">
2024
<Configuration>Debug</Configuration>
2125
<Platform>Win32</Platform>
@@ -24,6 +28,10 @@
2428
<Configuration>Debug</Configuration>
2529
<Platform>x64</Platform>
2630
</ProjectConfiguration>
31+
<ProjectConfiguration Include="Release|ARM64">
32+
<Configuration>Release</Configuration>
33+
<Platform>ARM64</Platform>
34+
</ProjectConfiguration>
2735
<ProjectConfiguration Include="Release|Win32">
2836
<Configuration>Release</Configuration>
2937
<Platform>Win32</Platform>

test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
</PropertyGroup>
1717
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1818
<ItemGroup Label="ProjectConfigurations">
19+
<ProjectConfiguration Include="Debug|ARM64">
20+
<Configuration>Debug</Configuration>
21+
<Platform>ARM64</Platform>
22+
</ProjectConfiguration>
1923
<ProjectConfiguration Include="Debug|Win32">
2024
<Configuration>Debug</Configuration>
2125
<Platform>Win32</Platform>
@@ -24,6 +28,10 @@
2428
<Configuration>Debug</Configuration>
2529
<Platform>x64</Platform>
2630
</ProjectConfiguration>
31+
<ProjectConfiguration Include="Release|ARM64">
32+
<Configuration>Release</Configuration>
33+
<Platform>ARM64</Platform>
34+
</ProjectConfiguration>
2735
<ProjectConfiguration Include="Release|Win32">
2836
<Configuration>Release</Configuration>
2937
<Platform>Win32</Platform>

test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ItemGroup Label="ProjectConfigurations">
2020
<ProjectConfiguration Include="Debug|ARM64">
2121
<Configuration>Debug</Configuration>
22-
<Platform>ARM</Platform>
22+
<Platform>ARM64</Platform>
2323
</ProjectConfiguration>
2424
<ProjectConfiguration Include="Debug|Win32">
2525
<Configuration>Debug</Configuration>
@@ -31,7 +31,7 @@
3131
</ProjectConfiguration>
3232
<ProjectConfiguration Include="Release|ARM64">
3333
<Configuration>Release</Configuration>
34-
<Platform>ARM</Platform>
34+
<Platform>ARM64</Platform>
3535
</ProjectConfiguration>
3636
<ProjectConfiguration Include="Release|Win32">
3737
<Configuration>Release</Configuration>

test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
7474
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7575
</ImportGroup>
76-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64">
76+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
7777
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7878
</ImportGroup>
7979
<PropertyGroup Label="UserMacros" />

0 commit comments

Comments
 (0)