Skip to content
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

Refactor F# compile order #5095

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Refactor F# compile order #5095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions ...t.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,19 @@
<FileWrites Include="$(_TestingPlatformEntryPointSourcePath)" />
</ItemGroup>
</Target>
<!-- Note: _IncludeGenerateTestingPlatformEntryPointIntoCompilation is set to depend on _IncludeGenerateAutoRegisteredExtensionsIntoCompilation -->
<!-- This is because file orders matter in F# -->

<Target Name="_IncludeGenerateTestingPlatformEntryPointIntoCompilation" BeforeTargets="BeforeCompile;XamlPreCompile"
DependsOnTargets="_CalculateGenerateTestingPlatformEntryPoint;_GenerateTestingPlatformEntryPointFileInputCache;_GenerateTestingPlatformEntryPoint;_IncludeGenerateAutoRegisteredExtensionsIntoCompilation">
DependsOnTargets="_CalculateGenerateTestingPlatformEntryPoint;_GenerateTestingPlatformEntryPointFileInputCache;_GenerateTestingPlatformEntryPoint">

<ItemGroup Condition=" '$(GenerateTestingPlatformEntryPoint)' == 'true' ">
<Compile Include="$(_TestingPlatformEntryPointSourcePath)" />
<!-- Order of files matter in F#. Make sure to include the entry-point last. -->
<!-- See https://github.com/dotnet/fsharp/blob/27db996c58a511386ad754e34f4b57877aa1d99e/src/FSharp.Build/Microsoft.FSharp.Targets#L258-L277 -->
<!-- IMPORTANT: We use CompileAfter and not CompileLast as CompileLast is quite recent: https://github.com/dotnet/fsharp/pull/17103 -->
<!-- Note that we only add the entry point in CompileAfter. The self-registered extensions is still in Compile -->
<!-- If the user enables only self-registered extensions generation and decides to write their own entry point, they should add
their entry point file to CompileAfter as well -->
<Compile Include="$(_TestingPlatformEntryPointSourcePath)" Condition=" '$(Language)' != 'F#' " />
<CompileAfter Include="$(_TestingPlatformEntryPointSourcePath)" Condition=" '$(Language)' == 'F#' " />

<!-- We need to report to the FileWrites here because is possible that we skip _GenerateTestingPlatformInjectEntryPoint and we want to correctly handle the "dotnet clean" target -->
<FileWrites Include="$(_TestingPlatformEntryPointSourcePath)" />
Expand Down