Skip to content

Fix FSharp.Core references in FCS solution #13827

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
merged 8 commits into from
Sep 21, 2022
Merged

Fix FSharp.Core references in FCS solution #13827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76a6ab9
Allow using FSharp.Core package in new service solution projects
auduchinok Sep 1, 2022
4f72a96
Remove inner rules
auduchinok Sep 1, 2022
81db886
Another FSharp.Core reference
auduchinok Sep 2, 2022
3d53168
Merge branch 'main' into fsCore-refs
auduchinok Sep 9, 2022
648d327
Fix relative path
auduchinok Sep 9, 2022
1cb1a5c
Merge branch 'main' into fsCore-refs
vzarytovskii Sep 12, 2022
d77b7b6
Merge branch 'main' into fsCore-refs
KevinRansom Sep 12, 2022
847d6f3
Merge branch 'main' into fsCore-refs
vzarytovskii Sep 15, 2022
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: 9 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
<Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
<Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>

<!--
When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local
FSharp.Core project.
-->
<PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
<FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
</PropertyGroup>

<ItemGroup>
<!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
<None Include="README.md" Condition="Exists('README.md')" />
Expand Down
9 changes: 0 additions & 9 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<!--
When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local
FSharp.Core project.
-->
<PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
<FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
</PropertyGroup>

<PropertyGroup>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UseStandardResourceNames>false</UseStandardResourceNames>
Expand Down
9 changes: 8 additions & 1 deletion tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,15 @@
<ItemGroup>
<ProjectReference Include="$(FSharpSourcesRoot)\Compiler\FSharp.Compiler.Service.fsproj" />
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
<ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
</ItemGroup>

</Project>
9 changes: 8 additions & 1 deletion tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,23 @@
<!-- Reference a project -->
<ItemGroup Condition="'$(FcsReferenceType)' == 'project'">
<ProjectReference Include="$(FcsProjectPath)" />
<ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>
<!-- Reference the FCS NuGet package with the specified $FcsVersion, use locally built FSharp.Core
Arguably this could be changed to depend on the version of FSharp.Core that's pulled in via FSharp.Compiler.Service.
Keeping the old behaviour for now
-->
<ItemGroup Condition=" '$(FcsReferenceType)' == 'nuget' ">
<PackageReference Include="FSharp.Compiler.Service" Version="$(FcsNuGetVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
<ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
</ItemGroup>

<!-- Reference the dlls specified in $FcsDllPath and $FSharpCoreDllPath -->
<ItemGroup Condition=" '$(FcsReferenceType)' == 'dll' ">
<Reference Include="FSharp.Compiler.Service">
Expand Down
9 changes: 8 additions & 1 deletion tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,15 @@

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Compiler\FSharp.Compiler.Service.fsproj" />
<ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
<ProjectReference Include="..\BenchmarkComparison\HistoricalBenchmark.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
<ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
</ItemGroup>

</Project>