Merge remote-tracking branch 'origin/dev'

OlegZee · OlegZee · commit 033934c19ced · 2015-07-06T23:09:44.000+06:00
diff --git a/core/DotNetFwk.fs b/core/DotNetFwk.fs
@@ -108,7 +108,7 @@ module DotNetFwk =
                         ToolDir = libdir </> "mono" </> libpath
                         Version = ver
                         CscTool = csc_tool
-                        FscTool = Some "fsharpi"
+                        FscTool = Some "fsharpc"
                         MsbuildTool = "xbuild"
                         EnvVars =["PATH", sdkroot </> "bin" + ";" + (%"PATH")]
                     }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ module DotNetFwk =`
`108`	`108`	`ToolDir = libdir </> "mono" </> libpath`
`109`	`109`	`Version = ver`
`110`	`110`	`CscTool = csc_tool`
`111`		`- FscTool = Some "fsharpi"`
	`111`	`+ FscTool = Some "fsharpc"`
`112`	`112`	`MsbuildTool = "xbuild"`
`113`	`113`	`EnvVars =["PATH", sdkroot </> "bin" + ";" + (%"PATH")]`
`114`	`114`	`}`