Skip to content

Commit 92c0e27

Browse files
dsymedsyme
committed
integrate Microsoft\visualfsharp master (2)
1 parent 8da322e commit 92c0e27

File tree

16 files changed

+5
-98
lines changed

16 files changed

+5
-98
lines changed

‎tests/service/EditorTests.fs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ let _ = arr.[..number2]
571571
//-------------------------------------------------------------------------------
572572

573573

574+
#if TEST_TP_PROJECTS
574575
module TPProject =
575576
open System.IO
576577

@@ -745,6 +746,8 @@ let ``Test TPProject param info`` () =
745746
(14,[(["RegexTypedStatic.IsMatch,pattern1=\"ABC\"(input: string) : bool"], true,["input"], ["pattern1"])]);
746747
(15, [(["RegexTypedStatic.IsMatch() : int"], true, [], ["pattern1"])])]
747748

749+
#endif // TEST_TP_PROJECTS
750+
748751
#if EXE
749752

750753
``Intro test`` ()

‎tests/service/ProjectOptionsTests.fs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ let ``Project file parsing -- references``() =
156156
checkOption references "mscorlib.dll"
157157
checkOption references "System.Core.dll"
158158
checkOption references "System.dll"
159+
printfn "Project file parsing -- references: references = %A" references
159160
references |> should haveLength 4
160161
p.ReferencedProjects |> should be Empty
161162

@@ -169,6 +170,7 @@ let ``Project file parsing -- 2nd level references``() =
169170
checkOption references "System.Core.dll"
170171
checkOption references "System.dll"
171172
checkOption references "Test1.dll"
173+
printfn "Project file parsing -- references: references = %A" references
172174
references |> should haveLength 5
173175
p.ReferencedProjects |> should haveLength 1
174176
(snd p.ReferencedProjects.[0]).ProjectFileName |> should contain (normalizePath (__SOURCE_DIRECTORY__ + @"/data/Test1.fsproj"))

‎tests/service/data/CSharp_Analysis/CSharp_Analysis.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,4 @@
5151
<Target Name="AfterBuild">
5252
</Target>
5353
-->
54-
<ItemGroup>
55-
<Reference Include="nunit.framework">
56-
<HintPath>..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
57-
<Private>True</Private>
58-
<Paket>True</Paket>
59-
</Reference>
60-
</ItemGroup>
6154
</Project>

‎tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,4 @@
6868
<Target Name="AfterBuild">
6969
</Target>
7070
-->
71-
<ItemGroup>
72-
<Reference Include="nunit.framework">
73-
<HintPath>..\..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
74-
<Private>True</Private>
75-
<Paket>True</Paket>
76-
</Reference>
77-
</ItemGroup>
7871
</Project>

‎tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,4 @@
7474
<Target Name="AfterBuild">
7575
</Target>
7676
-->
77-
<ItemGroup>
78-
<Reference Include="nunit.framework">
79-
<HintPath>..\..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
80-
<Private>True</Private>
81-
<Paket>True</Paket>
82-
</Reference>
83-
</ItemGroup>
8477
</Project>

‎tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,4 @@
8484
<Target Name="AfterBuild">
8585
</Target>
8686
-->
87-
<ItemGroup>
88-
<Reference Include="nunit.framework">
89-
<HintPath>..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
90-
<Private>True</Private>
91-
<Paket>True</Paket>
92-
</Reference>
93-
</ItemGroup>
9487
</Project>

‎tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,4 @@
7979
<Target Name="AfterBuild">
8080
</Target>
8181
-->
82-
<ItemGroup>
83-
<Reference Include="nunit.framework">
84-
<HintPath>..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
85-
<Private>True</Private>
86-
<Paket>True</Paket>
87-
</Reference>
88-
</ItemGroup>
8982
</Project>

‎tests/service/data/MultiLanguageProject/ConsoleApplication3.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,4 @@
5252
<Target Name="AfterBuild">
5353
</Target>
5454
-->
55-
<ItemGroup>
56-
<Reference Include="nunit.framework">
57-
<HintPath>..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
58-
<Private>True</Private>
59-
<Paket>True</Paket>
60-
</Reference>
61-
</ItemGroup>
6255
</Project>

‎tests/service/data/Space in name.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,4 @@
7474
<Target Name="AfterBuild">
7575
</Target>
7676
-->
77-
<ItemGroup>
78-
<Reference Include="nunit.framework">
79-
<HintPath>..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
80-
<Private>True</Private>
81-
<Paket>True</Paket>
82-
</Reference>
83-
</ItemGroup>
8477
</Project>

‎tests/service/data/Test1.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,4 @@
6868
<Target Name="AfterBuild">
6969
</Target>
7070
-->
71-
<ItemGroup>
72-
<Reference Include="nunit.framework">
73-
<HintPath>..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
74-
<Private>True</Private>
75-
<Paket>True</Paket>
76-
</Reference>
77-
</ItemGroup>
7871
</Project>

0 commit comments

Comments
 (0)