Skip to content

Work around arm64 forwarder Linker bug #62585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -440,5 +440,22 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<Dependency Name="Microsoft.Build" Version="17.12.36">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="17.12.36">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.12.36">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.12.36">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
9 changes: 5 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@
<MicrosoftEntityFrameworkCoreToolsVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/msbuild -->
<MicrosoftBuildVersion>17.12.36</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>17.12.36</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.12.36</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.12.36</MicrosoftBuildUtilitiesCoreVersion>
<!-- Packages from dotnet/sdk -->
<MicrosoftDotNetHotReloadAgentVersion>10.0.100-preview.7.25351.105</MicrosoftDotNetHotReloadAgentVersion>
<MicrosoftDotNetHotReloadAgentDataVersion>10.0.100-preview.7.25351.105</MicrosoftDotNetHotReloadAgentDataVersion>
Expand Down Expand Up @@ -224,10 +229,6 @@
<!-- Partner teams -->
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
<MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>17.8.29</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.8.29</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.8.29</MicrosoftBuildUtilitiesCoreVersion>
<!--
Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
framework in current .NET SDKs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ cl /nologo /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 /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %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 %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib /FORCE:UNRESOLVED

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

link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%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 %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /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 %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
<MakeDir Directories="$(ObjDir);$(BinDir)" />
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" />
<!-- Ignore link.exe ARM64X pure forwarder bug -->
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" IgnoreExitCode="true" />
</Target>
</Project>
Loading