Skip to content

Commit 1b4e009

Browse files
alvinhochunalvinhochun
authored
CI: Build ARM64 cppwinrt and tests (not run) (#1211)
1 parent 95b9d9a commit 1b4e009

File tree

12 files changed

+73
-41
lines changed

12 files changed

+73
-41
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ jobs:
7272
run: |
7373
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:fast_fwd
7474
75+
- name: Build x86 prebuild tool
76+
if: matrix.arch == 'arm64'
77+
run: |
78+
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Platform=x86 cppwinrt.sln /t:cppwinrt
79+
7580
- name: Build cppwinrt
76-
if: matrix.arch != 'arm64'
7781
run: |
7882
cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt
7983
8084
- name: Upload built executables
81-
if: matrix.arch != 'arm64'
8285
uses: actions/upload-artifact@v3
8386
with:
8487
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
@@ -103,10 +106,14 @@ jobs:
103106
fail-fast: false
104107
matrix:
105108
compiler: [MSVC, clang-cl]
106-
arch: [x86, x64]
109+
arch: [x86, x64, arm64]
107110
config: [Debug, Release]
108111
test_exe: [test, test_cpp20, test_win7, test_fast, test_slow, test_old, test_module_lock_custom, test_module_lock_none]
109112
exclude:
113+
- arch: arm64
114+
config: Debug
115+
- compiler: clang-cl
116+
arch: arm64
110117
- compiler: clang-cl
111118
config: Release
112119
runs-on: windows-latest
@@ -131,11 +138,19 @@ jobs:
131138
cmd /c "LLVM_VS2017\install.bat" 1
132139
133140
- name: Fetch cppwinrt executables
141+
if: matrix.arch != 'arm64'
134142
uses: actions/download-artifact@v3
135143
with:
136144
name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
137145
path: _build/${{ matrix.arch }}/${{ matrix.config }}/
138146

147+
- name: Fetch x86 cppwinrt executables (arm64 only)
148+
if: matrix.arch == 'arm64'
149+
uses: actions/download-artifact@v3
150+
with:
151+
name: msvc-build-x86-Release-bin
152+
path: _build/x86/Release/
153+
139154
- name: Download nuget
140155
run: |
141156
mkdir ".\.nuget"
@@ -186,7 +201,11 @@ jobs:
186201
run: |
187202
$target_configuration = "${{ matrix.config }}"
188203
$target_platform = "${{ matrix.arch }}"
189-
& "_build\$target_platform\$target_configuration\cppwinrt.exe" -in local -out _build\$target_platform\$target_configuration -verbose
204+
$cppwinrt_path = "_build\$target_platform\$target_configuration\cppwinrt.exe"
205+
if ($target_platform -eq "arm64") {
206+
$cppwinrt_path = "_build\x86\Release\cppwinrt.exe"
207+
}
208+
& $cppwinrt_path -in local -out _build\$target_platform\$target_configuration -verbose
190209
191210
- name: Build test '${{ matrix.test_exe }}'
192211
run: |
@@ -230,6 +249,7 @@ jobs:
230249
}
231250
232251
- name: Run test '${{ matrix.test_exe }}'
252+
if: matrix.arch != 'arm64'
233253
run: |
234254
$target_configuration = "${{ matrix.config }}"
235255
$target_platform = "${{ matrix.arch }}"
@@ -241,6 +261,18 @@ jobs:
241261
}
242262
& $test_path --use-colour yes
243263
264+
- name: Upload arm64 test executables
265+
if: matrix.arch == 'arm64'
266+
uses: actions/upload-artifact@v3
267+
with:
268+
name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin
269+
path: |
270+
_build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
271+
_build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
272+
_build/${{ matrix.arch }}/${{ matrix.config }}/*.winmd
273+
_build/${{ matrix.arch }}/${{ matrix.config }}/*.lib
274+
_build/${{ matrix.arch }}/${{ matrix.config }}/*.pdb
275+
244276
build-msvc-natvis:
245277
name: 'Build natvis'
246278
strategy:

‎cppwinrt/cppwinrt.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
<SubSystem>Console</SubSystem>
237237
</Link>
238238
<PreBuildEvent>
239-
<Command>$(OutputPath)prebuild.exe ..\strings $(OutputPath)</Command>
239+
<Command>$(CppWinRTDir)prebuild.exe ..\strings $(OutputPath)</Command>
240240
</PreBuildEvent>
241241
<PostBuildEvent>
242242
<Command>
@@ -319,7 +319,7 @@
319319
<AdditionalOptions>/DEBUGTYPE:CV,FIXUP %(AdditionalOptions)</AdditionalOptions>
320320
</Link>
321321
<PreBuildEvent>
322-
<Command>$(OutputPath)prebuild.exe ..\strings $(OutputPath)</Command>
322+
<Command>$(CppWinRTDir)prebuild.exe ..\strings $(OutputPath)</Command>
323323
</PreBuildEvent>
324324
<PostBuildEvent>
325325
<Command>

‎test/old_tests/Component/Component.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
@@ -131,7 +131,7 @@
131131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
132132
<GenerateManifest>false</GenerateManifest>
133133
<IgnoreImportLibrary>false</IgnoreImportLibrary>
134-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
134+
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
135135
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
136136
</PropertyGroup>
137137
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -149,7 +149,7 @@
149149
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
150150
<GenerateManifest>false</GenerateManifest>
151151
<IgnoreImportLibrary>false</IgnoreImportLibrary>
152-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
152+
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
153153
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
154154
</PropertyGroup>
155155
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -166,7 +166,7 @@
166166
</PropertyGroup>
167167
<ItemDefinitionGroup>
168168
<CustomBuildStep>
169-
<Command>$(OutputPath)cppwinrt.exe -in $(OutputPath)Component.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk $(OutputPath)Composable.winmd -verbose</Command>
169+
<Command>$(CppWinRTDir)cppwinrt.exe -in $(OutputPath)Component.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk $(OutputPath)Composable.winmd -verbose</Command>
170170
<Message>C++/WinRT compiler</Message>
171171
<Outputs>Generated Files\module.g.cpp</Outputs>
172172
<Inputs>$(OutputPath)Component.winmd</Inputs>

‎test/old_tests/Composable/Composable.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
132132
<GenerateManifest>false</GenerateManifest>
133133
<IgnoreImportLibrary>false</IgnoreImportLibrary>
134-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
134+
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
135135
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
136136
</PropertyGroup>
137137
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -149,7 +149,7 @@
149149
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
150150
<GenerateManifest>false</GenerateManifest>
151151
<IgnoreImportLibrary>false</IgnoreImportLibrary>
152-
<ExecutablePath>..\..;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
152+
<ExecutablePath>..\..;$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
153153
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
154154
</PropertyGroup>
155155
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -166,7 +166,7 @@
166166
</PropertyGroup>
167167
<ItemDefinitionGroup>
168168
<CustomBuildStep>
169-
<Command>$(OutDir)cppwinrt.exe -in $(OutDir)Composable.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk -verbose -pch precomp.hpp -name Composable</Command>
169+
<Command>$(CppWinRTDir)cppwinrt.exe -in $(OutDir)Composable.winmd -comp $(ProjectDir) -out "$(ProjectDir)Generated Files" -ref sdk -verbose -pch precomp.hpp -name Composable</Command>
170170
<Message>C++/WinRT compiler</Message>
171171
<Outputs>Generated Files\module.g.cpp</Outputs>
172172
<Inputs>$(OutDir)Composable.winmd</Inputs>

‎test/test/test.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<OptimizeReferences>true</OptimizeReferences>
123123
</Link>
124124
<PreBuildEvent>
125-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
125+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
126126
</PreBuildEvent>
127127
<PostBuildEvent>
128128
<Command>
@@ -140,7 +140,7 @@
140140
<SubSystem>Console</SubSystem>
141141
</Link>
142142
<PreBuildEvent>
143-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
143+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
144144
</PreBuildEvent>
145145
<PostBuildEvent>
146146
<Command>
@@ -158,7 +158,7 @@
158158
<SubSystem>Console</SubSystem>
159159
</Link>
160160
<PreBuildEvent>
161-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
161+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
162162
</PreBuildEvent>
163163
<PostBuildEvent>
164164
<Command>
@@ -176,7 +176,7 @@
176176
<SubSystem>Console</SubSystem>
177177
</Link>
178178
<PreBuildEvent>
179-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
179+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
180180
</PreBuildEvent>
181181
<PostBuildEvent>
182182
<Command>
@@ -194,7 +194,7 @@
194194
<SubSystem>Console</SubSystem>
195195
</Link>
196196
<PreBuildEvent>
197-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
197+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
198198
</PreBuildEvent>
199199
<PostBuildEvent>
200200
<Command>
@@ -216,7 +216,7 @@
216216
<OptimizeReferences>true</OptimizeReferences>
217217
</Link>
218218
<PreBuildEvent>
219-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
219+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
220220
</PreBuildEvent>
221221
<PostBuildEvent>
222222
<Command>
@@ -238,7 +238,7 @@
238238
<OptimizeReferences>true</OptimizeReferences>
239239
</Link>
240240
<PreBuildEvent>
241-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
241+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
242242
</PreBuildEvent>
243243
<PostBuildEvent>
244244
<Command>
@@ -260,7 +260,7 @@
260260
<OptimizeReferences>true</OptimizeReferences>
261261
</Link>
262262
<PreBuildEvent>
263-
<Command>$(OutputPath)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
263+
<Command>$(CppWinRTDir)cppwinrt -in $(OutputPath)test_component.winmd $(OutputPath)test_component_no_pch.winmd -out "$(ProjectDir)Generated Files" -ref sdk -verbose -fastabi</Command>
264264
</PreBuildEvent>
265265
<PostBuildEvent>
266266
<Command>

‎test/test_component/test_component.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
127127
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
128-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
128+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
131131
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
@@ -137,7 +137,7 @@
137137
</PropertyGroup>
138138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
139139
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
140-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
140+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
141141
</PropertyGroup>
142142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143143
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>

‎test/test_component_base/test_component_base.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
127127
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
128-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
128+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
131131
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
@@ -137,7 +137,7 @@
137137
</PropertyGroup>
138138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
139139
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
140-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
140+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
141141
</PropertyGroup>
142142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143143
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>

‎test/test_component_derived/test_component_derived.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
127127
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
128-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
128+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
131131
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
@@ -137,7 +137,7 @@
137137
</PropertyGroup>
138138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
139139
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
140-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
140+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
141141
</PropertyGroup>
142142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143143
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>

‎test/test_component_fast/test_component_fast.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
128128
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
129-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
129+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
130130
</PropertyGroup>
131131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
132132
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
@@ -138,7 +138,7 @@
138138
</PropertyGroup>
139139
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
140140
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
141-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
141+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
142142
</PropertyGroup>
143143
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
144144
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>

‎test/test_component_folders/test_component_folders.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
127127
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
128-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
128+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
131131
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
@@ -137,7 +137,7 @@
137137
</PropertyGroup>
138138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
139139
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>
140-
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
140+
<ExecutablePath>$(VC_ExecutablePath_x86_ARM64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
141141
</PropertyGroup>
142142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
143143
<CustomBuildAfterTargets>Midl</CustomBuildAfterTargets>

0 commit comments

Comments
 (0)