Skip to content
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

Fix project file name ordering with diamond dependencies #1363

Merged
merged 5 commits into from
Jul 21, 2016
Merged

Fix project file name ordering with diamond dependencies #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67fba68
Replace previous commit with new fix
alfonsogarciacaro Jun 27, 2016
37d384d
fix tests
alfonsogarciacaro Jun 29, 2016
5436f4f
Fix tests
alfonsogarciacaro Jul 2, 2016
0d92803
Add more tests and improve fix
alfonsogarciacaro Jul 4, 2016
1b62cc8
fix closure computation
dsyme Jul 21, 2016
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
182 changes: 91 additions & 91 deletions src/fsharp/CompileOps.fs
View file
Open in desktop

Large diffs are not rendered by default.

442 changes: 442 additions & 0 deletions tests/service/ProjectOptionsTests.fs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions tests/service/data/ScriptProject/BaseLib1.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module BaseLib1

let add2 x = x + 2
3 changes: 3 additions & 0 deletions tests/service/data/ScriptProject/BaseLib2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module BaseLib2

let add10 x = x + 10
2 changes: 2 additions & 0 deletions tests/service/data/ScriptProject/Lib1.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#load "BaseLib1.fs"
let add3 = BaseLib1.add2 >> ((+) 1)
2 changes: 2 additions & 0 deletions tests/service/data/ScriptProject/Lib2.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#load "BaseLib1.fs"
let add4 = BaseLib1.add2 >> ((+) 2)
3 changes: 3 additions & 0 deletions tests/service/data/ScriptProject/Lib3.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module Lib3

let add6 = ((+) 6)
3 changes: 3 additions & 0 deletions tests/service/data/ScriptProject/Lib4.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module Lib4

let add8 = ((+) 8)
2 changes: 2 additions & 0 deletions tests/service/data/ScriptProject/Lib5.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#load "BaseLib2.fs"
let add12 = BaseLib2.add10 >> ((+) 2)
4 changes: 4 additions & 0 deletions tests/service/data/ScriptProject/Main1.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#load "Lib1.fsx"
#load "Lib2.fsx"
Lib1.add3 5 |> printfn "%i"
Lib2.add4 5 |> printfn "%i"
6 changes: 6 additions & 0 deletions tests/service/data/ScriptProject/Main2.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#load "Lib1.fsx"
#load "Lib2.fsx"
#load "Lib3.fs"
Lib1.add3 5 |> printfn "%i"
Lib2.add4 5 |> printfn "%i"
Lib3.add6 5 |> printfn "%i"
4 changes: 4 additions & 0 deletions tests/service/data/ScriptProject/Main3.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#load "Lib3.fs"
#load "Lib4.fs"
Lib3.add6 5 |> printfn "%i"
Lib4.add8 5 |> printfn "%i"
6 changes: 6 additions & 0 deletions tests/service/data/ScriptProject/Main4.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#load "Lib5.fsx"
#load "Lib1.fsx"
#load "Lib2.fsx"
Lib1.add3 5 |> printfn "%i"
Lib2.add4 5 |> printfn "%i"
Lib5.add12 5 |> printfn "%i"
4 changes: 4 additions & 0 deletions vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<NoWarn>58;75</NoWarn>
<PlatformTarget>x86</PlatformTarget>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<DefineConstants>NO_PROJECTCRACKER;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(FSharpSourcesRoot)\fsharp\InternalCollections.fsi">
Expand Down Expand Up @@ -79,6 +80,9 @@
<Compile Include="..\..\..\tests\service\MultiProjectAnalysisTests.fs">
<Link>MultiProjectAnalysisTests.fs</Link>
</Compile>
<Compile Include="..\..\..\tests\service\ProjectOptionsTests.fs">
<Link>ProjectOptionsTests.fs</Link>
</Compile>
<CustomCopyLocal Include="app.config">
<TargetFilename>VisualFSharp.Unittests.dll.config</TargetFilename>
</CustomCopyLocal>
Expand Down