From 3fe7c8269551198605af063357ff7dcb8594277f Mon Sep 17 00:00:00 2001
From: am11 <3840695+am11@users.noreply.github.com>
Date: Sat, 31 Oct 2026 18:37:59 +0200
Subject: [PATCH] Fix NativeAOT tool package paths for extensionless
 executables

---
 eng/NativeAotToolPackage.targets | 7 ++++++-
 eng/pipelines/coreclr/ilasm.yml  | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eng/NativeAotToolPackage.targets b/eng/NativeAotToolPackage.targets
index b77e015041ba6c..4875ea21036231 100644
--- a/eng/NativeAotToolPackage.targets
+++ b/eng/NativeAotToolPackage.targets
@@ -29,9 +29,14 @@
     <ItemGroup>
       <_NativeAotToolPackageFile Include="@(PublishItemsOutputGroupOutputs->'%(OutputPath)')">
         <PackagePath>runtimes/$(PackageTargetRuntime)/native/%(PublishItemsOutputGroupOutputs.TargetPath)</PackagePath>
+        <!-- NuGet treats a PackagePath without the file's extension as a folder, which would nest extensionless Unix executables in a folder of their own name. -->
+        <PackageFolder>runtimes/$(PackageTargetRuntime)/native/$([System.IO.Path]::GetDirectoryName('%(PublishItemsOutputGroupOutputs.TargetPath)'))</PackageFolder>
         <IsSymbolFile Condition="'%(Extension)' == '.pdb' or '%(Extension)' == '.dbg' or '%(Extension)' == '.dwarf'">true</IsSymbolFile>
       </_NativeAotToolPackageFile>
-      <Content Include="@(_NativeAotToolPackageFile)" Pack="true" Condition="'%(_NativeAotToolPackageFile.IsSymbolFile)' != 'true'" />
+      <Content Include="@(_NativeAotToolPackageFile)"
+               Pack="true"
+               PackagePath="%(_NativeAotToolPackageFile.PackageFolder)"
+               Condition="'%(_NativeAotToolPackageFile.IsSymbolFile)' != 'true'" />
       <_TargetPathsToSymbols Include="@(_NativeAotToolPackageFile)"
                              Condition="'%(_NativeAotToolPackageFile.IsSymbolFile)' == 'true'"
                              FinalOutputPath="%(_NativeAotToolPackageFile.Identity)"
diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml
index 2f744d487a05ee..a9780531f8b072 100644
--- a/eng/pipelines/coreclr/ilasm.yml
+++ b/eng/pipelines/coreclr/ilasm.yml
@@ -15,6 +15,7 @@ pr:
     - src/coreclr/.nuget/Microsoft.NETCore.ILAsm/*
     - src/coreclr/.nuget/package-rids.props
     - src/tasks/installer.tasks/*
+    - eng/NativeAotToolPackage.targets
     - eng/Subsets.props
 
 schedules: