Skip to content

Commit 14d98da

Browse files
dsymedsyme
committed
Merge pull request #472 from dsyme/fix-tpexpres
Fix expressions for provided method calls
2 parents 6239614 + 2a7509d commit 14d98da

File tree

73 files changed

+3851
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3851
-138
lines changed

‎FSharp.Compiler.Service.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30501.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.23107.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B68AE6-E7A4-4D43-9B34-FFA74BFE192B}"
66
ProjectSection(SolutionItems) = preProject
@@ -57,7 +57,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsc", "samples\FscExe\Fsc.f
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp_Analysis", "tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj", "{887630A3-4B1D-40EA-B8B3-2D842E9C40DB}"
5959
EndProject
60-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.ProjectCracker.Exe", "src\fsharp\FSharp.Compiler.Service.ProjectCracker.Exe\FSharp.Compiler.Service.ProjectCracker.Exe.fsproj", "{B1BDD96D-47E1-4E65-8107-FBAE23A06DB4}"
60+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.ProjectCracker.Tool", "src\fsharp\FSharp.Compiler.Service.ProjectCracker.Tool\FSharp.Compiler.Service.ProjectCracker.Tool.fsproj", "{B1BDD96D-47E1-4E65-8107-FBAE23A06DB4}"
6161
EndProject
6262
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.ProjectCracker", "src\fsharp\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj", "{893C3CD9-5AF8-4027-A667-21E62FC2C703}"
6363
EndProject

‎RELEASE_NOTES.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#### 2.0.0.0-beta
2+
* Feature #470, #478, #479 - Move ProjectCracker to separate nuget package and DLL, used ProjectCracker.Tool.exe to run
3+
* Feature #463 - Expose slot signatures of members in object expressions
4+
* Feature #469, #475 - Add EvalExpressionNonThrowing, EvalInteractionNonThrowing, EvalScriptNonThrowing
5+
* Fix #456 - FCS makes calls to kernel32.dll when running on OSX
6+
* Fix #473 - stack overflow in resolution logic
7+
* Fix #460 - Failure getting expression for a provided method call
8+
19
#### 1.4.2.1 -
210
* #450 - Correct generation of ReferencedProjects
311

‎nuget/paket.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ tags
1616
F#, fsharp, interactive, compiler, editor
1717
files
1818
../bin/v4.0/FSharp.Compiler.Service.dll ==> lib/net40
19-
../bin/v4.0/FSharp.Compiler.Service.XML ==> lib/net40
19+
../bin/v4.0/FSharp.Compiler.Service.xml ==> lib/net40
2020
../bin/v4.0/FSharp.Compiler.Service.?db ==> lib/net40
2121
../bin/v4.0/FSharp.Compiler.Service.dll.?db ==> lib/net40
2222
../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
23-
../bin/v4.5/FSharp.Compiler.Service.XML ==> lib/net45
23+
../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
2424
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
2525
../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45

‎nuget/projectcracker.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.p
1212
tags
1313
F#, fsharp, msbuild, editor
1414
files
15-
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.exe ==> lib/net45
16-
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.?db ==> lib/net45
17-
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.exe.?db ==> lib/net45
15+
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.exe ==> lib/net45
16+
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.?db ==> lib/net45
17+
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.exe.?db ==> lib/net45
1818
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
19-
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.XML ==> lib/net45
19+
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
2020
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.?db ==> lib/net45
2121
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll.?db ==> lib/net45

‎samples/EditorService/EditorService.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<WarningLevel>3</WarningLevel>
2424
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<DocumentationFile>bin\Debug\EditorService.XML</DocumentationFile>
25+
<DocumentationFile>bin\Debug\EditorService.xml</DocumentationFile>
2626
<Prefer32Bit>true</Prefer32Bit>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<WarningLevel>3</WarningLevel>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
36-
<DocumentationFile>bin\Release\EditorService.XML</DocumentationFile>
36+
<DocumentationFile>bin\Release\EditorService.xml</DocumentationFile>
3737
<Prefer32Bit>true</Prefer32Bit>
3838
</PropertyGroup>
3939
<ItemGroup>

