Skip to content

Fix expressions for provided method calls #472

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 27 commits into from
Dec 3, 2015
Merged

Fix expressions for provided method calls #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d30755
Fix expressions for type providers
dsyme Dec 1, 2015
6d4fe8b
Fix expressions for type providers (2)
dsyme Dec 1, 2015
ea810bd
elide a test case that doesn't work, likely due to F# compile bug
dsyme Dec 1, 2015
0d8433e
make tests pass
dsyme Dec 1, 2015
d821ab9
make tests pass
dsyme Dec 1, 2015
220829c
make tests pass (3)
dsyme Dec 1, 2015
aef10af
Update FSharp.Compiler.Service.sln
dsyme Dec 2, 2015
53f662a
Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Se…
dsyme Dec 2, 2015
2aa51c9
Merge branch 'fix-tpexpres' of https://github.com/dsyme/FSharp.Compil…
dsyme Dec 2, 2015
f6b24b5
fix build after integration
dsyme Dec 2, 2015
2e69418
Update FSharp.Compiler.Service.sln
dsyme Dec 2, 2015
7d94a87
Update FSharp.Compiler.Service.sln
dsyme Dec 2, 2015
5acdfa6
remove warnings, add diagnostics
dsyme Dec 2, 2015
caf61f1
fix release test
dsyme Dec 2, 2015
8a9261a
Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Se…
dsyme Dec 2, 2015
97e76c0
adjust namespaces and add reference for unittests
dsyme Dec 2, 2015
bfbe429
try fix travis
dsyme Dec 2, 2015
5e220e0
Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Se…
dsyme Dec 2, 2015
ea2c828
Update FSharp.Compiler.Service.sln
dsyme Dec 2, 2015
6bd6d30
move files
dsyme Dec 2, 2015
b5a4736
move files (2)
dsyme Dec 2, 2015
4975b66
fix project references
dsyme Dec 2, 2015
3084236
normalize XML --> xml
dsyme Dec 2, 2015
785cb82
fix build on Mono
dsyme Dec 2, 2015
555786f
add compiled TP files to keep things simpler
dsyme Dec 2, 2015
0b4337a
update release notes
dsyme Dec 2, 2015
2a7509d
fix mono test
dsyme Dec 3, 2015
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
6 changes: 3 additions & 3 deletions FSharp.Compiler.Service.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B68AE6-E7A4-4D43-9B34-FFA74BFE192B}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -57,7 +57,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsc", "samples\FscExe\Fsc.f
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp_Analysis", "tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj", "{887630A3-4B1D-40EA-B8B3-2D842E9C40DB}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
Expand Down
8 changes: 8 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#### 2.0.0.0-beta
* Feature #470, #478, #479 - Move ProjectCracker to separate nuget package and DLL, used ProjectCracker.Tool.exe to run
* Feature #463 - Expose slot signatures of members in object expressions
* Feature #469, #475 - Add EvalExpressionNonThrowing, EvalInteractionNonThrowing, EvalScriptNonThrowing
* Fix #456 - FCS makes calls to kernel32.dll when running on OSX
* Fix #473 - stack overflow in resolution logic
* Fix #460 - Failure getting expression for a provided method call

#### 1.4.2.1 -
* #450 - Correct generation of ReferencedProjects

