Commitc92ef56

committed

fix build

1 parentd3381bc commitc92ef56Copy full SHA for c92ef56

File tree

-7

lines changed

Makefile
mono/FSharp.Compiler.Private
- Makefile
src/fsharp
- FSharp.Compiler.Private
  - FSharp.Compiler.Private.netcore.nuspec
- fsi
  - fsimain.fs

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,15 +67,15 @@ install:`
`67`	`67`	`-rm -fr$(DESTDIR)$(monodir)/Microsoft\F#`
`68`	`68`	`-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#`
`69`	`69`	`-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core`
`70`		`--rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler`
	`70`	`+-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private`
`71`	`71`	`-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp`
`72`	`72`	`-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp`
`73`	`73`	`-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp`
`74`	`74`	`-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp`
`75`	`75`	`-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp`
`76`	`76`	`$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install`
`77`	`77`	`$(MAKE) -C mono/FSharp.Build install`
`78`		`-$(MAKE) -C mono/FSharp.Compiler install`
	`78`	`+$(MAKE) -C mono/FSharp.Compiler.Private install`
`79`	`79`	`$(MAKE) -C mono/Fsc install`
`80`	`80`	`$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install`
`81`	`81`	`$(MAKE) -C mono/FSharp.Compiler.Server.Shared install`

File renamed without changes.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?xml version="1.0"?>`
`2`	`2`	`<packagexmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">`
`3`	`3`	`<metadata>`
`4`		`- <id>FSharp.Compiler.Service.netcore</id>`
	`4`	`+ <id>FSharp.Compiler.Private.netcore</id>`
`5`	`5`	`<description>`
`6`	`6`	`.NET Core compatible version of the fsharp compiler service dll`
`7`	`7`	`Supported Platforms: - .NET Core (netstandard1.6)`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -308,10 +308,11 @@ let evaluateSession(argv: string[]) =`
`308`	`308`
`309`	`309`	`// Start the session`
`310`	`310`	`fsiSession.Run()`
`311`		`-`
`312`		`-with e-> printf"Exception by fsi.exe:\n%+A\n" e`
`313`		`-`
`314`		`-0`
	`311`	`+0`
	`312`	`+with`
	`313`	`+\| Microsoft.FSharp.Compiler.ErrorLogger.StopProcessingExn_->1`
	`314`	`+\| Microsoft.FSharp.Compiler.ErrorLogger.ReportedError_->1`
	`315`	`+\| e-> eprintf"Exception by fsi.exe:\n%+A\n" e;1`
`315`	`316`
`316`	`317`	`// Mark the main thread as STAThread since it is a GUI thread`
`317`	`318`	`[<EntryPoint>]`

Comments

(0)