diff options
Diffstat (limited to 'main/external')
11 files changed, 26 insertions, 10 deletions
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 ed9d86d2ec..3acc8832ac 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj @@ -18,6 +18,8 @@ <StartAction>Program</StartAction> <StartProgram>$(MSBuildProjectDirectory)\..\..\..\build\bin\mdtool</StartProgram> <StartArguments>run-md-tests $(MSBuildProjectDirectory)\bin\Debug\MonoDevelop.FSharp.Tests.dll</StartArguments> + <StartArguments>run-md-tests $(MSBuildProjectDirectory)\..\..\..\build\tests\MonoDevelop.FSharp.Tests.dll</StartArguments> + <EnablePrivateAssetsLocalCopyWorkaround>false</EnablePrivateAssetsLocalCopyWorkaround> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> @@ -68,6 +70,7 @@ </Reference> <Reference Include="FSharp.Compiler.Interactive.Settings"> <HintPath>..\MonoDevelop.FSharpi.Service\lib\FSharp.Compiler.Interactive.Settings.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <Import Project="$(CustomBeforeMicrosoftCommonTargets)" /> @@ -286,5 +289,16 @@ </ItemGroup> </When> </Choose> + <ItemGroup> + <IncludeCopyLocal Include="System.Reactive.dll" /> + <IncludeCopyLocal Include="Newtonsoft.Json.dll" /> + <IncludeCopyLocal Include="ExtCore.dll" /> + <IncludeCopyLocal Include="Fantomas.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.CodeDom.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.Service.dll" /> + <IncludeCopyLocal Include="FSharp.Core.dll" /> + <IncludeCopyLocal Include="MonoDevelop.FSharp.Shared.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.Interactive.Settings.dll" /> + </ItemGroup> <Import Project="..\packages\StrongNamer\build\StrongNamer.targets" Condition="Exists('..\packages\StrongNamer\build\StrongNamer.targets')" Label="Paket" /> </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 a2cf99391c..7fd4582909 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TemplateTests.fs @@ -154,7 +154,7 @@ type ``Template tests``() = // 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'," + //"Could not install package 'FSharp.Core 4.5.4'. 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); diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj index 644468d0c0..3ea6921c9e 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj @@ -179,6 +179,9 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <IncludeCopyLocal Include="System.Reactive.dll" /> + <IncludeCopyLocal Include="System.Reactive.Linq.dll" /> + <IncludeCopyLocal Include="Newtonsoft.Json.dll" /> <IncludeCopyLocal Include="ExtCore.dll" /> <IncludeCopyLocal Include="Fantomas.dll" /> <IncludeCopyLocal Include="FSharp.Compiler.CodeDom.dll" /> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpConsoleProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpConsoleProject.xpt.xml index de8cb68ec5..6dfdf5bd29 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpConsoleProject.xpt.xml +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpConsoleProject.xpt.xml @@ -32,7 +32,7 @@ <Reference type="Package" refto="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </References> <Packages requireLicenseAcceptance="false"> - <Package Id="FSharp.Core" Version="4.3.3" local="true" /> + <Package Id="FSharp.Core" Version="4.5.4" local="true" /> </Packages> <Files> <FileTemplateReference TemplateID="FSharpAssemblyInfo" name="AssemblyInfo.fs" /> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml index d5c6d9e597..bb940a4bcb 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml @@ -37,7 +37,7 @@ </References> <Packages requireLicenseAcceptance="false"> - <Package Id="FSharp.Core" Version="4.3.3" local="true" /> + <Package Id="FSharp.Core" Version="4.5.4" local="true" /> </Packages> <Files> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpLibraryProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpLibraryProject.xpt.xml index 23911d14f9..c4aa02766a 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpLibraryProject.xpt.xml +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpLibraryProject.xpt.xml @@ -32,7 +32,7 @@ <Reference type="Package" refto="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </References> <Packages requireLicenseAcceptance="false"> - <Package Id="FSharp.Core" Version="4.3.3" local="true" /> + <Package Id="FSharp.Core" Version="4.5.4" local="true" /> </Packages> <Files> <FileTemplateReference TemplateID="FSharpAssemblyInfo" name="AssemblyInfo.fs" /> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml index 072bbe7280..972d722d7c 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml @@ -34,7 +34,7 @@ </References> <Packages requireLicenseAcceptance="false"> - <Package Id="FSharp.Core" Version="4.3.3" local="true" /> + <Package Id="FSharp.Core" Version="4.5.4" local="true" /> <Package id="NUnit" version="2.6.4" /> </Packages> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpTutorialProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpTutorialProject.xpt.xml index c08bf7ec28..95e29ca4a2 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpTutorialProject.xpt.xml +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpTutorialProject.xpt.xml @@ -31,7 +31,7 @@ </References> <Packages requireLicenseAcceptance="false"> - <Package Id="FSharp.Core" Version="4.3.3" local="true" /> + <Package Id="FSharp.Core" Version="4.5.4" local="true" /> </Packages> <Files> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/Program.fs b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/Program.fs index 0ddb551753..a00e1f97bf 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/Program.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/Program.fs @@ -22,8 +22,7 @@ module CompletionServer = // Make System.ValueTuple available to FSI let executingFolder = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName let valueTuplePath = Path.Combine(executingFolder, "System.ValueTuple.dll") - let valueTupleArg = sprintf "-r:%s" valueTuplePath - let argv = [| "--readline-"; fsiServerArg; valueTupleArg |] + let argv = [| "--readline-"; fsiServerArg |] let serializer = JsonSerializer.Create() diff --git a/main/external/fsharpbinding/build.fsx b/main/external/fsharpbinding/build.fsx index 9299f24d60..e89981a9d3 100755 --- a/main/external/fsharpbinding/build.fsx +++ b/main/external/fsharpbinding/build.fsx @@ -26,7 +26,7 @@ let mdtool args = result |> ignore let test() = - mdtool ("run-md-tests ../../external/fsharpbinding/MonoDevelop.FSharp.Tests/bin/" + config + "/MonoDevelop.FSharp.Tests.dll -labels") + mdtool ("run-md-tests ../../build/tests/MonoDevelop.FSharp.Tests.dll -labels") Target "Pack" (fun _ -> let dir = "pack/" + config diff --git a/main/external/fsharpbinding/paket.lock b/main/external/fsharpbinding/paket.lock index 5e8f4f605b..95a4b7060b 100644 --- a/main/external/fsharpbinding/paket.lock +++ b/main/external/fsharpbinding/paket.lock @@ -3,7 +3,7 @@ NUGET remote: https://www.nuget.org/api/v2 ExtCore (0.8.46) FAKE (5.8.4) - Fantomas (2.9.1) + Fantomas (2.9.0) FSharp.Compiler.Service (>= 25.0.1) FSharp.Compiler.CodeDom (0.9.2) FSharp.Compiler.Service (25.0.1) |