Expand Down
4 changes: 2 additions & 2 deletions nuget/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ tags
F#, fsharp, interactive, compiler, editor
files
../bin/v4.0/FSharp.Compiler.Service.dll ==> lib/net40
../bin/v4.0/FSharp.Compiler.Service.XML ==> lib/net40
../bin/v4.0/FSharp.Compiler.Service.xml ==> lib/net40
../bin/v4.0/FSharp.Compiler.Service.?db ==> lib/net40
../bin/v4.0/FSharp.Compiler.Service.dll.?db ==> lib/net40
../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.XML ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
8 changes: 4 additions & 4 deletions nuget/projectcracker.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.p
tags
F#, fsharp, msbuild, editor
files
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.exe ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.exe.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.exe ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Tool.exe.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.XML ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.?db ==> lib/net45
../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll.?db ==> lib/net45
4 changes: 2 additions & 2 deletions samples/EditorService/EditorService.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\EditorService.XML</DocumentationFile>
<DocumentationFile>bin\Debug\EditorService.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -33,7 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\EditorService.XML</DocumentationFile>
<DocumentationFile>bin\Release\EditorService.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/FscExe/Fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\FsiExe.XML</DocumentationFile>
<DocumentationFile>bin\Debug\FsiExe.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
<StartArguments>
</StartArguments>
Expand All @@ -38,7 +38,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\FsiExe.XML</DocumentationFile>
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/FsiExe/FsiExe.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\FsiExe.XML</DocumentationFile>
<DocumentationFile>bin\Debug\FsiExe.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
<StartArguments>
</StartArguments>
Expand All @@ -35,7 +35,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\FsiExe.XML</DocumentationFile>
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/InteractiveService/InteractiveService.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\InteractiveService.XML</DocumentationFile>
<DocumentationFile>bin\Debug\InteractiveService.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -33,7 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\InteractiveService.XML</DocumentationFile>
<DocumentationFile>bin\Release\InteractiveService.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/Tokenizer/Tokenizer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\Tokenizer.XML</DocumentationFile>
<DocumentationFile>bin\Debug\Tokenizer.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -33,7 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\Tokenizer.XML</DocumentationFile>
<DocumentationFile>bin\Release\Tokenizer.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/UntypedTree/UntypedTree.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\UntypedTree.XML</DocumentationFile>
<DocumentationFile>bin\Debug\UntypedTree.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -33,7 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\UntypedTree.XML</DocumentationFile>
<DocumentationFile>bin\Release\UntypedTree.xml</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
0 ...ler.Service.ProjectCracker.Exe/App.config → ...er.Service.ProjectCracker.Tool/App.config
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...ompiler.Service.ProjectCracker.Exe.fsproj → ...mpiler.Service.ProjectCracker.Tool.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>b1bdd96d-47e1-4e65-8107-fbae23a06db4</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>FSharp.Compiler.Service.ProjectCracker.Exe</RootNamespace>
<AssemblyName>FSharp.Compiler.Service.ProjectCracker.Exe</AssemblyName>
<RootNamespace>FSharp.Compiler.Service.ProjectCracker.Tool</RootNamespace>
<AssemblyName>FSharp.Compiler.Service.ProjectCracker.Tool</AssemblyName>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<Name>FSharp.Compiler.Service.ProjectCracker.Exe</Name>
<Name>FSharp.Compiler.Service.ProjectCracker.Tool</Name>
<OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>
<NoWarn>$(NoWarn);40</NoWarn>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Name>FSharp.Compiler.Service.ProjectCracker.Exe</Name>
<Name>FSharp.Compiler.Service.ProjectCracker.Tool</Name>
<OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.Exe.XML</DocumentationFile>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.Tool.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
10 changes: 6 additions & 4 deletions ...ler.Service.ProjectCracker.Exe/Program.fs → ...er.Service.ProjectCracker.Tool/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FSharp.Compiler.Service.ProjectCracker.Exe
namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Tool

open Microsoft.Build.Framework
open Microsoft.Build.Utilities
Expand Down Expand Up @@ -37,7 +37,7 @@ module Program =
member x.Log = sb.ToString()

type internal HostCompile() =
member th.Compile(_, _, _) = 0
member th.Compile(_:obj, _:obj, _:obj) = 0
interface ITaskHost

//----------------------------------------------------------------------------
Expand Down Expand Up @@ -127,16 +127,18 @@ module Program =
let host = new HostCompile()
engine.HostServices.RegisterHostObject(fsprojFullPath, "CoreCompile", "Fsc", host)


let projectInstanceFromFullPath (fsprojFullPath: string) =
use stream = new IO.StreamReader(fsprojFullPath)
use xmlReader = System.Xml.XmlReader.Create(stream)

let project = engine.LoadProject(xmlReader, FullPath=fsprojFullPath)

project.SetGlobalProperty("BuildingInsideVisualStudio", "true") |> ignore
project.SetGlobalProperty("VisualStudioVersion", "12.0") |> ignore
project.SetGlobalProperty("ShouldUnsetParentConfigurationAndPlatform", "false") |> ignore
for (prop, value) in properties do
project.SetProperty(prop, value) |> ignore
project.SetGlobalProperty(prop, value) |> ignore

