Skip to content

Enable packaging of dotnet-aot #54056

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.

Sign up for GitHub

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

Merged
NikolaMilosavljevic merged 5 commits into from
Apr 24, 2026
Merged

Enable packaging of dotnet-aot #54056

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a107ef
Enable packaging of dotnet-aot
NikolaMilosavljevic Apr 23, 2026
6511c65
Remove redundant property recomputation in ChmodPublishDir
NikolaMilosavljevic Apr 23, 2026
5e4b2f5
Merge branch 'main' into dotnet-aot.pkg
NikolaMilosavljevic Apr 23, 2026
a5cfd8a
Restrict dotnet-aot publishing to native builds only
NikolaMilosavljevic Apr 23, 2026
11f0411
Use separate intermediate directory for dotnet-aot restore
NikolaMilosavljevic Apr 24, 2026
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
47 changes: 46 additions & 1 deletion src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,58 @@
<Copy SourceFiles="@(NativeRestoredAppHostNETCore)" DestinationFolder="$(AppHostTemplatePath)" SkipUnchangedFiles="true" />
</Target>

<!--
Publish the dotnet-aot NativeAOT shared library.
This provides fast CLI startup for simple commands (e.g. version, info) by handling
them entirely in native code, falling back to the managed dotnet.dll for other commands.
The output is placed next to dotnet.dll so it's packaged with the SDK.

Only runs for native builds (TargetRid == HostRid) on supported platforms.
Cross-compilation is not supported as NativeAOT requires native toolchain for target platform.
-->
<Target Name="PublishDotnetAot"
Condition="'$(TargetRid)' == '$(HostRid)' and ($(TargetRid.StartsWith('win')) or $(TargetRid.StartsWith('linux')) or $(TargetRid.StartsWith('osx')))">
<PropertyGroup>
<!-- Define platform-specific native library naming -->
<_DotnetAotNativeLibPrefix Condition="'$(OSName)' != 'win'">lib</_DotnetAotNativeLibPrefix>
<_DotnetAotNativeLibExtension Condition="'$(OSName)' == 'win'">.dll</_DotnetAotNativeLibExtension>
<_DotnetAotNativeLibExtension Condition="'$(OSName)' == 'osx'">.dylib</_DotnetAotNativeLibExtension>
<_DotnetAotNativeLibExtension Condition="'$(_DotnetAotNativeLibExtension)' == ''">.so</_DotnetAotNativeLibExtension>
<_DotnetAotNativeLibName>$(_DotnetAotNativeLibPrefix)dotnet-aot$(_DotnetAotNativeLibExtension)</_DotnetAotNativeLibName>

<_DotnetAotPublishDir>$(ArtifactsBinDir)dotnet-aot-redist\$(Configuration)\$(SdkTargetFramework)\$(TargetRid)\publish\</_DotnetAotPublishDir>
<!-- Use separate intermediate directory to avoid restore conflicts with main build -->
<_DotnetAotIntermediateDir>$(ArtifactsObjDir)dotnet-aot-redist\$(Configuration)\$(TargetRid)\</_DotnetAotIntermediateDir>
</PropertyGroup>

<!-- Restore and publish the dotnet-aot project as a NativeAOT shared library -->
<MSBuild
Targets="Restore;Publish"
Projects="$(RepoRoot)/src/Cli/dotnet-aot/dotnet-aot.csproj"
Properties="Configuration=$(Configuration);RuntimeIdentifier=$(TargetRid);PublishDir=$(_DotnetAotPublishDir);IntermediateOutputPath=$(_DotnetAotIntermediateDir)" />

<!-- Verify the native library was produced -->
<Error Condition="!Exists('$(_DotnetAotPublishDir)$(_DotnetAotNativeLibName)')"
Text="dotnet-aot native library not found at '$(_DotnetAotPublishDir)$(_DotnetAotNativeLibName)'. NativeAOT publish may have failed for RID '$(TargetRid)'." />

<!-- Copy the native library to the SDK output directory -->
<Copy
SourceFiles="$(_DotnetAotPublishDir)$(_DotnetAotNativeLibName)"
DestinationFolder="$(OutputPath)"
SkipUnchangedFiles="true" />
</Target>

Comment thread
NikolaMilosavljevic marked this conversation as resolved.
<Target Name="ChmodPublishDir"
DependsOnTargets="GenerateCliRuntimeConfigurationFiles;CreateMSBuildAppHost"
DependsOnTargets="GenerateCliRuntimeConfigurationFiles;CreateMSBuildAppHost;PublishDotnetAot"
Condition="'$(OSName)' != 'win'">

<Exec Command="find $(OutputPath) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(OutputPath) -type f -exec chmod 644 {} \;" />
<Exec Command="chmod 755 %(_RoslynAppHost.RootDir)%(_RoslynAppHost.Directory)%(_RoslynAppHost.Filename)" />
<Exec Command="chmod 755 %(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)%(_MSBuildAppHost.Filename)" />
<!-- Make dotnet-aot native shared library executable (only if it exists for this RID) -->
<Exec Command="chmod 755 $(OutputPath)$(_DotnetAotNativeLibName)"
Condition="Exists('$(OutputPath)$(_DotnetAotNativeLibName)')" />
</Target>

<Target Name="DeleteSymbolsFromPublishDir" DependsOnTargets="GenerateCliRuntimeConfigurationFiles">
Expand Down Expand Up @@ -574,6 +618,7 @@
GeneratePackagePruneData;
PublishContainersSdk;
GenerateCliRuntimeConfigurationFiles;
PublishDotnetAot;
CreateMSBuildAppHost;
MakeFscRunnableAndMoveToPublishDir;
RemoveFscFilesAfterPublish;
Expand Down
Loading