Skip to content

Commit 2d51df2

Browse files
authored
Merge pull request #689 from dsyme/fix-build-3
fix build
2 parents 729bdbf + 1292612 commit 2d51df2

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/fsharp/FSharp.Compiler.Service.MSBuild.v12/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "8.0.0",
2+
"version": "9.0.1",
33
"buildOptions": {
44
"debugType": "portable",
55
"compilerName": "fsc",
@@ -33,7 +33,7 @@
3333
"System.Reflection.Metadata": "1.4.1-beta-24227-04",
3434
"System.Diagnostics.Process": "4.1.0",
3535
"FSharp.Compiler.Service": {
36-
"version": "8.0.0",
36+
"version": "9.0.1",
3737
"target": "project"
3838
}
3939
},

src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "8.0.0",
2+
"version": "9.0.1",
33
"buildOptions": {
44
"debugType": "portable",
55
"emitEntryPoint": false,
@@ -36,7 +36,7 @@
3636
"Microsoft.Build.Utilities.Core": "14.3.0",
3737
"System.Runtime.Serialization.Json": "4.0.2",
3838
"FSharp.Compiler.Service": {
39-
"version": "8.0.0",
39+
"version": "9.0.1",
4040
"target": "project"
4141
}
4242
},

src/fsharp/FSharp.Compiler.Service/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "8.0.0",
2+
"version": "9.0.1",
33
"buildOptions": {
44
"debugType": "portable",
55
"compilerName": "fsc",

tests/service/ProjectOptionsTests.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ let ``Test OtherOptions order for GetProjectOptionsFromScript`` () =
448448

449449
projOpts.OtherOptions
450450
|> Array.map (fun s -> if s.StartsWith "--" then s else Path.GetFileNameWithoutExtension s)
451-
|> shouldEqual expected2
451+
|> Array.sort
452+
|> shouldEqual (Array.sort expected2)
452453
let otherArgs = [|"--noframework"; "--warn:3"; "System.Numerics"; "mscorlib"; "FSharp.Core"; "System"; "System.Xml"; "System.Runtime.Remoting"; "System.Runtime.Serialization.Formatters.Soap"; "System.Data"; "System.Drawing"; "System.Core"; "System.Runtime"; "System.Linq"; "System.Reflection"; "System.Linq.Expressions"; "System.Threading.Tasks"; "System.IO"; "System.Net.Requests"; "System.Collections"; "System.Runtime.Numerics"; "System.Threading"; "System.Web"; "System.Web.Services"; "System.Windows.Forms"; "FSharp.Compiler.Interactive.Settings"|]
453454
test "Main1" otherArgs
454455
test "Main2" otherArgs

0 commit comments

Comments
 (0)