Skip to content

Implement RID-specific tool packages for Microsoft.NETCore.ILAsm and ILDAsm #121282

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

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
+152 −8
Draft

Implement RID-specific tool packages for Microsoft.NETCore.ILAsm and ILDAsm #121282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e95560e
Initial plan
Copilot Nov 3, 2025
0c9236f
Add dotnet-ilasm tool wrapper for native ilasm binary
Copilot Nov 3, 2025
80c73b2
Update Microsoft.NETCore.ILAsm package to publish as dotnet tool
Copilot Nov 3, 2025
860365e
Add musl detection for Linux RID resolution
Copilot Nov 3, 2025
a970702
Remove managed wrapper based on feedback to use RID-specific tool pac…
Copilot Nov 4, 2025
5b66f25
Implement RID-specific tool packages for Microsoft.NETCore.ILAsm
Copilot Nov 4, 2025
d5a7ff9
Generate tool manifest dynamically to avoid hardcoded version
Copilot Nov 4, 2025
eb4777a
Dynamically discover RIDs and expand package description with usage e…
Copilot Nov 4, 2025
96f9187
Revert to hardcoded RID list and add FreeBSD support for community pl…
Copilot Nov 5, 2025
4f35a06
Add TargetRid entry for community platform support
Copilot Nov 5, 2025
8efc230
Simplify TargetRid handling using Exclude pattern
Copilot Nov 5, 2025
acfa357
Merge branch 'main' into copilot/fix-9141961-210716005-ba7fcf33-0366-…
jcouv Nov 6, 2025
24646d1
Add RID-specific tool package support for Microsoft.NETCore.ILDAsm
Copilot Nov 6, 2025
ac2b506
Apply suggestions from code review
jcouv Nov 6, 2025
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
6 changes: 6 additions & 0 deletions src/coreclr/.nuget/Microsoft.NETCore.ILAsm/DotnetToolSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="2">
<Commands>
<Command Name="ilasm" EntryPoint="ilasm" Runner="executable" />
</Commands>
</DotNetCliTool>
74 changes: 70 additions & 4 deletions src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,84 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<PropertyGroup>
<PackageDescription>The .NET IL Assembler.</PackageDescription>
<PackageDescription>The .NET IL Assembler.

Usage:
Install as a global tool:
dotnet tool install -g Microsoft.NETCore.ILAsm

Invoke the tool:
ilasm [options] &lt;sourcefile&gt;

For help on ilasm command-line options:
ilasm -?
</PackageDescription>
<!-- Configure as a dotnet tool -->
<PackageType>DotnetTool</PackageType>
</PropertyGroup>

<PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
<IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
<PackageTargetRuntime Condition="'$(_packageTargetOSGroup)' == 'windows'">$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
</PropertyGroup>

<ItemGroup>
<NativeBinary Condition="'$(PackCrossComponent)' != 'true'" Include="$(RuntimeBinDir)ilasm$(ExeSuffix)" />
<NativeBinary Condition="'$(PackCrossComponent)' == 'true'" Include="$(RuntimeBinDir)$(BuildArchitecture)/ilasm$(ExeSuffix)" />
<!-- For RID-specific tool packages, include the native binary in tools folder -->
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<File Include="$(RuntimeBinDir)ilasm$(ExeSuffix)" Condition="'$(PackCrossComponent)' != 'true'">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
<File Include="$(RuntimeBinDir)$(BuildArchitecture)/ilasm$(ExeSuffix)" Condition="'$(PackCrossComponent)' == 'true'">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
<!-- Include tool settings manifest for RID-specific packages -->
<File Include="$(MSBuildThisFileDirectory)DotnetToolSettings.xml">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
</ItemGroup>

<!-- For primary (non-RID-specific) package, generate and include manifest that references RID-specific packages -->
<Target Name="GeneratePrimaryToolManifest" BeforeTargets="GetPackageFiles" Condition="'$(PackageTargetRuntime)' == ''">
<!-- Define official RID list -->
<ItemGroup>
<_OfficialRID Include="win-x64" />
<_OfficialRID Include="win-x86" />
<_OfficialRID Include="win-arm64" />
<_OfficialRID Include="linux-x64" />
<_OfficialRID Include="linux-arm" />
<_OfficialRID Include="linux-arm64" />
<_OfficialRID Include="linux-musl-x64" />
<_OfficialRID Include="linux-musl-arm64" />
<_OfficialRID Include="osx-x64" />
<_OfficialRID Include="osx-arm64" />
<!-- Add TargetRid if not already in the official list -->
<_OfficialRID Include="$(TargetRid)" Exclude="@(_OfficialRID)" />
</ItemGroup>

<PropertyGroup>
<_GeneratedManifestPath>$(IntermediateOutputPath)DotnetToolSettings.xml</_GeneratedManifestPath>
<_RidPackagesXml>@(_OfficialRID->' &lt;RuntimeIdentifierPackage RuntimeIdentifier=&quot;%(Identity)&quot; Id=&quot;runtime.%(Identity).Microsoft.NETCore.ILAsm&quot; Version=&quot;$(PackageVersion)&quot; /&gt;', '%0a')</_RidPackagesXml>
<_ManifestContent>
<![CDATA[<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="2">
<Commands>
<Command Name="ilasm" />
</Commands>
<RuntimeIdentifierPackages>
]]>$(_RidPackagesXml)<![CDATA[
</RuntimeIdentifierPackages>
</DotNetCliTool>]]>
</_ManifestContent>
</PropertyGroup>

