Skip to content

Commit 60673e6

Browse files
lextmhalter73
authored andcommitted
Fixed CI build errors.
1 parent 1a8e2db commit 60673e6

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
'$(PackageLicenseExpression)' " />
8383
</Target>
8484

85-
<Target Name="BeforeBuild">
85+
<Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'">
8686
<MSBuild Projects="..\Forwarders\build.proj" />
8787
</Target>
8888
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
call %1 -host_arch=x64 -arch=arm64
1+
call %1 -host_arch=x64 -arch=arm64 -no_logo
22
call build.cmd %2 %3
Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
SET objDir=%1
22
SET binDir=%2
33

4-
mkdir %objDir%
5-
mkdir %binDir%
4+
cl /nologo /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp
5+
cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
66

7-
cl /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp
8-
cl /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
7+
link /lib /nologo /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
8+
link /lib /nologo /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
99

10-
link /lib /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
11-
link /lib /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
10+
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
1211

13-
link /dll /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
12+
cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
13+
cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
1414

15-
cl /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
16-
cl /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
17-
18-
link /lib /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
15+
link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
1916
link /lib /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
2017

21-
link /dll /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib
18+
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
</PropertyGroup>
1515
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1616
<PropertyGroup>
17-
<Prompt>&quot;$(DevEnvDir)\..\Tools\VsDevCmd&quot;</Prompt>
17+
<Prompt>&quot;$(VSInstallDir)Common7\Tools\VsDevCmd&quot;</Prompt>
1818
</PropertyGroup>
19-
<Target Name="Build">
19+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
20+
<Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
21+
<MakeDir Directories="$(ObjDir);$(BinDir)" />
2022
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir)" />
2123
</Target>
2224
</Project>

0 commit comments

Comments
 (0)