Skip to content

Generate build metadata for illink #109376

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
ViktorHofer merged 3 commits into from
Oct 31, 2024
Merged

Generate build metadata for illink #109376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96c7f3f
Generate build metadata for illink
am11 Oct 30, 2024
81d5910
Use [MSBuild]::Escape to improve readability
am11 Oct 31, 2024
99e2602
Merge branch 'main' into feature/gen-build-metadata
am11 Oct 31, 2024
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
30 changes: 30 additions & 0 deletions src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,34 @@
</ProjectReference>
</ItemGroup>

<Target Name="GenerateBuildMetadata" BeforeTargets="BeforeBuild"
Inputs="$(MSBuildProjectFile)"
Outputs="$(IntermediateOutputPath)Generated_BuildMetadata.cs">

<PropertyGroup>
<BuildMetadataContents>
<![CDATA[
// <autogenerated />

internal static class BuildMetadata
{
public const string ILLinkImplFramework = "$(NetCoreAppToolCurrent)";
}
]]>
</BuildMetadataContents>
</PropertyGroup>

<WriteLinesToFile
File="$(IntermediateOutputPath)Generated_BuildMetadata.cs"
Lines="$([MSBuild]::Escape($(BuildMetadataContents)))"
Overwrite="true" />

<ItemGroup>
<Compile Include="$(IntermediateOutputPath)Generated_BuildMetadata.cs" />

<!-- Append to FileWrites so the file will be removed on clean -->
<FileWrites Include="$(IntermediateOutputPath)Generated_BuildMetadata.cs" />
</ItemGroup>
Comment thread
ViktorHofer marked this conversation as resolved.
</Target>

</Project>
9 changes: 8 additions & 1 deletion src/tools/illink/src/ILLink.Tasks/LinkTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,15 @@ public string ILLinkPath {
#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file

// IL Linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net9.0", "illink.dll");
// ILLinkImplFramework ()= NetCoreAppToolCurrent) was used to build the corresponding illink.dll
string path = Path.Combine (Path.GetDirectoryName (taskDirectory), BuildMetadata.ILLinkImplFramework, "illink.dll");

Log.LogMessage(MessageImportance.Normal, $"ILLink.Tasks path: {path}");

_illinkPath = path;

return _illinkPath;
}
set => _illinkPath = value;
Expand Down