‎samples/FscExe/Fsc.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<DefineConstants>TRACE;DEBUG</DefineConstants>
2626
<WarningLevel>3</WarningLevel>
2727
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DocumentationFile>bin\Debug\FsiExe.XML</DocumentationFile>
28+
<DocumentationFile>bin\Debug\FsiExe.xml</DocumentationFile>
2929
<Prefer32Bit>true</Prefer32Bit>
3030
<StartArguments>
3131
</StartArguments>
@@ -38,7 +38,7 @@
3838
<DefineConstants>TRACE</DefineConstants>
3939
<WarningLevel>3</WarningLevel>
4040
<PlatformTarget>AnyCPU</PlatformTarget>
41-
<DocumentationFile>bin\Release\FsiExe.XML</DocumentationFile>
41+
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>
4242
<Prefer32Bit>true</Prefer32Bit>
4343
</PropertyGroup>
4444
<ItemGroup>

‎samples/FsiExe/FsiExe.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>TRACE;DEBUG</DefineConstants>
2323
<WarningLevel>3</WarningLevel>
2424
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<DocumentationFile>bin\Debug\FsiExe.XML</DocumentationFile>
25+
<DocumentationFile>bin\Debug\FsiExe.xml</DocumentationFile>
2626
<Prefer32Bit>true</Prefer32Bit>
2727
<StartArguments>
2828
</StartArguments>
@@ -35,7 +35,7 @@
3535
<DefineConstants>TRACE</DefineConstants>
3636
<WarningLevel>3</WarningLevel>
3737
<PlatformTarget>AnyCPU</PlatformTarget>
38-
<DocumentationFile>bin\Release\FsiExe.XML</DocumentationFile>
38+
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>
3939
<Prefer32Bit>true</Prefer32Bit>
4040
</PropertyGroup>
4141
<ItemGroup>

‎samples/InteractiveService/InteractiveService.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<WarningLevel>3</WarningLevel>
2424
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<DocumentationFile>bin\Debug\InteractiveService.XML</DocumentationFile>
25+
<DocumentationFile>bin\Debug\InteractiveService.xml</DocumentationFile>
2626
<Prefer32Bit>true</Prefer32Bit>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<WarningLevel>3</WarningLevel>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
36-
<DocumentationFile>bin\Release\InteractiveService.XML</DocumentationFile>
36+
<DocumentationFile>bin\Release\InteractiveService.xml</DocumentationFile>
3737
<Prefer32Bit>true</Prefer32Bit>
3838
</PropertyGroup>
3939
<ItemGroup>

‎samples/Tokenizer/Tokenizer.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<WarningLevel>3</WarningLevel>
2424
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<DocumentationFile>bin\Debug\Tokenizer.XML</DocumentationFile>
25+
<DocumentationFile>bin\Debug\Tokenizer.xml</DocumentationFile>
2626
<Prefer32Bit>true</Prefer32Bit>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<WarningLevel>3</WarningLevel>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
36-
<DocumentationFile>bin\Release\Tokenizer.XML</DocumentationFile>
36+
<DocumentationFile>bin\Release\Tokenizer.xml</DocumentationFile>
3737
<Prefer32Bit>true</Prefer32Bit>
3838
</PropertyGroup>
3939
<ItemGroup>

‎samples/UntypedTree/UntypedTree.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<WarningLevel>3</WarningLevel>
2424
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<DocumentationFile>bin\Debug\UntypedTree.XML</DocumentationFile>
25+
<DocumentationFile>bin\Debug\UntypedTree.xml</DocumentationFile>
2626
<Prefer32Bit>true</Prefer32Bit>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<WarningLevel>3</WarningLevel>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
36-
<DocumentationFile>bin\Release\UntypedTree.XML</DocumentationFile>
36+
<DocumentationFile>bin\Release\UntypedTree.xml</DocumentationFile>
3737
<Prefer32Bit>true</Prefer32Bit>
3838
</PropertyGroup>
3939
<ItemGroup>

0 commit comments

Comments
 (0)