Skip to content

Fix ILLink.Substitutions.xml not being embedded in F# assemblies #19124

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
T-Gro merged 11 commits into from
Dec 4, 2025
Merged

Fix ILLink.Substitutions.xml not being embedded in F# assemblies #19124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
635ae70
Initial plan
Copilot Dec 2, 2025
1d230e9
Fix ILLink Substitutions MSBuild Output ItemName and add unit tests
Copilot Dec 2, 2025
b4e604e
Address code review: add null checks for XML attributes in tests
Copilot Dec 2, 2025
f50c700
Merge branch 'main' into copilot/improve-msbuild-integration
T-Gro Dec 3, 2025
be13f67
Remove standalone unit tests, use real product targets in integration…
Copilot Dec 3, 2025
6a5af33
Update test to match product targets and add comments documenting the…
Copilot Dec 3, 2025
7eaf4eb
Add missing FSharp.Core condition to match product targets exactly
Copilot Dec 3, 2025
9d6756b
Use FSharpTargetsShim instead of duplicating target logic
Copilot Dec 3, 2025
dab957f
Fix comment format to use full URL reference
Copilot Dec 3, 2025
f4bd37d
Add GenerateILLinkSubstitutions task to UseLocalCompiler.Directory.Bu…
Copilot Dec 3, 2025
157fe7f
Simplify UseLocalCompiler.Directory.Build.props by relying on FSharpT…
Copilot Dec 3, 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
9 changes: 6 additions & 3 deletions UseLocalCompiler.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
</PropertyGroup>

<!--
Use FSharpTargetsShim to redirect the SDK to use the locally built F# targets.
This replaces all the individual UsingTask overrides since Microsoft.FSharp.NetSdk.targets
imports Microsoft.FSharp.Targets which registers all the F# build tasks.
See: https://github.com/dotnet/sdk/blob/main/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharpTargetsShim.targets
-->
<PropertyGroup Condition="'$(LoadLocalFSharpBuild)' == 'True'">
<LocalFSharpBuildBinPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net10.0</LocalFSharpBuildBinPath>
<FSharpBuildAssemblyFile>$(LocalFSharpBuildBinPath)/FSharp.Build.dll</FSharpBuildAssemblyFile>
Expand All @@ -27,9 +33,6 @@
<FSharpOverridesTargetsShim>$(LocalFSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
</PropertyGroup>

<UsingTask Condition="'$(LoadLocalFSharpBuild)' == 'True'" TaskName="FSharpEmbedResourceText" AssemblyFile="$(FSharpBuildAssemblyFile)" Override="true" />
<UsingTask Condition="'$(LoadLocalFSharpBuild)' == 'True'" TaskName="FSharpEmbedResXSource" AssemblyFile="$(FSharpBuildAssemblyFile)" Override="true" />

<ItemGroup>
<Reference Include="$(LocalFSharpCompilerPath)/artifacts/bin/FSharp.Core/$(LocalFSharpCompilerConfiguration)/netstandard2.0/FSharp.Core.dll" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Build/Microsoft.FSharp.NetSdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<GenerateILLinkSubstitutions
AssemblyName="$(AssemblyName)"
IntermediateOutputPath="$(IntermediateOutputPath)">
<Output TaskParameter="GeneratedItems" ItemName="Embed" />
<Output TaskParameter="GeneratedItems" ItemName="EmbeddedResource" />
</GenerateILLinkSubstitutions>
</Target>

Expand Down
16 changes: 6 additions & 10 deletions ...Trimming/FSharpMetadataResource_Trimming_Test/FSharpMetadataResource_Trimming_Test.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,13 @@
<Fsc_DotNET_DotnetFscCompilerPath>$(LocalFSharpBuildBinPath)/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
<FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
<!--
Use FSharpTargetsShim to redirect to the locally built targets file.
This is how the .NET SDK supports testing against local F# builds.
See https://github.com/dotnet/sdk/blob/main/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharpTargetsShim.targets
-->
<FSharpTargetsShim>$(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
</PropertyGroup>

<UsingTask TaskName="GenerateILLinkSubstitutions" AssemblyFile="$(FSharpBuildAssemblyFile)" Override="true" />

<Target Name="GenerateFSharpILLinkSubstitutions" BeforeTargets="AssignTargetPaths">
<GenerateILLinkSubstitutions
AssemblyName="$(AssemblyName)"
IntermediateOutputPath="$(IntermediateOutputPath)">
<Output TaskParameter="GeneratedItems" ItemName="EmbeddedResource" />
</GenerateILLinkSubstitutions>
</Target>

<ItemGroup>
<Compile Include="..\Program.fs" />
Expand Down
Loading