Skip to content

Commit

Permalink
Merge pull request #23 from CSBiology/developer
Browse files Browse the repository at this point in the history
Use HttpFs for creating Http requests and min strategy for transitive dependency resolver
  • Loading branch information
kMutagene authored Jun 11, 2019
2 parents 8de4833 + 3d0a577 commit 8233e3e
Show file tree
Hide file tree
Showing 9 changed files with 1,787 additions and 1,579 deletions.
10 changes: 9 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
#### 1.1.6 - June 6 2019
* Emulate nuget dependency resolvement

#### 1.1.4 - June 6 2019
* Use minimum matching approach to resolve transitive dependencies of packages

#### 1.1.3 - June 6 2019
* Use Http.fs for management of HTTP requests

#### 1.1.2 - June 3 2019
* further constrain Newtonsoft.Json and FSharp.Core dependencies


#### 1.1.1 - June 3 2019
* fix paket.template - nuget pakage should now list all dependencies correctly

Expand Down
11 changes: 9 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ framework: auto-detect

source https://nuget.org/api/v2

nuget FSharp.Core >= 4.5.2
nuget Newtonsoft.Json >= 11.0
nuget FSharp.Core
nuget Argu

nuget Expecto
Expand All @@ -13,6 +12,14 @@ nuget Expecto.VisualStudio.TestAdapter version_in_path: true

clitool dotnet-fake

group Streamer
lowest_matching: true

source https://nuget.org/api/v2
nuget FSharp.Core >= 4.5.2
nuget Newtonsoft.Json !>= 12.0.2 lowest_matching: true
nuget Http.fs !>= 5.3.0

group Formatting
source https://nuget.org/api/v2
source https://ci.appveyor.com/nuget/fsharp-formatting
Expand Down
2,942 changes: 1,711 additions & 1,231 deletions paket.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/FSharpGephiStreamer/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("FSharpGephiStreamer")>]
[<assembly: AssemblyProductAttribute("FSharpGephiStreamer")>]
[<assembly: AssemblyDescriptionAttribute("F# functions for streaming any kind of graph/network data to the network visualization tool gephi")>]
[<assembly: AssemblyVersionAttribute("1.1.2")>]
[<assembly: AssemblyFileVersionAttribute("1.1.2")>]
[<assembly: AssemblyVersionAttribute("1.1.6")>]
[<assembly: AssemblyFileVersionAttribute("1.1.6")>]
[<assembly: AssemblyConfigurationAttribute("Release")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FSharpGephiStreamer"
let [<Literal>] AssemblyProduct = "FSharpGephiStreamer"
let [<Literal>] AssemblyDescription = "F# functions for streaming any kind of graph/network data to the network visualization tool gephi"
let [<Literal>] AssemblyVersion = "1.1.2"
let [<Literal>] AssemblyFileVersion = "1.1.2"
let [<Literal>] AssemblyVersion = "1.1.6"
let [<Literal>] AssemblyFileVersion = "1.1.6"
let [<Literal>] AssemblyConfiguration = "Release"
5 changes: 2 additions & 3 deletions src/FSharpGephiStreamer/FSharpGephiStreamer.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;net47;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net47;netstandard2.0</TargetFrameworks>
<RootNamespace>FSharpGephiStreamer</RootNamespace>
<AssemblyName>FSharpGephiStreamer</AssemblyName>
<Name>FSharpGephiStreamer</Name>
Expand All @@ -16,7 +16,6 @@
<ItemGroup>
<Compile Include="Color.fs" />
<Compile Include="Either.fs" />
<Compile Include="Http.fs" />
<Compile Include="JsonObject.fs" />
<Compile Include="RestFulAux.fs" />
<Compile Include="Grammar.fs" />
Expand Down
319 changes: 0 additions & 319 deletions src/FSharpGephiStreamer/Http.fs

This file was deleted.

Loading

0 comments on commit 8233e3e

Please sign in to comment.