Skip to content

Fix ParallelCompilation property passing #19945

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 4 commits into from
Jun 16, 2026
Merged

Fix ParallelCompilation property passing #19945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f040678
fix ParallelCompilation prop passing in msbuild
majocha Jun 13, 2026
97dad12
try to keep ParallelCompilation optional
majocha Jun 13, 2026
2b5f872
use local props
majocha Jun 14, 2026
92ceb84
Merge branch 'main' into fix-parallelcompilation-prop
majocha Jun 15, 2026
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
1 change: 0 additions & 1 deletion src/FSharp.Build/Microsoft.FSharp.NetSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<UseStandardResourceNames Condition=" '$(UseStandardResourceNames)' == '' ">true</UseStandardResourceNames>
<FsiExec Condition=" '$(FsiExec)' == '' ">true</FsiExec>
<ReflectionFree Condition=" '$(ReflectionFree)' == '' ">false</ReflectionFree>
<ParallelCompilation Condition=" '$(ParallelCompilation)' == '' ">true</ParallelCompilation>
Comment thread
T-Gro marked this conversation as resolved.
</PropertyGroup>

<!-- BinaryFormatter is disabled (warning is treated as error) by default in .NET8+, this mirroring the change in SDK (https://github.com/dotnet/sdk/pull/31591) -->
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Build/Microsoft.FSharp.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ this file.
OtherFlags="$(FscOtherFlags)"
OutputAssembly="@(IntermediateAssembly)"
OutputRefAssembly="@(IntermediateRefAssembly)"
ParallelCompilation="@(ParallelCompilation)"
ParallelCompilation="$(ParallelCompilation)"
PathMap="$(PathMap)"
PdbFile="$(PdbFile)"
Platform="$(PlatformTarget)"
Expand Down
11 changes: 11 additions & 0 deletions tests/AheadOfTime/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,19 @@
<!-- Import target frameworks from single source of truth.
We can't import root Directory.Build.props because MSBuildThisFileDirectory would be wrong. -->
<Import Project="$(MSBuildThisFileDirectory)../../eng/TargetFrameworks.props" />

<PropertyGroup>
<LocalFSharpBuildBinPath>$(MSBuildThisFileDirectory)/../../artifacts/bin/fsc/Release/$(FSharpNetCoreProductTargetFramework)</LocalFSharpBuildBinPath>
</PropertyGroup>

<PropertyGroup>
<!--
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>
<FSharpPropsShim>$(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
<NoWarn>$(NoWarn);NU1603</NoWarn>
<!-- error NU1603: Warning As Error: Equality depends on Microsoft.NET.ILLink.Tasks
(>= 10.0.0-preview.7.25322.101) but Microsoft.NET.ILLink.Tasks 10.0.0-preview.7.25322.101 was not found.
Expand Down
7 changes: 0 additions & 7 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 @@ -17,18 +17,11 @@
</PropertyGroup>

<PropertyGroup>
<LocalFSharpBuildBinPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/$(FSharpNetCoreProductTargetFramework)</LocalFSharpBuildBinPath>
<FSharpBuildAssemblyFile>$(LocalFSharpBuildBinPath)/FSharp.Build.dll</FSharpBuildAssemblyFile>
<DotnetFscCompilerPath>$(LocalFSharpBuildBinPath)/fsc.dll</DotnetFscCompilerPath>
<Fsc_DotNET_DotnetFscCompilerPath>$(LocalFSharpBuildBinPath)/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
<FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
<!--
Comment thread
T-Gro marked this conversation as resolved.
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>

<ItemGroup>
Expand Down
Loading