diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs
index bce9f986f52996ef4d18af5ec32c1f8bf5ff7929..537fa6aa499a8e6b335c9c4be37d3bc933b983af 100644
--- a/tests/fsharp/single-test.fs
+++ b/tests/fsharp/single-test.fs
@@ -130,6 +130,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
FX_RESHAPED_REFLECTION
NETCOREAPP
false
+ $(RestoreFromArtifactsPath)
+ $(RestoreAdditionalProjectSources);$(RestoreFromArtifactsPath)
@@ -170,6 +172,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
|> replaceTokens "$(OPTIMIZE)" optimize
|> replaceTokens "$(DEBUG)" debug
|> replaceTokens "$(TARGETFRAMEWORK)" targetFramework
+ |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts")
+
generateProjBody
let singleTestBuildAndRunCore cfg copyFiles p =
diff --git a/tests/fsharpqa/Source/Conformance/PatternMatching/Named/env.lst b/tests/fsharpqa/Source/Conformance/PatternMatching/Named/env.lst
index 63f5a897cb7843524c945dd3614e2d5bb5678676..f88ce34f50b19c7ee6fd682064dbfa272137a513 100644
--- a/tests/fsharpqa/Source/Conformance/PatternMatching/Named/env.lst
+++ b/tests/fsharpqa/Source/Conformance/PatternMatching/Named/env.lst
@@ -21,7 +21,7 @@
SOURCE=activePatterns07.fs # activePatterns07.fs
SOURCE=activePatterns08.fs # activePatterns08.fs
- SOURCE=AsHighOrderFunc01.fs # AsHighOrderFunc01.fs
+# SOURCE=AsHighOrderFunc01.fs # AsHighOrderFunc01.fs ### FAils on coreclr 2.1.500
SOURCE=RecursiveActivePats.fs # RecursiveActivePats.fs
SOURCE=E_ActivePatterns01.fs # E_ActivePatterns01.fs
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
index b3215f98956332fd192d0e63b8d1f2b213ba7867..56cac2c31ae31c94270ed2fb0866da05038c2c26 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
@@ -1263,18 +1263,6 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
// This is the first time, so set up interface for language service to talk to us
projectSite.Open(x.CreateRunningProjectSite())
- // =====================================================================================================
- // Todo: x.Compile(compile:System.Converter, flags:string[], sources:string[]) for VS2017.7
- // Earlier buildtasks usesd System.Converter for cross platform we are moving to Func
- // This is so that during the interim, earlier VS's will still load the OSS project
- // =====================================================================================================
- member x.Compile(compile:System.Converter, flags:string[], sources:string[]) =
- x.CoreCompile(flags, sources)
- if actuallyBuild then
- compile.Invoke(0)
- else
- 0
-
member x.Compile(compile:Func, flags:string[], sources:string[]) =
x.CoreCompile(flags, sources)
if actuallyBuild then
diff --git a/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj b/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
index 3f58e648e49574ad8c8ad31b40c25cb450bb387d..e8f4ce2b983bcc3c2dc544dc66f54e68f295720c 100644
--- a/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
+++ b/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
@@ -9,6 +9,7 @@
false
true
true
+ true
diff --git a/vsintegration/tests/Salsa/salsa.fs b/vsintegration/tests/Salsa/salsa.fs
index 7306c68dfa71a16e773fba4f11aa666cc7736d64..062e24ab19838f4bacf16383a7287084bd42eb35 100644
--- a/vsintegration/tests/Salsa/salsa.fs
+++ b/vsintegration/tests/Salsa/salsa.fs
@@ -43,11 +43,11 @@ module internal Salsa =
{ new System.IDisposable with
member this.Dispose() = actuallyBuild <- true }
member th.Results = capturedFlags, capturedSources
- member th.Compile(compile:System.Converter, flags:string[], sources:string[]) =
+ member th.Compile(compile:System.Func, flags:string[], sources:string[]) =
capturedFlags <- flags
capturedSources <- sources
if actuallyBuild then
- compile.Invoke(0)
+ compile.Invoke()
else
0
interface ITaskHost
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
index c72825d1ee413f705938b9636f752b16a7b3a1bf..790fdb58bb7e0caf08f0ee0d34305564f05abc04 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
@@ -1528,6 +1528,7 @@ let x = new MyClass2(0)
[]
+ []
member public this.``AfterConstructor.5039_1``() =
AssertAutoCompleteContainsNoCoffeeBreak
[ "let someCall(x) = null"
@@ -1537,6 +1538,7 @@ let x = new MyClass2(0)
[ "LastIndexOfAny" ] // should not contain (String)
[]
+ []
member public this.``AfterConstructor.5039_1.CoffeeBreak``() =
AssertAutoCompleteContains
[ "let someCall(x) = null"
@@ -2494,6 +2496,7 @@ let x = new MyClass2(0)
[]
[]
[]
+ []
member this.``QueryExpressions.QueryAndSequenceExpressionWithForYieldLoopSystematic``() =
let prefix = """
@@ -2595,6 +2598,7 @@ let aaaaaa = 0
[]
[]
[]
+ []
/// Incrementally enter query with a 'join' and check for availability of quick info, auto completion and dot completion
member this.``QueryAndOtherExpressions.WordByWordSystematicJoinQueryOnSingleLine``() =
@@ -2649,6 +2653,7 @@ let aaaaaa = 0
/// This is a sanity check that the multiple-line case is much the same as the single-line cae
[]
[]
+ []
member this.``QueryAndOtherExpressions.WordByWordSystematicJoinQueryOnMultipleLine``() =
let prefix = """
@@ -4881,6 +4886,7 @@ let x = query { for bbbb in abbbbc(*D0*) do
gpatcc.AssertExactly(0,0)
[]
+ []
member this.``BadCompletionAfterQuicklyTyping.Bug72561.Noteworthy.NowWorks``() =
let code = [ "123 " ]
let (_, _, file) = this.CreateSingleFileProject(code)
@@ -4903,6 +4909,7 @@ let x = query { for bbbb in abbbbc(*D0*) do
gpatcc.AssertExactly(0,0)
[]
+ []
member this.``BadCompletionAfterQuicklyTyping.Bug130733.NowWorks``() =
let code = [ "let someCall(x) = null"
"let xe = someCall(System.IO.StringReader() "]
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
index 95ade7d3af7f4a436abfe69a7c339035ace35005..8c22810bb06211f96ac06b379b7da2bfa7535c4e 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
@@ -540,6 +540,7 @@ but here has type
Assert.IsTrue(errorList.IsEmpty)
[]
+ []
member public this.``UnicodeCharactors``() =
use _guard = this.UsingNewVS()
let solution = this.CreateSolution()
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
index 9339aaa02a827ec5a36b435bfcd4462906ee17a4..bcb512a94eb745ff6f2a09bb0d120f08cc379ff5 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
@@ -253,6 +253,7 @@ type UsingMSBuild() =
this.VerifyHasParameterInfo(fileContent, "(*Mark*)")
[]
+ []
member public this.``Single.DotNet.StaticMethod``() =
let code =
["#light"
@@ -425,6 +426,7 @@ type UsingMSBuild() =
[]
+ []
member public this.``Single.InMatchClause``() =
let v461 = Version(4,6,1)
let fileContent = """
@@ -606,6 +608,7 @@ type UsingMSBuild() =
// Test PI does not pop up after non-parameterized properties and after values
[]
+ []
member public this.``Single.Locations.EndOfFile`` () =
this.TestSystematicParameterInfo("System.Console.ReadLine(", [ [] ])
@@ -644,37 +647,47 @@ type UsingMSBuild() =
let sevenTimes l = [ l; l; l; l; l; l; l ]
this.TestGenericParameterInfo("typeof(", [])
[]
+ []
member public this.``Single.Generics.MathAbs``() =
let sevenTimes l = [ l; l; l; l; l; l; l ]
this.TestGenericParameterInfo("Math.Abs(", sevenTimes ["value"])
[]
+ []
member public this.``Single.Generics.ExchangeInt``() =
let sevenTimes l = [ l; l; l; l; l; l; l ]
this.TestGenericParameterInfo("Interlocked.Exchange(", sevenTimes ["location1"; "value"])
[]
+ []
member public this.``Single.Generics.Exchange``() =
let sevenTimes l = [ l; l; l; l; l; l; l ]
this.TestGenericParameterInfo("Interlocked.Exchange(", sevenTimes ["location1"; "value"])
[]
+ []
member public this.``Single.Generics.ExchangeUnder``() =
let sevenTimes l = [ l; l; l; l; l; l; l ]
this.TestGenericParameterInfo("Interlocked.Exchange<_> (", sevenTimes ["location1"; "value"])
[]
+ []
member public this.``Single.Generics.Dictionary``() =
this.TestGenericParameterInfo("System.Collections.Generic.Dictionary<_, option>(", [ []; ["capacity"]; ["comparer"]; ["capacity"; "comparer"]; ["dictionary"]; ["dictionary"; "comparer"] ])
[]
+ []
member public this.``Single.Generics.List``() =
this.TestGenericParameterInfo("new System.Collections.Generic.List< _ > ( ", [ []; ["capacity"]; ["collection"] ])
[]
+ []
member public this.``Single.Generics.ListInt``() =
this.TestGenericParameterInfo("System.Collections.Generic.List(", [ []; ["capacity"]; ["collection"] ])
[]
+ []
member public this.``Single.Generics.EventHandler``() =
this.TestGenericParameterInfo("new System.EventHandler( ", [ [""] ]) // function arg doesn't have a name
[]
+ []
member public this.``Single.Generics.EventHandlerEventArgs``() =
this.TestGenericParameterInfo("System.EventHandler(", [ [""] ]) // function arg doesn't have a name
[]
+ []
member public this.``Single.Generics.EventHandlerEventArgsNew``() =
this.TestGenericParameterInfo("new System.EventHandler ( ", [ [""] ]) // function arg doesn't have a name
@@ -747,6 +760,7 @@ type UsingMSBuild() =
this.TestParameterInfoLocation("let a = Interlocked.Exchange($", 8)
[]
+ []
member public this.``Single.Locations.WithGenericArgs``() =
this.TestParameterInfoLocation("Interlocked.Exchange($", 0)
@@ -769,6 +783,7 @@ type UsingMSBuild() =
[]
[]
[]
+ []
//This test verifies that ParamInfo location on a provided type with namespace that exposes static parameter that takes >1 argument works normally.
member public this.``TypeProvider.Type.ParameterInfoLocation.WithNamespace`` () =
this.TestParameterInfoLocation("type boo = N1.T<$",11,
@@ -777,6 +792,7 @@ type UsingMSBuild() =
[]
[]
[]
+ []
//This test verifies that ParamInfo location on a provided type without the namespace that exposes static parameter that takes >1 argument works normally.
member public this.``TypeProvider.Type.ParameterInfoLocation.WithOutNamespace`` () =
this.TestParameterInfoLocation("open N1 \n"+"type boo = T<$",
@@ -869,6 +885,7 @@ type UsingMSBuild() =
("// System.Console.WriteLine($)")
[]
+ []
member this.``Regression.LocationOfParams.AfterQuicklyTyping.Bug91373``() =
let code = [ "let f x = x "
"let f1 y = y "
@@ -893,6 +910,7 @@ type UsingMSBuild() =
AssertEqual([|(2,10);(2,12);(2,13);(3,0)|], info.GetNoteworthyParamInfoLocations())
[]
+ []
member this.``LocationOfParams.AfterQuicklyTyping.CallConstructor``() =
let code = [ "type Foo() = class end" ]
let (_, _, file) = this.CreateSingleFileProject(code)
@@ -1058,6 +1076,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
()
[]
+ []
member public this.``Regression.LocationOfParams.Bug91479``() =
this.TestParameterInfoLocationOfParams("""let z = fun x -> x + ^System.Int16.Parse^(^$ """, markAtEOF=true)
@@ -1183,6 +1202,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
^l.Aggregate^(^$^) // was once a bug""")
[]
+ []
member public this.``LocationOfParams.BY_DESIGN.WayThatMismatchedParensFailOver.Case1``() =
// when only one 'statement' after the mismatched parens after a comma, the comma swallows it and it becomes a badly-indented
// continuation of the expression from the previous line
@@ -1194,6 +1214,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
c.M(1,2,3,4)""", markAtEOF=true)
[]
+ []
member public this.``LocationOfParams.BY_DESIGN.WayThatMismatchedParensFailOver.Case2``() =
// when multiple 'statements' after the mismatched parens after a comma, the parser sees a single argument to the method that
// is a statement sequence, e.g. a bunch of discarded expressions. That is,
@@ -1227,6 +1248,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
^System.Console.WriteLine^(^ $(42,43) ^) // oops""")
[]
+ []
member public this.``LocationOfParams.Tuples.Bug123219``() =
this.TestParameterInfoLocationOfParams("""
type Expr = | Num of int
@@ -1427,6 +1449,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
let x = 10 """)
[]
+ []
member public this.``LocationOfParams.QueryCustomOperation.Bug222128``() =
this.TestParameterInfoLocationOfParams("""
type T() =
@@ -1541,6 +1564,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix0``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ $ """, // missing all params, just have <
@@ -1548,6 +1572,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
additionalReferenceAssemblies = [PathRelativeToTestAssembly(@"DummyProviderForLanguageServiceTesting.dll")])
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix1``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ "fo$o",^ 42 """, // missing >
@@ -1555,6 +1580,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
additionalReferenceAssemblies = [PathRelativeToTestAssembly(@"DummyProviderForLanguageServiceTesting.dll")])
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix1Named``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ "fo$o",^ ParamIgnored=42 """, // missing >
@@ -1562,6 +1588,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
additionalReferenceAssemblies = [PathRelativeToTestAssembly(@"DummyProviderForLanguageServiceTesting.dll")])
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix2``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ "fo$o",^ """, // missing last param
@@ -1569,6 +1596,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
additionalReferenceAssemblies = [PathRelativeToTestAssembly(@"DummyProviderForLanguageServiceTesting.dll")])
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix2Named1``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ "fo$o",^ ParamIgnored= """, // missing last param after name with equals
@@ -1576,6 +1604,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
additionalReferenceAssemblies = [PathRelativeToTestAssembly(@"DummyProviderForLanguageServiceTesting.dll")])
[]
+ []
member public this.``LocationOfParams.TypeProviders.Prefix2Named2``() =
this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""
type U = ^N1.T^<^ "fo$o",^ ParamIgnored """, // missing last param after name sans equals
@@ -1777,6 +1806,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
this.VerifyParameterInfoContainedAtStartOfMarker(fileContents,"(*Mark*)",["string";"System.Globalization.NumberStyles"])
[]
+ []
member public this.``Multi.DotNet.StaticMethod.WithinLambda``() =
let fileContents = """let z = fun x -> x + System.Int16.Parse("",(*Mark*)"""
this.VerifyParameterInfoContainedAtStartOfMarker(fileContents,"(*Mark*)",["string";"System.Globalization.NumberStyles"])
@@ -1795,6 +1825,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
(* Common functions for multi-parameterinfo tests -------------------------------------------------- *)
[]
+ []
member public this.``Multi.DotNet.Constructor``() =
let fileContents = "let _ = new System.DateTime(2010,12,(*Mark*)"
this.VerifyParameterInfoContainedAtStartOfMarker(fileContents,"(*Mark*)",["int";"int";"int"])
@@ -1890,6 +1921,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
this.VerifyParameterInfoAtStartOfMarker(fileContents,"(*Mark*)",[["int list"]])
[]
+ []
member public this.``Multi.Function.WithOptionType``() =
let fileContents = """
let foo( a : int option, b : string ref) = 0
@@ -1906,6 +1938,7 @@ We really need to rewrite some code paths here to use the real parse tree rather
this.VerifyParameterInfoAtStartOfMarker(fileContents,"(*Mark*)",[["int option";"float option"]])
[]
+ []
member public this.``Multi.Function.WithRefType``() =
let fileContents = """
let foo( a : int ref, b : string ref) = 0
diff --git a/vsintegration/tests/UnitTests/Tests.Build.fs b/vsintegration/tests/UnitTests/Tests.Build.fs
index ecdf69f5cf3da30a7a42369f9c640dc022a50bad..2263fc576745ee9bcfd7d44fdac97807773312b9 100644
--- a/vsintegration/tests/UnitTests/Tests.Build.fs
+++ b/vsintegration/tests/UnitTests/Tests.Build.fs
@@ -40,7 +40,7 @@ type MyLogger(f : string -> unit) =
type FauxHostObject() =
let mutable myFlags : string[] = null
let mutable mySources : string[] = null
- member x.Compile(compile:System.Converter, flags:string[], sources:string[]) =
+ member x.Compile(compile:System.Func, flags:string[], sources:string[]) =
myFlags <- flags
mySources <- sources
0
@@ -77,7 +77,7 @@ type Build() =
let p = tool.InternalGenerateFullPathToTool()
Assert.Fail("should not succeed")
with e ->
- e.Message.AssertMatchesPattern("ToolPath is unknown; specify the path to fsc.exe as the ToolPath property.")
+ e.Message.AssertMatchesPattern("ToolPath is unknown; specify the path to the tool.")
[]
member public this.TestCodePage() =
@@ -92,7 +92,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -107,7 +108,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -122,7 +124,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -139,7 +142,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -154,7 +158,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -168,7 +173,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -183,7 +189,8 @@ type Build() =
"--warnaserror-:52,109" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -198,7 +205,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -213,7 +221,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -228,7 +237,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -243,7 +253,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -258,7 +269,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -272,7 +284,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -287,7 +300,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -302,6 +316,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine +
"--yadda" + Environment.NewLine +
"yadda" + Environment.NewLine)
cmd
@@ -318,7 +333,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -333,7 +349,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -348,7 +365,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -363,7 +381,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -379,7 +398,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -395,7 +415,9 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine) cmd
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
+ cmd
[]
member public this.TestReferencePathWithSpaces() =
@@ -410,7 +432,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -425,7 +448,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine)
cmd
[]
@@ -442,6 +466,7 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine +
src + Environment.NewLine +
src + Environment.NewLine)
cmd
@@ -459,7 +484,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -474,7 +500,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -489,7 +516,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -503,7 +531,8 @@ type Build() =
"--utf8output" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -517,7 +546,8 @@ type Build() =
"--win32res:foo.res" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -531,7 +561,8 @@ type Build() =
"--win32manifest:foo.manifest" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -544,7 +575,8 @@ type Build() =
"--warnaserror:76" + Environment.NewLine +
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
- "--highentropyva+" + Environment.NewLine)
+ "--highentropyva+" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -558,7 +590,8 @@ type Build() =
"--fullpaths" + Environment.NewLine +
"--flaterrors" + Environment.NewLine +
"--subsystemversion:6.02" + Environment.NewLine +
- "--highentropyva-" + Environment.NewLine)
+ "--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine )
cmd
[]
@@ -627,6 +660,7 @@ type Build() =
"--flaterrors" + Environment.NewLine +
"--subsystemversion:4.0" + Environment.NewLine +
"--highentropyva-" + Environment.NewLine +
+ "--nocopyfsharpcore" + Environment.NewLine +
"--yadda:yadda" + Environment.NewLine +
"--other:internal quote" + Environment.NewLine +
"blah" + Environment.NewLine +
@@ -670,6 +704,7 @@ type Build() =
"--flaterrors"
"--subsystemversion:4.0"
"--highentropyva-"
+ "--nocopyfsharpcore"
"--yadda:yadda"
"--other:internal quote" // note stripped internal quotes
"blah" |]
diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
index 997471f88ce30a8574291e097a223414b598c7ed..1d4564108d2fd39d42a9f121604a076f80b8e0a0 100644
--- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
+++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
@@ -12,6 +12,7 @@
true
true
false
+ true