Skip to content

Commit bb09f87

Browse files
author
Omar Tawfik
committed
Ignore VS non-Roslyn tests
1 parent 4a6d330 commit bb09f87

29 files changed

+52
-44
lines changed

packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@
3838
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net46" />
3939
<package id="Roslyn.Microsoft.VisualStudio.ComponentModelHost" version="0.0.2" targetFramework="net46" />
4040
<package id="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" version="14.0.25420" targetFramework="net46" />
41+
<package id="RoslynDependencies.Microsoft.VisualStudio.Text.Internal" version="14.3.25407" targetFramework="net45" />
42+
<package id="RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor" version="14.3.25407" targetFramework="net46" />
4143
</packages>

vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,13 @@
6464
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
6565
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
6666
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
67-
<Reference Include="Microsoft.VisualStudio.Text.Internal" />
67+
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68+
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Text.Internal.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71+
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor.$(RoslynVSPackagesVersion)\lib\net46\Microsoft.VisualStudio.Platform.VSEditor.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Microsoft.VisualStudio.Diagnostics.Measurement" />
6874
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
6975
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7076
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>

vsintegration/tests/unittests/Tests.Build.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type FauxHostObject() =
5353
interface ITaskHost
5454
// no members
5555

56-
[<TestFixture>]
56+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
5757
type Build() =
5858
(* Asserts ----------------------------------------------------------------------------- *)
5959
let AssertEqual expected actual =

vsintegration/tests/unittests/Tests.InternalCollections.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open NUnit.Framework
88
open Internal.Utilities.Collections
99

1010

11-
[<TestFixture>]
11+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
1212
type MruCache =
1313
new() = { }
1414

@@ -113,7 +113,7 @@ type MruCache =
113113
Assert.IsTrue(discarded.Value = ["y";"x";"Apple";"Banana"], "Check6")
114114
#endif
115115

116-
[<TestFixture>]
116+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
117117
type AgedLookup() =
118118
let mutable hold197 : byte [] = null
119119
let mutable hold198 : byte [] = null

vsintegration/tests/unittests/Tests.LanguageService.Completion.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module StandardSettings =
2424
let AC x y = AutoCompleteExpected(x,y)
2525
let DC x y = DotCompleteExpected(x,y)
2626

27-
[<TestFixture>]
27+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
2828
type UsingMSBuild() as this =
2929
inherit LanguageServiceBaseTests()
3030

@@ -7701,7 +7701,7 @@ let rec f l =
77017701

77027702

77037703
// Context project system
7704-
[<TestFixture>]
7704+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
77057705
type UsingProjectSystem() =
77067706
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)
77077707

vsintegration/tests/unittests/Tests.LanguageService.ErrorList.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open UnitTests.TestLib.Utils
1212
open UnitTests.TestLib.LanguageService
1313
open UnitTests.TestLib.ProjectSystem
1414

15-
[<TestFixture>]
15+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
1616
type UsingMSBuild() as this =
1717
inherit LanguageServiceBaseTests()
1818

@@ -910,6 +910,6 @@ but here has type
910910
Assert.AreEqual(1,warnList.Length)
911911

912912
// Context project system
913-
[<TestFixture>]
913+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
914914
type UsingProjectSystem() =
915915
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

vsintegration/tests/unittests/Tests.LanguageService.ErrorRecovery.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open UnitTests.TestLib.Utils
1212
open UnitTests.TestLib.LanguageService
1313
open UnitTests.TestLib.ProjectSystem
1414

15-
[<TestFixture>]
15+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
1616
type UsingMSBuild() =
1717
inherit LanguageServiceBaseTests()
1818

@@ -266,6 +266,6 @@ type UsingMSBuild() =
266266

267267

268268
// Context project system
269-
[<TestFixture>]
269+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
270270
type UsingProjectSystem() =
271271
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

vsintegration/tests/unittests/Tests.LanguageService.F1Keyword.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open UnitTests.TestLib.Utils
1111
open UnitTests.TestLib.LanguageService
1212
open UnitTests.TestLib.ProjectSystem
1313

14-
[<TestFixture>]
14+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
1515
type UsingMSBuild() =
1616
inherit LanguageServiceBaseTests()
1717

@@ -372,6 +372,6 @@ type UsingMSBuild() =
372372

373373

374374
// Context project system
375-
[<TestFixture>]
375+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
376376
type UsingProjectSystem() =
377377
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

vsintegration/tests/unittests/Tests.LanguageService.General.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ open UnitTests.TestLib.Utils
1818
open UnitTests.TestLib.LanguageService
1919
open UnitTests.TestLib.ProjectSystem
2020

21-
[<TestFixture>]
21+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
2222
module IFSharpSource =
2323

2424
[<Test>]
@@ -55,7 +55,7 @@ module IFSharpSource =
5555

5656

5757

58-
[<TestFixture>]
58+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
5959
type UsingMSBuild() =
6060
inherit LanguageServiceBaseTests()
6161

@@ -484,7 +484,7 @@ type UsingMSBuild() =
484484

485485

486486
// Context project system
487-
[<TestFixture>]
487+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
488488
type UsingProjectSystem() =
489489
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)
490490

vsintegration/tests/unittests/Tests.LanguageService.GotoDefinition.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open System.Text.RegularExpressions
1414
open UnitTests.TestLib.LanguageService
1515
open UnitTests.TestLib.ProjectSystem
1616

17-
[<TestFixture>]
17+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
1818
type UsingMSBuild() =
1919
inherit LanguageServiceBaseTests()
2020

@@ -1449,6 +1449,6 @@ type UsingMSBuild() =
14491449

14501450

14511451
// Context project system
1452-
[<TestFixture>]
1452+
[<Ignore("Not ported to Roslyn yet")>][<TestFixture>]
14531453
type UsingProjectSystem() =
14541454
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

0 commit comments

Comments
 (0)