project.CreateProjectInstance()

Expand Down
6 changes: 3 additions & 3 deletions ...harp/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<Name>FSharp.Compiler.Service.ProjectCracker</Name>
<OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.XML</DocumentationFile>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -48,8 +48,8 @@
<Compile Include="ProjectCracker.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FSharp.Compiler.Service.ProjectCracker.Exe\FSharp.Compiler.Service.ProjectCracker.Exe.fsproj">
<Name>FSharp.Compiler.Service.ProjectCracker.Exe</Name>
<ProjectReference Include="..\FSharp.Compiler.Service.ProjectCracker.Tool\FSharp.Compiler.Service.ProjectCracker.Tool.fsproj">
<Name>FSharp.Compiler.Service.ProjectCracker.Tool</Name>
<Project>{b1bdd96d-47e1-4e65-8107-fbae23a06db4}</Project>
<Private>True</Private>
</ProjectReference>
Expand Down
14 changes: 6 additions & 8 deletions src/fsharp/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
namespace FSharp.Compiler.Service
namespace Microsoft.FSharp.Compiler.SourceCodeServices

open System.Diagnostics
open System.Text
open System.IO
open System
open System.Runtime

open Microsoft.FSharp.Compiler.SourceCodeServices

type ProjectCracker =

static member GetProjectOptionsFromProjectFileLogged(projectFileName : string, ?properties : (string * string) list, ?loadedTimeStamp, ?enableLogging) =
Expand All @@ -16,7 +14,7 @@ type ProjectCracker =
let enableLogging = defaultArg enableLogging true
let logMap = ref Map.empty

let rec convert (opts: FSharp.Compiler.Service.ProjectCracker.Exe.ProjectOptions) : FSharpProjectOptions =
let rec convert (opts: Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Tool.ProjectOptions) : FSharpProjectOptions =
let referencedProjects = Array.map (fun (a, b) -> a, convert b) opts.ReferencedProjectOptions
logMap := Map.add opts.ProjectFile opts.LogOutput !logMap
{ ProjectFileName = opts.ProjectFile
Expand All @@ -33,18 +31,18 @@ type ProjectCracker =
arguments.Append(' ').Append(enableLogging.ToString()) |> ignore
for k, v in properties do
arguments.Append(' ').Append(k).Append(' ').Append(v) |> ignore

let codebase = Path.GetDirectoryName(Uri(typeof<ProjectCracker>.Assembly.CodeBase).LocalPath)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little unclear on the difference here. Does one or the other work even in the presence of shadow-copying?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, Location gets the copied location, CodeBase gets a URI to the original location.


let p = new System.Diagnostics.Process()
p.StartInfo.FileName <- Path.Combine(Path.GetDirectoryName(Reflection.Assembly.GetExecutingAssembly().Location),
"FSharp.Compiler.Service.ProjectCracker.Exe.exe")
p.StartInfo.FileName <- Path.Combine(codebase,"FSharp.Compiler.Service.ProjectCracker.Tool.exe")
p.StartInfo.Arguments <- arguments.ToString()
p.StartInfo.UseShellExecute <- false
p.StartInfo.CreateNoWindow <- true
p.StartInfo.RedirectStandardOutput <- true
ignore <| p.Start()

let fmt = new Serialization.Formatters.Binary.BinaryFormatter()
let opts = fmt.Deserialize(p.StandardOutput.BaseStream) :?> FSharp.Compiler.Service.ProjectCracker.Exe.ProjectOptions
let opts = fmt.Deserialize(p.StandardOutput.BaseStream) :?> Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Tool.ProjectOptions
p.WaitForExit()

convert opts, !logMap
Expand Down
4 changes: 2 additions & 2 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 @@ -58,11 +58,11 @@
<DefineConstants>DEBUG; $(DefineConstants)</DefineConstants>
<Optimize>false</Optimize>
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.XML</DocumentationFile>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<Optimize>true</Optimize>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.XML</DocumentationFile>
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
Expand Down
Loading