Merge pull request #5693 from mono/fsharp-cleanupmonodevelop-7.8.0.129

[F#] Improvements in asm resolution and tests

74 files changed, 138 insertions, 455 deletions

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/Extensions.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/Extensions.fs
index 59d653cbcf..0924a97a9b 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/Extensions.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/Extensions.fs
@@ -1,5 +1,6 @@
 namespace MonoDevelop.FSharp.Shared
 open System
+open System.Collections
 open System.Text
 open System.Threading.Tasks
 open System.IO
@@ -9,6 +10,11 @@ open ExtCore
 module Seq =
     let tryHead items =
         if Seq.isEmpty items then None else Some (Seq.head items)
+
+    let ofType<'T> (items:IEnumerable) : seq<'T> =
+        items
+        |> Seq.cast<obj>
+        |> Seq.choose (fun i -> match i with | :? 'T as t -> Some t |_ -> None)
         
 module List =
     
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/CompilerArguments.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/CompilerArguments.fs
index 58bd80e95c..dc9b79dcc6 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/CompilerArguments.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/CompilerArguments.fs
@@ -16,6 +16,7 @@ type TestPlatform =
 
 [<TestFixture>]
 type CompilerArgumentsTests() =
+    inherit UnitTests.TestBase ()
     let toTask computation : Task = Async.StartAsTask computation :> _
 
     let makeTestableReference (path: string) =
@@ -23,29 +24,29 @@ type CompilerArgumentsTests() =
         let path = path.Substring(0,path.Length - 1)
         path
 
-    let createFSharpProject() =
+    let createFSharpProject(name) =
         async {
-            let monitor = new MonoDevelop.Core.ProgressMonitor()
+            let monitor = UnitTests.Util.GetMonitor ()
+            let dir = UnitTests.Util.CreateTmpDir(name)
             let testProject = Services.ProjectService.CreateDotNetProject ("F#") :?> FSharpProject
-            testProject.FileName <- Path.GetTempFileName() |> FilePath
+            testProject.FileName <- Path.Combine(dir, name + ".fsproj") |> FilePath
 
             let! _ = testProject.SaveAsync monitor |> Async.AwaitTask
-            do! testProject.ReevaluateProject(monitor) |> ignore
-                testProject.GetReferences()
+            do! testProject.ReevaluateProject(monitor)
             return testProject
         }
 
     member private x.``Run Only mscorlib referenced`` (assemblyName) =
         async {
-            use! testProject = createFSharpProject()
+            use! testProject = createFSharpProject("OnlyMscorlib")
             let assemblyName = match assemblyName with Fqn a -> fromFqn a | File a -> a
             let _ = testProject.AddReference assemblyName
+            let! asms = testProject.GetReferences (CompilerArguments.getConfig())
             let references =
                 CompilerArguments.generateReferences(testProject, 
-                                                     testProject.ReferencedAssemblies,
+                                                     asms,
                                                      Some (FSharpCompilerVersion.FSharp_3_1),
                                                      FSharpTargetFramework.NET_4_5,
-                                                     ConfigurationSelector.Default,
                                                      true) 
 
             //The two paths for mscorlib and FSharp.Core should match
@@ -77,17 +78,17 @@ type CompilerArgumentsTests() =
     member x.``Explicit FSharp.Core and mscorlib referenced``() =
         async {
             if Platform.IsMac then
-                use! testProject = createFSharpProject()
+                use! testProject = createFSharpProject("MscorlibAndFSharpCore")
                 let _ = testProject.AddReference "mscorlib"
                 // we need to use a path to FSharp.Core.dll that exists on disk
                 let fscorePath = typeof<FSharp.Core.PrintfFormat<_,_,_,_>>.Assembly.Location
                 let reference = testProject.AddReference fscorePath
+                let! asms = testProject.GetReferences (CompilerArguments.getConfig())
                 let references =
                     CompilerArguments.generateReferences(testProject,
-                                                         testProject.ReferencedAssemblies,
+                                                         asms,
                                                          Some (FSharpCompilerVersion.FSharp_3_1),
                                                          FSharpTargetFramework.NET_4_5,
-                                                         ConfigurationSelector.Default,
                                                          true)
                 let testPaths = references |> List.map makeTestableReference
                 testPaths |> should contain (reference.HintPath.FullPath |> string)
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Interactive.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Interactive.fs
index 42fe4222a1..802a33a067 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Interactive.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Interactive.fs
@@ -110,12 +110,23 @@ module Interactive =
     let ``Interactive send references uses real assemblies #43307``() =
         async {
             let! session = createSession()
-            let directoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-            let sln = directoryName / "Samples" / "bug43307" / "bug43307.sln"
-            use monitor = new ConsoleProgressMonitor()
+            let sln = UnitTests.Util.GetSampleProject ("bug43307", "bug43307.sln")
+            use monitor = UnitTests.Util.GetMonitor ()
             use! sol = Services.ProjectService.ReadWorkspaceItem (monitor, sln |> FilePath) |> Async.AwaitTask
             use project = sol.GetAllItems<FSharpProject> () |> Seq.head
-            project.GetOrderedReferences()
+
+            //workaround the fact that the project doesn't have a stable relative path
+            //to newtonsoft.json under the test harness by removing and re-adding with known path
+            let jsonAsmLoc = typeof<Newtonsoft.Json.JsonConvert>.Assembly.Location
+            let jsonRef =
+                project.References
+                |> Seq.filter (fun r -> r.Include.Equals "Newtonsoft.Json")
+                |> Seq.head
+            do project.References.Remove (jsonRef) |> ignore
+            project.References.Add (ProjectReference.CreateAssemblyFileReference (jsonAsmLoc |> FilePath))
+
+            let! refs = project.GetOrderedReferences(CompilerArguments.getConfig())
+            refs
             |> List.iter (fun a -> sendInput session (sprintf  @"#r ""%s"";;" a.Path))
             let finished = new AutoResetEvent(false)
             let input =
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
index 55333f64af..afbde6e90c 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
@@ -10,18 +10,17 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
-    <TestRunnerCommand>..\..\..\..\main\build\bin\mdtool.exe</TestRunnerCommand>
+    <TestRunnerCommand>..\..\..\build\bin\mdtool.exe</TestRunnerCommand>
     <TestRunnerArgs>run-md-tests</TestRunnerArgs>
+    <OutputPath>..\..\..\build\tests</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>true</ConsolePause>
     <StartAction>Program</StartAction>
     <StartProgram>$(MSBuildProjectDirectory)\..\..\..\build\bin\mdtool</StartProgram>
     <StartArguments>run-md-tests $(MSBuildProjectDirectory)\bin\Debug\MonoDevelop.FSharp.Tests.dll</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -106,13 +105,6 @@
     <Compile Include="SelectionTests.fs" />
     <Compile Include="UnusedOpens.fs" />
     <None Include="paket.references" />
-    <Content Include="Samples\Xamarin.iOS.fsproj" />
-    <Content Include="Samples\bug43307\bug43307\bug43307.fsproj">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Samples\bug43307\bug43307.sln">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Compile Include="BraceMatcher.fs" />
     <Compile Include="TagComments.fs" />
     <Compile Include="TypeSignatureHelp.fs" />
@@ -163,6 +155,11 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\tests\UnitTests\UnitTests.csproj">
+      <Project>{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}</Project>
+      <Name>UnitTests</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <Compile Include="SolutionPadOrdering.fs" />
     <None Include="..\..\..\build\AddIns\FSharpBinding\MonoDevelop.FSharpInteractive.Service.exe">
       <Link>MonoDevelop.FSharpInteractive.Service.exe</Link>
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/ProjectCracking.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/ProjectCracking.fs
index df39d5d7d4..5781bb157b 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/ProjectCracking.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/ProjectCracking.fs
@@ -20,12 +20,13 @@ module ``Project Cracking`` =
     let monitor = new ConsoleProgressMonitor()
 
     let getProjectOptions sln = async {
-        let! w = Services.ProjectService.ReadWorkspaceItem (monitor, FilePath(sln)) |> Async.AwaitTask
+        let! (w:WorkspaceItem) = Services.ProjectService.ReadWorkspaceItem (monitor, FilePath(sln))
 
         let s = w :?> Solution
         let fsproj = s.Items.[0] :?> FSharpProject
-        do! fsproj.GetReferences()
-        let opts = languageService.GetProjectOptionsFromProjectFile fsproj
+        let config = CompilerArguments.getConfig()
+        let! refs = fsproj.GetReferences (config)
+        let opts = languageService.GetProjectOptionsFromProjectFile fsproj config refs
         return opts.Value.OtherOptions
     }
 
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/Xamarin.iOS.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/Xamarin.iOS.fsproj
deleted file mode 100644
index 808ae6c1f4..0000000000
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/Xamarin.iOS.fsproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{D6A761C3-B329-42D3-9560-FE9774CCD0E1}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>iosappsyntax</RootNamespace>
-    <AssemblyName>iosappsyntax</AssemblyName>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;ENABLE_TEST_CLOUD</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
-    <MtouchFastDev>true</MtouchFastDev>
-    <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386</MtouchArch>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
-    <MtouchFloat32>true</MtouchFloat32>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <GenerateTailCalls>true</GenerateTailCalls>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386</MtouchArch>
-    <GenerateTailCalls>true</GenerateTailCalls>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;ENABLE_TEST_CLOUD</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <DeviceSpecificBuild>true</DeviceSpecificBuild>
-    <MtouchDebug>true</MtouchDebug>
-    <MtouchFastDev>true</MtouchFastDev>
-    <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
-    <MtouchFloat32>true</MtouchFloat32>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="Resources\LaunchScreen.xib" />
-    <InterfaceDefinition Include="Main.storyboard" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="Entitlements.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ViewController.fs" />
-    <Compile Include="AppDelegate.fs" />
-    <Compile Include="Main.fs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.FSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="ExtCore">
-          <HintPath>..\..\packages\ExtCore\lib\net40\ExtCore.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="ExtCore">
-          <HintPath>..\..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="FSharp.Compiler.Service">
-          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="FSharp.Compiler.Service">
-          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="Mono.Cecil.Mdb">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil.Pdb">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil.Rocks">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="Mono.Cecil.Mdb">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil.Pdb">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil.Rocks">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Mono.Cecil">
-          <HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-</Project>
\ No newline at end of file
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs
index e732fc5db4..fa48ce0e71 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs
@@ -15,13 +15,15 @@ open MonoDevelop.Ide.Templates
 open MonoDevelop.PackageManagement.Tests.Helpers
 open MonoDevelop.Projects
 open MonoDevelop.Projects.MSBuild
+open MonoDevelop.FSharp.Shared
 open NUnit.Framework
 
 [<TestFixture>]
 type ``Template tests``() =
+    inherit UnitTests.TestBase()
     let toTask computation : Task = Async.StartAsTask computation :> _
 
-    let monitor = new ConsoleProgressMonitor()
+    let monitor = UnitTests.Util.GetMonitor ()
     do
         FixtureSetup.initialiseMonoDevelop()
         let getField name =
@@ -52,27 +54,24 @@ type ``Template tests``() =
         |> Seq.filter(fun t -> t.Id.IndexOf("SharedAssets") = -1) // shared assets projects can't be built standalone
         |> List.ofSeq
 
-    let templatesDir = FilePath(".").FullPath.ToString() / "buildtemplates"
+    let templatesDir = UnitTests.Util.TmpDir / "fsharp-buildtemplates"
 
     let getErrorsForProject (solution:Solution) =
         asyncSeq {
-
+            let config = solution.DefaultConfigurationSelector
             let ctx = TargetEvaluationContext (LogVerbosity=MSBuildVerbosity.Quiet)
-            let! result = solution.Build(monitor, solution.DefaultConfigurationSelector, ctx) |> Async.AwaitTask
+            let! result = solution.Build(monitor, config, ctx) |> Async.AwaitTask
             match result.HasWarnings, result.HasErrors with
             //| "Xamarin.tvOS.FSharp.SingleViewApp", _, false //MTOUCH : warning MT0094: Both profiling (--profiling) and incremental builds (--fastdev) is not supported when building for tvOS. Incremental builds have ben disabled.]
             | false, false ->
                 // xbuild worked, now check for editor squiggles
                 let projects =
                     solution.Items
-                    |> Seq.filter(fun i -> i :? DotNetProject)
-                    |> Seq.cast<DotNetProject> |> List.ofSeq
-
+                    |> Seq.ofType<DotNetProject> |> List.ofSeq
                 for project in projects do
                     let checker = FSharpChecker.Create()
-                    let! refs = project.GetReferencedAssemblies (CompilerArguments.getConfig()) |> Async.AwaitTask
-
-                    let projectOptions = languageService.GetProjectOptionsFromProjectFile (project, refs)
+                    let! refs = project.GetReferences (config) |> Async.AwaitTask
+                    let projectOptions = languageService.GetProjectOptionsFromProjectFile project config refs
                     let! checkResult = checker.ParseAndCheckProject projectOptions.Value
                     for error in checkResult.Errors do
                         yield "Editor error", error.FileName, error.Message
@@ -161,10 +160,15 @@ type ``Template tests``() =
               </packageSources>
             </configuration>
             """
-        if not (Directory.Exists templatesDir) then
-            Directory.CreateDirectory templatesDir |> ignore
+        Directory.CreateDirectory templatesDir |> ignore
         let configFileName = templatesDir/"NuGet.Config"
         File.WriteAllText (configFileName, config, Text.Encoding.UTF8)
+        // HACK: Work around issue in "Xamarin Forms FSharp ClassLibrary" test
+        // the template is broken and doesn't define a framework, so gets the default net45
+        // however the base tests UnitTests.TestBase change the default to net40 resulting in
+        //"Could not install package 'FSharp.Core 4.3.3'. You are trying to install this package into a project that targets '.NETFramework,Version=v4.0',"
+        MonoDevelop.Projects.Services.ProjectService.DefaultTargetFramework
+            <- Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_5);
 
     [<Test;AsyncStateMachine(typeof<Task>)>]
     member x.``FSharp portable project``() =
@@ -181,23 +185,22 @@ type ``Template tests``() =
         } |> toTask
 
     [<Test;AsyncStateMachine(typeof<Task>)>]
-    [<Ignore("Waiting for dotnet core SDK 2.0 to be installed on Wrench")>]
     member x.``Can build netcoreapp11 MVC web app``()=
         async {
-            let directoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-            let projectPath = directoryName / ".." / ".." / "Samples" / "aspnetcoremvc11.sln"
+            let projectPath = UnitTests.Util.GetSampleProject ("fsharp-aspnetcoremvc11", "aspnetcoremvc11.sln")
 
             let! w = Services.ProjectService.ReadWorkspaceItem (monitor, FilePath(projectPath)) |> Async.AwaitTask
 
-            let solution = w :?> Solution
+            use solution = w :?> Solution
 
             let project =
                 solution.Items
-                |> Seq.filter(fun i -> i :? DotNetProject)
-                |> Seq.cast<DotNetProject>
+                |> Seq.ofType<DotNetProject>
                 |> Seq.head
 
             let! res = project.RunTarget(monitor, "Restore", ConfigurationSelector.Default)
+            do! project.ReevaluateProject (monitor)
+
             let fsharpFiles =
                 project.Files
                 |> Seq.filter(fun f -> f.FilePath.Extension = ".fs")
@@ -214,7 +217,6 @@ type ``Template tests``() =
             wwwrootFiles |> Seq.length |> should equal 41
             wwwrootFiles |> Seq.iter(fun imported -> imported |> should equal true)
             let errors = getErrorsForProject solution |> AsyncSeq.toSeq |> List.ofSeq
-            solution.Dispose()
             match errors with
             | [] -> Assert.Pass()
             | errors -> Assert.Fail (sprintf "%A" errors)
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs
index b67f0b0b05..dd5d0032d1 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs
@@ -408,10 +408,10 @@ type FSharpInteractivePad(editor:TextEditor) as this =
 
     member x.LoadReferences(project:FSharpProject) =
         LoggingService.LogDebug ("FSI:  #LoadReferences")
-        let orderedreferences = project.GetOrderedReferences()
-
-        orderedreferences
-        |> List.iter (fun a -> x.SendCommand (sprintf  @"#r ""%s""" a.Path))
+        async {
+            let! orderedReferences = project.GetOrderedReferences (CompilerArguments.getConfig())
+            orderedReferences |> List.iter (fun a -> x.SendCommand (sprintf  @"#r ""%s""" a.Path))
+        } |> Async.StartImmediate
 
     override x.Initialize(container:MonoDevelop.Ide.Gui.IPadWindow) =
         LoggingService.LogDebug ("InteractivePad: created!")
@@ -599,7 +599,6 @@ type FSharpFsiEditorCompletion() =
       override x.Run() =
           async {
               let project = IdeApp.Workbench.ActiveDocument.Project :?> FSharpProject
-              do! project.GetReferences()
               FSharpInteractivePad.Fsi
               |> Option.iter (fun fsi -> fsi.LoadReferences(project)
                                          FSharpInteractivePad.BringToFront(false))
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpProject.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpProject.fs
index f920269642..ec99923dc8 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpProject.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpProject.fs
@@ -41,7 +41,6 @@ type FSharpProject() as self =
                   "Profile259", ("3.259.3.1", true) ]
 
     let mutable initialisedAsPortable = false
-    let mutable referencedAssemblies = None
 
     let isPortable (project:MSBuildProject) =
         project.EvaluatedProperties.Properties
@@ -244,8 +243,10 @@ type FSharpProject() as self =
                                                     currentGuids.SetValue(newProjectTypeGuids))
         with exn -> LoggingService.LogWarning("Failed to remove old F# guid", exn)
 
+    [<Obsolete>]
     override x.OnCompileSources(items, config, configSel, monitor) =
-        CompilerService.Compile(items, config, x.ReferencedAssemblies, configSel, monitor)
+        let asms = (x.GetReferences configSel).Result
+        CompilerService.Compile(items, config, asms, configSel, monitor)
 
     override x.OnCreateCompilationParameters(config, kind) =
         let pars = new FSharpCompilerParameters()
@@ -307,19 +308,12 @@ type FSharpProject() as self =
         base.OnModified(e)
         if not self.Loading && not self.IsReevaluating then MDLanguageService.invalidateProjectFile self.FileName
 
-    member x.ReferencedAssemblies
-        with get() =
-            match referencedAssemblies with
-            | Some assemblies -> assemblies
-            | None ->
-                let assemblies = (x.GetReferencedAssemblies (CompilerArguments.getConfig())).Result
-                referencedAssemblies <- Some assemblies
-                assemblies
-
-    member x.GetOrderedReferences() =
-        let references =
-            let args =
-                CompilerArguments.getReferencesFromProject x x.ReferencedAssemblies
+    member x.GetOrderedReferences(config:ConfigurationSelector) =
+        async {
+            let orderAssemblyReferences = MonoDevelop.FSharp.OrderAssemblyReferences()
+            let! asms = x.GetReferences config
+            let references =
+                CompilerArguments.getReferencesFromProject (x, config, asms)
                 |> Seq.choose (fun ref -> if (ref.Contains "mscorlib.dll" || ref.Contains "FSharp.Core.dll")
                                           then None
                                           else
@@ -328,15 +322,7 @@ type FSharpProject() as self =
                                               else None )
                 |> Seq.distinct
                 |> Seq.toArray
-            args
-
-        let orderAssemblyReferences = MonoDevelop.FSharp.OrderAssemblyReferences()
-        orderAssemblyReferences.Order references
-
-    member x.GetReferences() =
-        async {
-            let! refs = x.GetReferencedAssemblies (CompilerArguments.getConfig()) |> Async.AwaitTask
-            referencedAssemblies <- Some refs
+            return orderAssemblyReferences.Order references
         }
 
     member x.ReevaluateProject(e) =
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerArguments.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerArguments.fs
index 12fb721298..622d327844 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerArguments.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerArguments.fs
@@ -54,55 +54,6 @@ module CompilerArguments =
           let properties = project.MSBuildProject.EvaluatedProperties
           properties.HasProperty ("TargetFramework") || properties.HasProperty ("TargetFrameworks")
 
-      let isOrReferencesPortableProject (project: DotNetProject) =
-          isPortable project ||
-          project.GetReferencedAssemblyProjects(getCurrentConfigurationOrDefault project)
-          |> Seq.exists isPortable
-
-      let getAssemblyLocations (reference:ProjectReference) =
-          let tryGetFromHintPath() =
-              if reference.HintPath.IsNotNull then
-                  let path = reference.HintPath.FullPath |> string
-                  let path = path.Replace("/Library/Frameworks/Mono.framework/External",
-                                          "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono")
-                  if File.Exists path then
-                      [path]
-                  else
-                      // try and resolve from GAC
-                      [reference.HintPath.FileName]
-              else
-                  []
-
-          match reference.ReferenceType with
-          | ReferenceType.Assembly ->
-              tryGetFromHintPath()
-          | ReferenceType.Package ->
-              if isNull reference.Package then
-                  tryGetFromHintPath()
-              else
-                  if reference.Include <> "System" then
-                      let assembly =
-                           reference.Package.Assemblies
-                           |> Seq.tryFind (fun a -> a.Name = reference.Include || a.FullName = reference.Include)
-                      match assembly with
-                      | Some asm -> [asm.Location]
-                      | None -> []
-                  else
-                      []
-
-          | ReferenceType.Project ->
-              let referencedProject = reference.Project :?> DotNetProject
-              let reference =
-                  referencedProject.GetReferencedAssemblyProjects (getCurrentConfigurationOrDefault referencedProject)
-                  |> Seq.tryFind(fun p -> p.Name = reference.Reference)
-
-              match reference with
-                  | Some ref ->
-                      let output = ref.GetOutputFileName(getCurrentConfigurationOrDefault ref)
-                      [output.FullPath.ToString()]
-                  | _ -> []
-          | _ -> []
-
       let getDefaultTargetFramework (runtime:TargetRuntime) =
           let newest_net_framework_folder (best:TargetFramework,best_version:int[]) (candidate_framework:TargetFramework) =
               if runtime.IsInstalled(candidate_framework) && candidate_framework.Id.Identifier = TargetFrameworkMoniker.ID_NET_FRAMEWORK then
@@ -137,25 +88,6 @@ module CompilerArguments =
           let best_info = Seq.fold newest_net_framework_folder (first,[| 0 |]) candidate_frameworks
           fst best_info
 
-      let portableReferences (project: DotNetProject) =
-          // create a new target framework  moniker, the default one is incorrect for portable unless the project type is PortableDotnetProject
-          // which has the default moniker profile of ".NETPortable" rather than ".NETFramework".  We cant use a PortableDotnetProject as this
-          // requires adding a guid flavour, which breaks compatiability with VS until the MD project system is refined to support projects the way VS does.
-          let frameworkMoniker = TargetFrameworkMoniker (TargetFrameworkMoniker.ID_PORTABLE, project.TargetFramework.Id.Version, project.TargetFramework.Id.Profile)
-          let assemblyDirectoryName = frameworkMoniker.GetAssemblyDirectoryName()
-          project.TargetRuntime.GetReferenceFrameworkDirectories()
-          |> Seq.tryFind (fun fd -> Directory.Exists(fd.Combine([|TargetFrameworkMoniker.ID_PORTABLE|]).ToString()))
-          |> function
-             | Some fd -> Directory.EnumerateFiles(Path.Combine(fd.ToString(), assemblyDirectoryName), "*.dll")
-             | None -> Seq.empty
-
-      let getPortableReferences (project: DotNetProject) =
-          project.References
-          |> Seq.collect getAssemblyLocations
-          |> Seq.append (portableReferences project)
-          |> set
-          |> Set.toList
-
   module ReferenceResolution =
     
     let tryGetDefaultReference langVersion targetFramework filename (extrapath: string option) =
@@ -168,69 +100,9 @@ module CompilerArguments =
   let resolutionFailedMessage (n:string) = String.Format ("Resolution: Assembly resolution failed when trying to find default reference for: {0}", n)
   /// Generates references for the current project & configuration as a
   /// list of strings of the form [ "-r:<full-path>"; ... ]
-  let generateReferences (project: DotNetProject, projectAssemblyReferences: AssemblyReference seq, langVersion, targetFramework, configSelector, shouldWrap) =
-   if Project.isPortable project then
-       [for ref in Project.getPortableReferences project do
-            yield "-r:" + ref]
-   else
-       let isAssemblyPortable path =
-           try
-               let assembly = Assembly.ReflectionOnlyLoadFrom path
-
-               let referencesSystemRuntime() =
-                   assembly.GetReferencedAssemblies()
-                   |> Seq.exists (fun a -> a.Name = "System.Runtime")
-
-               let hasTargetFrameworkProfile() =
-                   try
-                       assembly.GetCustomAttributes(true)
-                       |> Seq.tryFind (fun a ->
-                              match a with
-                              | :? TargetFrameworkAttribute as attr ->
-                                   let fn = new FrameworkName(attr.FrameworkName)
-                                   not (fn.Profile = "")
-                              | _ -> false)
-                       |> Option.isSome
-                   with
-                   | :? IOException -> true
-                   | _e -> false
-
-               referencesSystemRuntime() || hasTargetFrameworkProfile()
-           with
-           | _e -> false
-
-       let needsFacades () =
-           let referencedAssemblyProjects = project.GetReferencedAssemblyProjects configSelector
-
-           match referencedAssemblyProjects |> Seq.tryFind Project.isPortable with
-           | Some _ -> true
-           | None -> project.References
-                     |> Seq.filter (fun r -> r.ReferenceType = ReferenceType.Assembly)
-                     |> Seq.collect Project.getAssemblyLocations
-                     |> Seq.tryFind isAssemblyPortable
-                     |> Option.isSome
-
-       let wrapf = if shouldWrap then wrapFile else id
-
-       let getReferencedAssemblies (project:DotNetProject) =
-            let hasExplicitFSharpCore =
-                project.References |> Seq.exists (fun r -> r.Include = "FSharp.Core")
-
-            LoggingService.logDebug "Fetching referenced assemblies for %s " project.Name
-
-            if hasExplicitFSharpCore then
-                projectAssemblyReferences |> Seq.filter (fun r -> not (r.FilePath.ToString().EndsWith "FSharp.Core.dll"))
-            else
-                projectAssemblyReferences
-
+  let generateReferences (project: DotNetProject, projectAssemblyReferences: AssemblyReference seq, langVersion, targetFramework, shouldWrap) =
        [
-        let portableRefs =
-            if needsFacades() then
-                project.TargetRuntime.FindFacadeAssembliesForPCL project.TargetFramework
-                |> Seq.filter (fun r -> not (r.EndsWith("mscorlib.dll"))
-                                        && not (r.EndsWith("FSharp.Core.dll")))
-            else
-                Seq.empty
+        let wrapf = if shouldWrap then wrapFile else id
 
         let getAbsolutePath (ref:AssemblyReference) =
             let assemblyPath = ref.FilePath
@@ -241,11 +113,8 @@ module CompilerArguments =
                 Path.GetFullPath s
 
         let projectReferences =
-            project.References
-            |> Seq.collect Project.getAssemblyLocations
-            |> Seq.append portableRefs
-
-            |> Seq.append (getReferencedAssemblies project |> Seq.map getAbsolutePath)
+            projectAssemblyReferences
+            |> Seq.map getAbsolutePath
             |> Seq.distinct
 
         let find assemblyName=
@@ -303,7 +172,7 @@ module CompilerArguments =
   /// F# compiler options (debugging, tail-calls etc.), custom command line
   /// parameters and assemblies referenced by the project ("-r" options)
   let generateCompilerOptions (project:DotNetProject, projectAssemblyReferences: AssemblyReference seq, fsconfig:FSharpCompilerParameters, reqLangVersion, targetFramework, configSelector, shouldWrap) =
-    let dashr = generateReferences (project, projectAssemblyReferences, reqLangVersion, targetFramework, configSelector, shouldWrap) |> Array.ofSeq
+    let dashr = generateReferences (project, projectAssemblyReferences, reqLangVersion, targetFramework, shouldWrap) |> Array.ofSeq
 
     let splitByChars (chars: char array) (s:string) =
         s.Split(chars, StringSplitOptions.RemoveEmptyEntries)
@@ -485,16 +354,14 @@ module CompilerArguments =
             | ws when ws <> null && ws.ActiveConfiguration <> null -> ws.ActiveConfiguration
             | _ -> MonoDevelop.Projects.ConfigurationSelector.Default
 
-  let getArgumentsFromProject (proj:DotNetProject) (referencedAssemblies) =
+  let getArgumentsFromProject (proj:DotNetProject) (config:ConfigurationSelector) (referencedAssemblies) =
         maybe {
-            let config = getConfig()
             let! projConfig = proj.GetConfiguration(config) |> Option.tryCast<DotNetProjectConfiguration>
             let! fsconfig = projConfig.CompilationParameters |> Option.tryCast<FSharpCompilerParameters>
             return generateProjectOptions (proj, referencedAssemblies, fsconfig, None, getTargetFramework projConfig.TargetFramework.Id, config, false)
         }
 
-  let getReferencesFromProject (proj:DotNetProject) referencedAssemblies =
-        let config = getConfig()
+  let getReferencesFromProject (proj:DotNetProject, config:ConfigurationSelector, referencedAssemblies) =
         let projConfig = proj.GetConfiguration(config) :?> DotNetProjectConfiguration
-        generateReferences(proj, referencedAssemblies, None, getTargetFramework projConfig.TargetFramework.Id, config, false)
+        generateReferences(proj, referencedAssemblies, None, getTargetFramework projConfig.TargetFramework.Id, false)
 
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs
index eabaf4c2a5..c1a4f6ef5b 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs
@@ -272,10 +272,15 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x =
         //cache 50 project infos, then start evicting the least recently used entries
         ref (ExtCore.Caching.LruCache.create 50u)
 
-    let optionsForDependentProject p =
+    let optionsForDependentProject projectFile =
+        let project = x.GetProjectFromFileName projectFile
         async {
-            let! assemblies = x.GetReferencedAssembliesAsync p
-            return x.GetProjectCheckerOptions(p, [], assemblies)
+            let! assemblies = async {
+                match project with
+                | Some (proj:DotNetProject) -> return! proj.GetReferences(CompilerArguments.getConfig()) |> Async.AwaitTask
+                | None -> return new List<AssemblyReference> ()
+            }
+            return x.GetProjectCheckerOptions(projectFile, [], assemblies)
         }
 
     member x.Checker = checker
@@ -336,38 +341,22 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x =
         |> Seq.tryFind (fun p -> p.FileName.FullPath.ToString() = projectFile)
         |> Option.map(fun p -> p :?> DotNetProject)
 
-    member x.GetReferencedAssembliesSynchronously (project:DotNetProject) =
-        project.GetReferencedAssemblies(CompilerArguments.getConfig()).Result
-
-    member x.GetReferencedAssembliesAsync projectFile =
-        async {
-            let project = x.GetProjectFromFileName projectFile
-            match project with
-            | Some proj -> return! proj.GetReferencedAssemblies(CompilerArguments.getConfig()) |> Async.AwaitTask
-            | None -> return Seq.empty
-        }
-
-    member x.GetProjectOptionsFromProjectFile(project:DotNetProject, ?referencedAssemblies) =
-        let referencedAssemblies = defaultArg referencedAssemblies (x.GetReferencedAssembliesSynchronously project)
-        let config =
-            match IdeApp.Workspace with
-            | null -> ConfigurationSelector.Default
-            | ws ->
-               match ws.ActiveConfiguration with
-               | null -> ConfigurationSelector.Default
-               | config -> config
+    member x.GetProjectOptionsFromProjectFile (project:DotNetProject) (config:ConfigurationSelector) (referencedAssemblies:AssemblyReference seq) =
 
-        let getReferencedProjects (project:DotNetProject) =
+        // hack: we can't just pull the refs out of referencedAssemblies as we use this for referenced projects as well
+        let getReferencedFSharpProjects (project:DotNetProject) =
             project.GetReferencedAssemblyProjects config
             |> Seq.filter (fun p -> p <> project && p.SupportedLanguages |> Array.contains "F#")
 
         let rec getOptions referencedProject =
-            let projectOptions = CompilerArguments.getArgumentsFromProject referencedProject referencedAssemblies
+            // hack: we use the referencedAssemblies of the root project for the dependencies' options as well
+            // which is obviously wrong, but it doesn't seem to matter in this case
+            let projectOptions = CompilerArguments.getArgumentsFromProject referencedProject config referencedAssemblies
             match projectOptions with
             | Some projOptions ->
                 let referencedProjectOptions =
                     referencedProject
-                    |> getReferencedProjects
+                    |> getReferencedFSharpProjects
                     |> Seq.fold (fun acc reference ->
                                      match getOptions reference with
                                      | Some outFile, Some opts  -> (outFile, opts) :: acc
@@ -386,7 +375,16 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x =
 
     /// Constructs options for the interactive checker for a project under the given configuration.
     member x.GetProjectCheckerOptions(projFilename, ?properties, ?referencedAssemblies) : FSharpProjectOptions option =
-        let properties = defaultArg properties ["Configuration", IdeApp.Workspace.ActiveConfigurationId]
+        let config =
+            maybe {
+                let! ws = IdeApp.Workspace |> Option.ofObj
+                return! ws.ActiveConfiguration |> Option.ofObj
+            } |> Option.defaultValue ConfigurationSelector.Default
+        let configId =
+            match IdeApp.Workspace with
+            | null -> null
+            | ws -> ws.ActiveConfigurationId
+        let properties = defaultArg properties ["Configuration", configId]
         let key = (projFilename, properties)
 
         lock projectInfoCache (fun () ->
@@ -404,8 +402,11 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x =
                 match project with
                 | Some proj ->
                     let proj = proj :?> DotNetProject
-                    let referencedAssemblies = defaultArg referencedAssemblies (x.GetReferencedAssembliesSynchronously proj)
-                    let opts = x.GetProjectOptionsFromProjectFile (proj, referencedAssemblies)
+                    //fixme eliminate this .Result
+                    let asms = match referencedAssemblies with
+                               | Some a -> a
+                               | None -> (proj.GetReferences config).Result
+                    let opts = x.GetProjectOptionsFromProjectFile proj config asms
                     opts |> Option.bind(fun opts' ->
                         projectInfoCache := cache.Add (key, opts')
                         // Print contents of check option for debugging purposes
@@ -680,4 +681,4 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x =
         LoggingService.logDebug "LanguageService: Clearing root caches and finalizing transients"
         checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients()
         checkProjectResultsCache.Clear()
-        x.ClearProjectInfoCache()
\ No newline at end of file
+        x.ClearProjectInfoCache()
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
index 9852af27b9..5ead1b1f65 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
@@ -936,6 +936,9 @@ namespace MonoDevelop.Projects
 				}
 			}
 
+			// HACK: all the logic below is replicating things MSBuild does in ResolveReferences but not
+			// in the subtargets we currently call, ResolveAssemblyReferences
+
 			var config = (DotNetProjectConfiguration)GetConfiguration (configuration);
 			bool noStdLib = false;
 			if (config != null)
@@ -987,6 +990,22 @@ namespace MonoDevelop.Projects
 					}
 				}
 			}
+
+			// we do this here rather than PortableDotNetProjectFlavor because F# doesn't use the flavor for PCLs
+			if (TargetFramework.Id.Identifier == ".NETPortable" && TargetFramework.Id.Version != "5.0") {
+				var props = new MSBuildPropertyGroupEvaluated (null);
+				const string resolvedFrom = "ImplicitlyExpandTargetFramework";
+				var property = new MSBuildPropertyEvaluated (null, "ResolvedFrom", resolvedFrom, resolvedFrom);
+				props.SetProperty (property.Name, property);
+
+				foreach (var asm in TargetRuntime.AssemblyContext.GetAssemblies (TargetFramework)) {
+					if (asm.Package.IsFrameworkPackage) {
+						var ar = new AssemblyReference (asm.Location, props);
+						result.Add (ar);
+					}
+				}
+			}
+
 			return result;
 		}
 
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
index 44bfd47bb2..d915c2664c 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs
@@ -75,16 +75,6 @@ namespace MonoDevelop.Projects
 			// Note: see also: PortableLibrary.xpt.xml
 			return new TargetFrameworkMoniker (".NETPortable", "4.5", "Profile78");
 		}
-
-		internal protected override async Task<List<AssemblyReference>> OnGetReferencedAssemblies (ConfigurationSelector configuration)
-		{
-			var res = await base.OnGetReferencedAssemblies (configuration);
-			if (Project.TargetFramework.Id.Version != "5.0") {
-				var asms = Project.TargetRuntime.AssemblyContext.GetAssemblies (Project.TargetFramework).Where (a => a.Package.IsFrameworkPackage).Select (a => new AssemblyReference (a.Location));
-				res.AddRange (asms);
-			}
-			return res;
-		}
 	}
 }
 
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/bug43307/bug43307.sln b/main/tests/test-projects/bug43307/bug43307.sln
index 8475e93dac..8475e93dac 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/bug43307/bug43307.sln
+++ b/main/tests/test-projects/bug43307/bug43307.sln
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/bug43307/bug43307/bug43307.fsproj b/main/tests/test-projects/bug43307/bug43307/bug43307.fsproj
index 9c0eb3d680..3b51ce69f9 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/bug43307/bug43307/bug43307.fsproj
+++ b/main/tests/test-projects/bug43307/bug43307/bug43307.fsproj
@@ -41,7 +41,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11.sln b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11.sln
index abcd4a438b..abcd4a438b 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11.sln
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11.sln
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/.bowerrc b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/.bowerrc
index 6406626abf..6406626abf 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/.bowerrc
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/.bowerrc
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Controllers/HomeController.fs b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Controllers/HomeController.fs
index a405882fda..a405882fda 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Controllers/HomeController.fs
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Controllers/HomeController.fs
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Program.fs b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Program.fs
index 18aa597383..18aa597383 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Program.fs
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Program.fs
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Startup.fs b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Startup.fs
index 119fe3f2bb..119fe3f2bb 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Startup.fs
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Startup.fs
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/About.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/About.cshtml
index 50476d1fbd..50476d1fbd 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/About.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/About.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/Contact.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/Contact.cshtml
index 15c12c6d12..15c12c6d12 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/Contact.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/Contact.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/Index.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/Index.cshtml
index e3f313df23..e3f313df23 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Home/Index.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Home/Index.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/Error.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/Error.cshtml
index e514139c45..e514139c45 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/Error.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/Error.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/_Layout.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/_Layout.cshtml
index 51948aa96a..51948aa96a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/_Layout.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/_Layout.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/_ValidationScriptsPartial.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/_ValidationScriptsPartial.cshtml
index 27e0ea7ce2..27e0ea7ce2 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/Shared/_ValidationScriptsPartial.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/_ViewImports.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/_ViewImports.cshtml
index 850cef86c6..850cef86c6 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/_ViewImports.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/_ViewImports.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/_ViewStart.cshtml b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/_ViewStart.cshtml
index a5f10045db..a5f10045db 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/Views/_ViewStart.cshtml
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/Views/_ViewStart.cshtml
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/appsettings.Development.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/appsettings.Development.json
index fa8ce71a97..fa8ce71a97 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/appsettings.Development.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/appsettings.Development.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/appsettings.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/appsettings.json
index 5fff67bacc..5fff67bacc 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/appsettings.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/appsettings.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/aspnetcoremvc11.fsproj b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/aspnetcoremvc11.fsproj
index e45bbb270f..e45bbb270f 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/aspnetcoremvc11.fsproj
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/aspnetcoremvc11.fsproj
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/bower.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/bower.json
index b07e3cc5ae..b07e3cc5ae 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/bower.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/bower.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/bundleconfig.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/bundleconfig.json
index 6d3f9a57ae..6d3f9a57ae 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/bundleconfig.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/bundleconfig.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/css/site.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/css/site.css
index e31abdefd3..e31abdefd3 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/css/site.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/css/site.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/css/site.min.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/css/site.min.css
index 2c0359d1a8..2c0359d1a8 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/css/site.min.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/css/site.min.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/favicon.ico b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/favicon.ico
index a3a799985c..a3a799985c 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/favicon.ico
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/favicon.ico
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner1.svg b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner1.svg
index 0bd7ef1ee4..0bd7ef1ee4 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner1.svg
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner1.svg
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner2.svg b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner2.svg
index 1c211b3ab9..1c211b3ab9 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner2.svg
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner2.svg
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner3.svg b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner3.svg
index 7f0c38fdbe..7f0c38fdbe 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner3.svg
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner3.svg
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner4.svg b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner4.svg
index b3b5d03b45..b3b5d03b45 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/images/banner4.svg
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/images/banner4.svg
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/js/site.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/js/site.js
index 82ecce7b4a..82ecce7b4a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/js/site.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/js/site.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/js/site.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/js/site.min.js
index e69de29bb2..e69de29bb2 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/js/site.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/js/site.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/.bower.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/.bower.json
index 1e99b62994..1e99b62994 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/.bower.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/.bower.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/LICENSE b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/LICENSE
index 7a300022c3..7a300022c3 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/LICENSE
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/LICENSE
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
index e9957d86d1..e9957d86d1 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
index d876f60fb4..d876f60fb4 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
index accf91a72d..accf91a72d 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
index 94813e9006..94813e9006 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css
index 92c84e1c26..92c84e1c26 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
index f010c82d11..f010c82d11 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
index 81015c5bdc..81015c5bdc 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
index 6c7fa40b98..6c7fa40b98 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
index b93a4953ff..b93a4953ff 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
index e5e4b5857d..e5e4b5857d 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
index 1413fc609a..1413fc609a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
index 9e612858f8..9e612858f8 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
index 64539b54c3..64539b54c3 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.js
index 8a2e99a535..8a2e99a535 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
index 9bcd2fccae..9bcd2fccae 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/npm.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/npm.js
index bf6aa80602..bf6aa80602 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/npm.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
index ccf48121dc..ccf48121dc 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
index 1b0de12496..1b0de12496 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
index be9a38a4cf..be9a38a4cf 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/.bower.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/.bower.json
index cab34a4a61..cab34a4a61 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/.bower.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/.bower.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/LICENSE.md b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/LICENSE.md
index dc377cc031..dc377cc031 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/LICENSE.md
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.js
index df41fbd403..df41fbd403 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
index b63c3ca12c..b63c3ca12c 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.js
index 4e979bcf67..4e979bcf67 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
index 643837b90a..643837b90a 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/.bower.json b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/.bower.json
index 419488b5bc..419488b5bc 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/.bower.json
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/.bower.json
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/LICENSE.txt b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/LICENSE.txt
index 5312a4c864..5312a4c864 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/LICENSE.txt
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/LICENSE.txt
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.js
index 1e0ba99740..1e0ba99740 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.js b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.js
index 06ac263150..06ac263150 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.js
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.map b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.map
index e62d102141..e62d102141 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/Samples/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.map
+++ b/main/tests/test-projects/fsharp-aspnetcoremvc11/aspnetcoremvc11/wwwroot/lib/jquery/dist/jquery.min.map