Merge branch 'master' of https://github.com/fsharp/fsharp

Author: dsyme

.travis.yml

@@ -20,3 +20,7 @@ script:
   - xbuild ./src/fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
   - (cd tests/projects; ./build.sh)
   - (cd tests/fsharp/core; ./run-opt.sh)
+
+matrix:
+  allow_failures:
+    - mono: latest

CHANGES.txt CHANGELOG-fsharp.mdCHANGES.txt renamed to CHANGELOG-fsharp.md

@@ -1,3 +1,9 @@
+4.0.1.1
+  * Integrate Microsoft\visualfsharp to 8111c63. See CHANGELOG-visualfsharp.md for changes from Microsoft\visualfsharp
+  * 04cd959 - fix problem with loop optimization
+  * d995c59 - Assume we are inside XBuild when 4.5/Mono.Posix.dll exists
+  * Fix [#483](https://github.com/fsharp/fsharp/issues/483) - Call to Type.GetType for a missing type causes FSI on Mono to produce an erroneous error
+
 4.0.0.4
   * Integrate Microsoft\visualfsharp to 2d413fb94. See CHANGELOG.md for changes from Microsoft\visualfsharp
 

CHANGELOG.md CHANGELOG-visualfsharp.mdCHANGELOG.md renamed to CHANGELOG-visualfsharp.md

@@ -1,6 +1,6 @@
 
 # the version under development, update after a release
-$version = '4.0.1.1'
+$version = '4.0.1.2'
 
 function isVersionTag($tag){
     $v = New-Object Version
@@ -18,7 +18,7 @@ if ($env:appveyor){
     $version = $version + '-b001'
 }
 
-$nuget = (gi .\FSharp.Core.Nuget\.nuget\NuGet.exe).FullName
+$nuget = (gi .\.nuget\NuGet.exe).FullName
 
 function pack($nuspec){
     $dir = [IO.Path]::GetDirectoryName($nuspec)

FSharp.Core.Nuget/.nuget/NuGet.Config

@@ -72,6 +72,12 @@ TARGET = $(TargetFramework)
 outsuffix = $(TargetFramework)
 endif
 
+ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarintvos-)
+VERSION = 3.98.4.0
+TARGET = $(TargetFramework)
+outsuffix = $(TargetFramework)
+endif
+
 ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacmobile-)
 VERSION = 3.99.4.0
 TARGET = $(TargetFramework)