Skip to content

Commit

Permalink
Merge pull request ionide#9 from ionide/update_deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
Krzysztof-Cieslak authored Aug 19, 2016
2 parents e8d2a88 + d98e64d commit 77aab83
Show file tree
Hide file tree
Showing 15 changed files with 168 additions and 332 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pack/*

packages
.paket/paket.exe
paket-files/

TestResults.xml
TestResult.xml
Expand Down
5 changes: 2 additions & 3 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Target "SuaveReleaseArchive" (fun _ ->

Target "LocalRelease" (fun _ ->
ensureDirectory "bin/release"
CopyFiles "bin/release"(
CopyFiles "bin/release"(
!! (buildReleaseDir + "/*.dll")
++ (buildReleaseDir + "/*.exe")
++ (buildReleaseDir + "/*.exe.config")
Expand All @@ -137,8 +137,7 @@ Target "LocalRelease" (fun _ ->
)
)


#load "lib/Octokit.fsx"
#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
open Octokit

Target "Release" (fun _ ->
Expand Down
7 changes: 5 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
framework: net45
source https://www.nuget.org/api/v2/

nuget FSharp.Compiler.Service framework: >= net45
Expand All @@ -6,9 +7,11 @@ nuget Mono.Cecil
nuget NDesk.Options
nuget Newtonsoft.Json
nuget FAKE
nuget NUnit
nuget NUnit
nuget NUnit.Runners
nuget Octokit
nuget Suave
nuget FSharpLint.Core prerelease
nuget FSharp.Core redirects:on
nuget FSharp.Core redirects:on

github fsharp/FAKE modules/Octokit/Octokit.fsx
67 changes: 36 additions & 31 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,41 @@
FRAMEWORK: NET45
NUGET
remote: https://www.nuget.org/api/v2
FAKE (4.29)
FAKE (4.37.2)
FParsec (1.0.2)
FSharp.Compiler.Service (3.0)
FSharp.Compiler.Service.ProjectCracker (3.0)
FSharp.Core (4.0.0.1)
FSharpLint.Core (0.3.0-beta)
FParsec
FSharp.Compiler.Service
FSharp.Compiler.Service.ProjectCracker
Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl.Build (>= 1.0.14)
Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
Mono.Cecil (0.9.6.1)
FSharp.Compiler.Service (6.0.2) - framework: >= net45
System.Collections.Immutable (>= 1.2)
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
FSharp.Compiler.Service.ProjectCracker (6.0.2)
FSharp.Core (4.0.0.1) - redirects: on
FSharpLint.Core (0.4.4)
FParsec (>= 1.0.2)
FSharp.Compiler.Service (>= 6.0)
FSharp.Compiler.Service.ProjectCracker (>= 6.0)
Mono.Cecil (0.9.6.4)
NDesk.Options (0.2.1)
Newtonsoft.Json (8.0.3)
NUnit (3.2.1)
NUnit.ConsoleRunner (3.2.1)
NUnit.Extension.NUnitProjectLoader (3.2.1)
NUnit.Extension.NUnitV2Driver (3.2.1)
NUnit.Extension.NUnitV2ResultWriter (3.2.1)
NUnit.Extension.VSProjectLoader (3.2.1)
NUnit.Runners (3.2.1)
NUnit.ConsoleRunner (3.2.1)
NUnit.Extension.NUnitProjectLoader (3.2.1)
NUnit.Extension.NUnitV2Driver (3.2.1)
NUnit.Extension.NUnitV2ResultWriter (3.2.1)
NUnit.Extension.VSProjectLoader (3.2.1)
Octokit (0.20)
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
Suave (1.1.2)
Newtonsoft.Json (9.0.1)
NUnit (3.4.1)
NUnit.ConsoleRunner (3.4.1)
NUnit.Extension.NUnitProjectLoader (3.4.1)
NUnit.Extension.NUnitV2Driver (3.4.1)
NUnit.Extension.NUnitV2ResultWriter (3.4.1)
NUnit.Extension.TeamCityEventListener (1.0.1)
NUnit.Extension.VSProjectLoader (3.4.1)
NUnit.Runners (3.4.1)
NUnit.ConsoleRunner (>= 3.4.1)
NUnit.Extension.NUnitProjectLoader (>= 3.4.1)
NUnit.Extension.NUnitV2Driver (>= 3.4.1)
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
NUnit.Extension.VSProjectLoader (>= 3.4.1)
Octokit (0.21.1)
Suave (1.1.3)
FSharp.Core (>= 3.1.2.5)
System.Collections.Immutable (1.2)
System.Reflection.Metadata (1.4.1-beta-24227-04)
System.Collections.Immutable (>= 1.2)
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (934dc8313e2c54793813058fe2540511ad3b8468)
Octokit (>= 0.20)
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/CommandResponse.fs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ module CommandResponse =
Description = p.Description
}
]
IsStaticArguments = o.IsStaticArguments
IsStaticArguments = not o.HasParameters
}
] }
}
Expand Down
14 changes: 7 additions & 7 deletions src/FsAutoComplete.Core/Commands.fs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Commands (serialize : Serializer) =
member private x.SerializeResult (successToString: Serializer -> 'a -> string, ?failureToString: Serializer -> string -> string) =
x.SerializeResultAsync ((fun s x -> successToString s x |> async.Return), ?failureToString = failureToString)

member __.TryGetRecentTypeCheckResultsForFile = checker.TryGetRecentTypeCheckResultsForFile
member __.TryGetRecentTypeCheckResultsForFile = checker.TryGetRecentCheckResultsForFile
member __.TryGetFileCheckerOptionsWithLinesAndLineStr = state.TryGetFileCheckerOptionsWithLinesAndLineStr
member __.TryGetFileCheckerOptionsWithLines = state.TryGetFileCheckerOptionsWithLines
member __.Files = state.Files
Expand All @@ -31,7 +31,7 @@ type Commands (serialize : Serializer) =
let parse' fileName text options =
async {
let! _parseResults, checkResults = checker.ParseAndCheckFileInProject(fileName, 0, text, options)
return
return
match checkResults with
| FSharpCheckFileAnswer.Aborted -> [Response.info serialize "Parse aborted"]
| FSharpCheckFileAnswer.Succeeded results ->
Expand Down Expand Up @@ -60,8 +60,8 @@ type Commands (serialize : Serializer) =
member __.Project projectFileName verbose onChange = async {
let projectFileName = Path.GetFullPath projectFileName
let project = state.Projects.TryFind projectFileName
let project = project |> Option.getOrElseFun (fun _ ->

let project = project |> Option.getOrElseFun (fun _ ->
let project = new Project(projectFileName, onChange)
state.Projects.[projectFileName] <- project
project)
Expand All @@ -75,9 +75,9 @@ type Commands (serialize : Serializer) =
checker.TryGetProjectOptions (projectFileName, verbose)
else
checker.TryGetCoreProjectOptions projectFileName

match options with
| Result.Failure error ->
| Result.Failure error ->
project.Response <- None
[Response.error serialize error]
| Result.Success (opts, projectFiles, outFileOpt, references, logMap) ->
Expand Down Expand Up @@ -164,7 +164,7 @@ type Commands (serialize : Serializer) =
match state.TryGetFileCheckerOptionsWithSource file with
| Failure s -> [Response.error serialize s]
| Success (options, source) ->
let tyResOpt = checker.TryGetRecentTypeCheckResultsForFile(file, options)
let tyResOpt = checker.TryGetRecentCheckResultsForFile(file, options)

match tyResOpt with
| None -> [ Response.info serialize "Cached typecheck results not yet available"]
Expand Down
6 changes: 3 additions & 3 deletions src/FsAutoComplete.Core/CompilerServiceInterface.fs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ type ParseAndCheckResults
type FSharpCompilerServiceChecker() =
let checker =
FSharpChecker.Create(
projectCacheSize = 200,
projectCacheSize = 200,
keepAllBackgroundResolutions = true,
keepAssemblyContents = true)

Expand Down Expand Up @@ -190,8 +190,8 @@ type FSharpCompilerServiceChecker() =
member __.ParseAndCheckFileInProject(fileName, version, source, options) =
checker.ParseAndCheckFileInProject(fileName, version, source, options)

member __.TryGetRecentTypeCheckResultsForFile(file, options, ?source) =
checker.TryGetRecentTypeCheckResultsForFile(file, options, ?source=source)
member __.TryGetRecentCheckResultsForFile(file, options, ?source) =
checker.TryGetRecentCheckResultsForFile(file, options, ?source=source)
|> Option.map (fun (pr, cr, _) -> ParseAndCheckResults (pr, cr))

member __.GetDeclarations (fileName, source, options) = async {
Expand Down
67 changes: 28 additions & 39 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RootNamespace>FsAutoComplete.Core</RootNamespace>
<AssemblyName>FsAutoComplete.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
<Name>FsAutoComplete.Core</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -51,18 +51,18 @@
</Choose>
<Import Project="$(FSharpTargetsPath)" />
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(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'))">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<PropertyGroup>
<__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker</__paket__FSharp_Compiler_Service_ProjectCracker_targets>
</PropertyGroup>
</When>
</Choose>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Compile Include="Utils.fs" />
Expand All @@ -89,7 +89,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(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'))">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FParsec">
<HintPath>..\..\packages\FParsec\lib\net40-client\FParsec.dll</HintPath>
Expand All @@ -103,67 +103,56 @@
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FParsec">
<HintPath>..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FParsecCS">
<HintPath>..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll</HintPath>
<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) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0'))">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll</HintPath>
<Reference Include="FSharp.Compiler.Service.ProjectCracker">
<HintPath>..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(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'))">
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
<Reference Include="FSharpLint.Core">
<HintPath>..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(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'))">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service.ProjectCracker">
<HintPath>..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll</HintPath>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(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'))">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharpLint.Application">
<HintPath>..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Application.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FSharpLint.Framework">
<HintPath>..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FSharpLint.Rules">
<HintPath>..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Rules.dll</HintPath>
<Reference Include="System.Reflection.Metadata">
<HintPath>..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
24 changes: 8 additions & 16 deletions src/FsAutoComplete.Suave/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="2.6.4.14350" />
</dependentAssembly>
</assemblyBinding>
</runtime>

<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
</dependentAssembly>
</assemblyBinding></runtime>
</configuration>
Loading

0 comments on commit 77aab83

Please sign in to comment.