<MakeDir Directories="$(IntermediateOutputPath)" />
<WriteLinesToFile File="$(_GeneratedManifestPath)" Lines="$(_ManifestContent)" Overwrite="true" />

<ItemGroup>
<File Include="$(_GeneratedManifestPath)">
<TargetPath>tools/$(NetCoreAppToolCurrent)/any/DotnetToolSettings.xml</TargetPath>
</File>
</ItemGroup>
</Target>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
6 changes: 6 additions & 0 deletions src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/DotnetToolSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="2">
<Commands>
<Command Name="ildasm" EntryPoint="ildasm" Runner="executable" />
</Commands>
</DotNetCliTool>
74 changes: 70 additions & 4 deletions src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,84 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<PropertyGroup>
<PackageDescription>The .NET IL Disassembler.</PackageDescription>
<PackageDescription>The .NET IL Disassembler.

Usage:
Install as a global tool:
dotnet tool install -g Microsoft.NETCore.ILDAsm

Invoke the tool:
ildasm [options] &lt;file&gt;

For help on ildasm command-line options:
ildasm -?
</PackageDescription>
<!-- Configure as a dotnet tool -->
<PackageType>DotnetTool</PackageType>
</PropertyGroup>

<PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
<IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
<PackageTargetRuntime Condition="'$(_packageTargetOSGroup)' == 'windows'">$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
</PropertyGroup>

<ItemGroup>
<NativeBinary Condition="'$(PackCrossComponent)' != 'true'" Include="$(RuntimeBinDir)ildasm$(ExeSuffix)" />
<NativeBinary Condition="'$(PackCrossComponent)' == 'true'" Include="$(RuntimeBinDir)$(BuildArchitecture)/ildasm$(ExeSuffix)" />
<!-- For RID-specific tool packages, include the native binary in tools folder -->
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<File Include="$(RuntimeBinDir)ildasm$(ExeSuffix)" Condition="'$(PackCrossComponent)' != 'true'">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
<File Include="$(RuntimeBinDir)$(BuildArchitecture)/ildasm$(ExeSuffix)" Condition="'$(PackCrossComponent)' == 'true'">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
<!-- Include tool settings manifest for RID-specific packages -->
<File Include="$(MSBuildThisFileDirectory)DotnetToolSettings.xml">
<TargetPath>tools/$(NetCoreAppToolCurrent)/$(PackageTargetRuntime)/</TargetPath>
</File>
</ItemGroup>

<!-- For primary (non-RID-specific) package, generate and include manifest that references RID-specific packages -->
<Target Name="GeneratePrimaryToolManifest" BeforeTargets="GetPackageFiles" Condition="'$(PackageTargetRuntime)' == ''">
<!-- Define official RID list -->
<ItemGroup>
<_OfficialRID Include="win-x64" />
<_OfficialRID Include="win-x86" />
<_OfficialRID Include="win-arm64" />
<_OfficialRID Include="linux-x64" />
<_OfficialRID Include="linux-arm" />
<_OfficialRID Include="linux-arm64" />
<_OfficialRID Include="linux-musl-x64" />
<_OfficialRID Include="linux-musl-arm64" />
<_OfficialRID Include="osx-x64" />
<_OfficialRID Include="osx-arm64" />
<!-- Add TargetRid if not already in the official list -->
<_OfficialRID Include="$(TargetRid)" Exclude="@(_OfficialRID)" />
</ItemGroup>

<PropertyGroup>
<_GeneratedManifestPath>$(IntermediateOutputPath)DotnetToolSettings.xml</_GeneratedManifestPath>
<_RidPackagesXml>@(_OfficialRID->' &lt;RuntimeIdentifierPackage RuntimeIdentifier=&quot;%(Identity)&quot; Id=&quot;runtime.%(Identity).Microsoft.NETCore.ILDAsm&quot; Version=&quot;$(PackageVersion)&quot; /&gt;', '%0a')</_RidPackagesXml>
<_ManifestContent>
<![CDATA[<?xml version="1.0" encoding="utf-8"?>
<DotNetCliTool Version="2">
<Commands>
<Command Name="ildasm" />
</Commands>
<RuntimeIdentifierPackages>
]]>$(_RidPackagesXml)<![CDATA[
</RuntimeIdentifierPackages>
</DotNetCliTool>]]>
</_ManifestContent>
</PropertyGroup>

<MakeDir Directories="$(IntermediateOutputPath)" />
<WriteLinesToFile File="$(_GeneratedManifestPath)" Lines="$(_ManifestContent)" Overwrite="true" />

<ItemGroup>
<File Include="$(_GeneratedManifestPath)">
<TargetPath>tools/$(NetCoreAppToolCurrent)/any/DotnetToolSettings.xml</TargetPath>
</File>
</ItemGroup>
</Target>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
Loading