Skip to content

Merge main to release/dev16.8 #10146

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
cartermp merged 2 commits into from
Sep 18, 2020
Merged

Merge main to release/dev16.8 #10146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b961918
Update compiler-guide.md (#10142)
dsyme Sep 17, 2020
2ece8d9
Create fcs solution (#10137)
KevinRansom Sep 17, 2020
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
25 changes: 25 additions & 0 deletions FSharp.Compiler.Service.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30503.244
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{A59DB8AE-8044-41A5-848A-800A7FF31C93}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A59DB8AE-8044-41A5-848A-800A7FF31C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A59DB8AE-8044-41A5-848A-800A7FF31C93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A59DB8AE-8044-41A5-848A-800A7FF31C93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A59DB8AE-8044-41A5-848A-800A7FF31C93}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F9A60F3B-D894-4C8E-BA0F-C51115B25A5A}
EndGlobalSection
EndGlobal
9 changes: 0 additions & 9 deletions FSharp.Compiler.Service.slnf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/compiler-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The following are the most relevant parts of the F# compiler tooling, making up

The following is a diagram of how different phases of F# compiler work:

![F# compiler phases](../../../images/fsharp/fsharp-compiler-phases.png)
![F# compiler phases](http://fsharp.github.io/img/fscomp-phases.png)

The following are the key phases and high-level logical operations of the F# compiler code in its various configurations:

Expand Down
9 changes: 9 additions & 0 deletions src/fsharp/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

<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>
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
Expand Down
8 changes: 0 additions & 8 deletions src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,14 +719,6 @@
</Compile>
</ItemGroup>

<PropertyGroup>
<!--
Some users have found it easier to work on FSharp.CompilerService when referencing the nuget package rather than the fsharp.core project
set FSHARPCORE_USE_PACKAGE to true to use package
-->
<FSHARPCORE_USE_PACKAGE>false</FSHARPCORE_USE_PACKAGE>
</PropertyGroup>

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