[gh-78] Updated to latest F# compiler.

FSharp/Advanced/FSharpProjectOptionsExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.FSharp.Compiler.SourceCodeServices;
@@ -102,7 +102,7 @@ namespace MirrorSharp.FSharp.Advanced {
 
             return new FSharpProjectOptions(
                 options.ProjectFileName,
-                options.ProjectFileNames,
+                options.SourceFiles,
                 otherOptions,
                 options.ReferencedProjects,
                 options.IsIncompleteTypeCheckEnvironment,
@@ -110,7 +110,8 @@ namespace MirrorSharp.FSharp.Advanced {
                 options.LoadTime,
                 options.UnresolvedReferences,
                 options.OriginalLoadReferences,
-                options.ExtraProjectInfo
+                options.ExtraProjectInfo,
+                options.Stamp
             );
         }
 

FSharp/FSharp.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>MirrorSharp.FSharp</AssemblyName>
     <RootNamespace>MirrorSharp.FSharp</RootNamespace>
     <TargetFrameworks>net46</TargetFrameworks>
-    <VersionPrefix>0.9.0</VersionPrefix>
+    <VersionPrefix>0.9.1-pre-1</VersionPrefix>
     <Description>MirrorSharp F# support library. $(DescriptionSuffix)</Description>
     <PackageTags>F#;CodeMirror</PackageTags>
     <DocumentationFile>$(OutDir)\MirrorSharp.FSharp.xml</DocumentationFile>
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Compiler.Service" Version="12.0.8" />
-    <PackageReference Include="FSharp.Core" Version="4.1.17" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="14.0.2" />
+    <PackageReference Include="FSharp.Core" Version="4.2.3" />
   </ItemGroup>
 
 </Project>

FSharp/FSharpCore.targets

@@ -1,17 +0,0 @@
-<Project>
-   <!-- Should not be needed once https://github.com/Microsoft/visualfsharp/pull/2884 is available on NuGet -->
-  <Target Name="CopyOptdataAndSigdata" AfterTargets="Build">
-    <ItemGroup>
-      <FSharpCoreReference Include="@(Reference)" Condition="$([System.String]::Copy('%(Reference.Identity)').EndsWith('FSharp.Core.dll'))" />
-    </ItemGroup>
-    <PropertyGroup>
-      <FSharpCorePath>@(FSharpCoreReference->'%(Identity)')</FSharpCorePath>
-      <FSharpCoreDirectoryPath>$([System.IO.Path]::GetDirectoryName($(FSharpCorePath)))</FSharpCoreDirectoryPath>
-    </PropertyGroup>
-    <ItemGroup>
-      <OpdataAndSigdata Include="$(FSharpCoreDirectoryPath)\FSharp.Core.optdata" />
-      <OpdataAndSigdata Include="$(FSharpCoreDirectoryPath)\FSharp.Core.sigdata" />
-    </ItemGroup>
-    <Copy SourceFiles="@(OpdataAndSigdata)" DestinationFolder="$(OutDir)" />
-  </Target>
-</Project>

FSharp/Internal/FSharpSession.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
@@ -28,13 +28,13 @@ namespace MirrorSharp.FSharp.Internal {
                 null,
                 keepAssemblyContents: true,
                 keepAllBackgroundResolutions: true,
-                msbuildEnabled: false
+                legacyReferenceResolver: null
             );
             AssemblyReferencePaths = options.AssemblyReferencePaths;
             AssemblyReferencePathsAsFSharpList = ToFSharpList(options.AssemblyReferencePaths);
             ProjectOptions = new FSharpProjectOptions(
                 "_",
-                projectFileNames: new[] { "_.fs" },
+                sourceFiles: new[] { "_.fs" },
                 otherOptions: ConvertToOtherOptions(options),
                 referencedProjects: Array.Empty<Tuple<string, FSharpProjectOptions>>(),
                 isIncompleteTypeCheckEnvironment: true,
@@ -42,7 +42,8 @@ namespace MirrorSharp.FSharp.Internal {
                 loadTime: DateTime.Now,
                 unresolvedReferences: null,
                 originalLoadReferences: FSharpList<Tuple<Range.range, string>>.Empty, 
-                extraProjectInfo: null
+                extraProjectInfo: null,
+                stamp: null
             );
         }
 
@@ -105,7 +106,7 @@ namespace MirrorSharp.FSharp.Internal {
                 return _lastParseAndCheck;
 
             var tuple = await FSharpAsync.StartAsTask(
-                Checker.ParseAndCheckFileInProject("_.fs", 0, _text, ProjectOptions, null), null, cancellationToken
+                Checker.ParseAndCheckFileInProject("_.fs", 0, _text, ProjectOptions, null, null), null, cancellationToken
             ).ConfigureAwait(false);
 
             _lastParseAndCheck = new FSharpParseAndCheckResults(tuple.Item1, tuple.Item2);
@@ -185,7 +186,7 @@ namespace MirrorSharp.FSharp.Internal {
                 result.ParseResults, info.line.Number, info.column,
                 _text.Substring(info.line.Start, info.line.Length),
                 FSharpList<string>.Empty,
-                "", null
+                "", null, null
             ), null, cancellationToken);
             if (symbols.IsEmpty)
                 return null;

Owin.Demo/Owin.Demo.csproj

@@ -25,6 +25,4 @@
     <ProjectReference Include="..\FSharp\FSharp.csproj" />
     <ProjectReference Include="..\Owin\Owin.csproj" />
   </ItemGroup>
-  
-  <Import Project="../FSharp/FSharpCore.targets" />
 </Project>

Tests.Roslyn2.Net46/FSharpProjectOptionsExtensionsTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.FSharp.Compiler.SourceCodeServices;
 using MirrorSharp.FSharp.Advanced;
 using Xunit;
@@ -102,6 +102,7 @@ namespace MirrorSharp.Tests {
                 DateTime.MinValue,
                 null,
                 null,
+                null,
                 null
             );
         }

Tests.Roslyn2.Net46/Tests.Roslyn2.Net46.csproj

@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.99" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="2.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.3.2" />
@@ -36,6 +36,4 @@
     <ProjectReference Include="..\Testing\Testing.csproj" />
     <ProjectReference Include="..\VisualBasic\VisualBasic.csproj" />
   </ItemGroup>
-  
-  <Import Project="../FSharp/FSharpCore.targets" />
 </Project>

Tests.Roslyn2/Tests.Roslyn2.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="Moq" Version="4.6.38-alpha" />
+    <PackageReference Include="Moq" Version="4.7.99" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="2.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.3.2" />