Merge pull request #1363 from dsyme/fix-proj-filenames

Fix project file name ordering with diamond dependencies
dotnet · Jul 21, 2016 · 580e9ef · 580e9ef
2 parents 40a4f22 + 1b62cc8
commit 580e9ef
Show file tree

Hide file tree

Showing 14 changed files with 575 additions and 91 deletions.
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
diff --git a/tests/service/ProjectOptionsTests.fs b/tests/service/ProjectOptionsTests.fs
diff --git a/tests/service/data/ScriptProject/BaseLib1.fs b/tests/service/data/ScriptProject/BaseLib1.fs
@@ -0,0 +1,3 @@
+module BaseLib1
+
+let add2 x = x + 2
diff --git a/tests/service/data/ScriptProject/BaseLib2.fs b/tests/service/data/ScriptProject/BaseLib2.fs
@@ -0,0 +1,3 @@
+module BaseLib2
+
+let add10 x = x + 10
diff --git a/tests/service/data/ScriptProject/Lib1.fsx b/tests/service/data/ScriptProject/Lib1.fsx
@@ -0,0 +1,2 @@
+#load "BaseLib1.fs"
+let add3 = BaseLib1.add2 >> ((+) 1)
diff --git a/tests/service/data/ScriptProject/Lib2.fsx b/tests/service/data/ScriptProject/Lib2.fsx
@@ -0,0 +1,2 @@
+#load "BaseLib1.fs"
+let add4 = BaseLib1.add2 >> ((+) 2)
diff --git a/tests/service/data/ScriptProject/Lib3.fs b/tests/service/data/ScriptProject/Lib3.fs
@@ -0,0 +1,3 @@
+module Lib3
+
+let add6 = ((+) 6)
diff --git a/tests/service/data/ScriptProject/Lib4.fs b/tests/service/data/ScriptProject/Lib4.fs
@@ -0,0 +1,3 @@
+module Lib4
+
+let add8 = ((+) 8)
diff --git a/tests/service/data/ScriptProject/Lib5.fsx b/tests/service/data/ScriptProject/Lib5.fsx
@@ -0,0 +1,2 @@
+#load "BaseLib2.fs"
+let add12 = BaseLib2.add10 >> ((+) 2)
diff --git a/tests/service/data/ScriptProject/Main1.fsx b/tests/service/data/ScriptProject/Main1.fsx
@@ -0,0 +1,4 @@
+#load "Lib1.fsx"
+#load "Lib2.fsx"
+Lib1.add3 5 |> printfn "%i"
+Lib2.add4 5 |> printfn "%i"
diff --git a/tests/service/data/ScriptProject/Main2.fsx b/tests/service/data/ScriptProject/Main2.fsx
@@ -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"
diff --git a/tests/service/data/ScriptProject/Main3.fsx b/tests/service/data/ScriptProject/Main3.fsx
@@ -0,0 +1,4 @@
+#load "Lib3.fs"
+#load "Lib4.fs"
+Lib3.add6 5 |> printfn "%i"
+Lib4.add8 5 |> printfn "%i"
diff --git a/tests/service/data/ScriptProject/Main4.fsx b/tests/service/data/ScriptProject/Main4.fsx
@@ -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"
diff --git a/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj b/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
@@ -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">
@@ -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>