Skip to content

Commit

Permalink
Fixed CI build errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
lextm authored and halter73 committed Dec 14, 2024
1 parent 08dbcb6 commit fbf7f11
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
'$(PackageLicenseExpression)' " />
</Target>

<Target Name="BeforeBuild">
<Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'">
<MSBuild Projects="..\Forwarders\build.proj" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
call %1 -host_arch=x64 -arch=arm64
call %1 -host_arch=x64 -arch=arm64 -no_logo
call build.cmd %2 %3
21 changes: 9 additions & 12 deletions src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
SET objDir=%1
SET binDir=%2

mkdir %objDir%
mkdir %binDir%
cl /nologo /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp
cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp

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

link /lib /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
link /lib /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
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

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
cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp

cl /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
cl /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp

link /lib /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
link /lib /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib

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
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<Prompt>&quot;$(DevEnvDir)\..\Tools\VsDevCmd&quot;</Prompt>
<Prompt>&quot;$(VSInstallDir)Common7\Tools\VsDevCmd&quot;</Prompt>
</PropertyGroup>
<Target Name="Build">
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
<MakeDir Directories="$(ObjDir);$(BinDir)" />
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir)" />
</Target>
</Project>

0 comments on commit fbf7f11

Please sign in to comment.