Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@forki
forki committed May 25, 2015
1 parent 653e68a commit d9bb775
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 106 deletions.
20 changes: 10 additions & 10 deletions paket.lock
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
NUGET
remote: http://nuget.org/api/v2
specs:
FAKE (3.24.0)
FAKE (3.34.0)
FsCheck (0.9.2)
FSharp.Compiler.Service (0.0.86)
FSharp.Compiler.Service (0.0.89)
FSharp.Core (3.1.2.1)
FSharp.Formatting (2.7.5)
FSharp.Compiler.Service (>= 0.0.82)
FSharpVSPowerTools.Core (>= 1.7.0)
FSharpVSPowerTools.Core (1.7.0)
FSharp.Compiler.Service (>= 0.0.81)
FSharp.Formatting (2.9.6)
FSharp.Compiler.Service (>= 0.0.87)
FSharpVSPowerTools.Core (1.8.0)
FSharpVSPowerTools.Core (1.8.0)
FSharp.Compiler.Service (>= 0.0.87)
FsUnit (1.3.0.1)
NUnit (>= 2.6.3)
Microsoft.Bcl (1.1.10)
Expand All @@ -18,14 +18,14 @@ NUGET
Microsoft.Net.Http (2.2.29)
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
NuGet.CommandLine (2.8.3)
NuGet.CommandLine (2.8.5)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Octokit (0.8.0)
Octokit (0.12.0)
Microsoft.Net.Http
SourceLink.Fake (0.5.0)
GITHUB
remote: fsharp/FAKE
specs:
modules/Octokit/Octokit.fsx (91bc57badb88b7adb163fb8d26db85ef270fd8bb)
modules/Octokit/Octokit.fsx (c15a64f17e368fa8f117b6ef07ae43eefda4afa8)
Octokit
6 changes: 3 additions & 3 deletions src/FSharpx.Collections.Experimental/AssemblyInfo.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ open System.Runtime.CompilerServices
[<assembly: AssemblyDescriptionAttribute("FSharpx.Collections is a collection of datastructures for use with F# and C#.")>]
[<assembly: InternalsVisibleToAttribute("FSharpx.Collections.Tests")>]
[<assembly: InternalsVisibleToAttribute("FSharpx.Collections.Experimental.Tests")>]
[<assembly: AssemblyVersionAttribute("1.10.1")>]
[<assembly: AssemblyFileVersionAttribute("1.10.1")>]
[<assembly: AssemblyVersionAttribute("1.11.0")>]
[<assembly: AssemblyFileVersionAttribute("1.11.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "1.10.1"
let [<Literal>] Version = "1.11.0"
104 changes: 52 additions & 52 deletions src/FSharpx.Collections.Experimental/FSharpx.Collections.Experimental.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,59 @@
</Target>
-->
<Import Project="$(SolutionDir).paket\paket.targets" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Infrastructure.fs" />
<Compile Include="AltBinaryRandomAccessList.fs" />
<Compile Include="BankersDeque.fs" />
<Compile Include="BankersQueue.fs" />
<Compile Include="BatchedDeque.fs" />
<Compile Include="BatchedQueue.fs" />
<Compile Include="BinaryRandomAccessList.fs" />
<Compile Include="BinaryRoseTree.fs" />
<Compile Include="BinaryTreeZipper.fs" />
<Compile Include="BinomialHeap.fs" />
<Compile Include="IntMap.fs" />
<Compile Include="BKTree.fs" />
<Compile Include="BootstrappedQueue.fs" />
<Compile Include="BottomUpMergeSort.fs" />
<Compile Include="Deque.fs" />
<Compile Include="DList.fs" />
<Compile Include="EagerRoseTree.fs" />
<Compile Include="FlatList.fsi" />
<Compile Include="FlatList.fs" />
<Compile Include="PairingHeap.fs" />
<Compile Include="HeapPriorityQueue.fs" />
<Compile Include="HoodMelvilleQueue.fs" />
<Compile Include="ImplicitQueue.fs" />
<Compile Include="IndexedRoseTree.fs" />
<Compile Include="LeftistHeap.fs" />
<Compile Include="ListZipper.fs" />
<Compile Include="PhysicistQueue.fs" />
<Compile Include="RealTimeDeque.fs" />
<Compile Include="RealTimeQueue.fs" />
<Compile Include="RingBuffer.fs" />
<Compile Include="RoseTree.fs" />
<Compile Include="SkewBinaryRandomAccessList.fs" />
<Compile Include="TimeSeries.fs" />
<Compile Include="CSharpCompat.fs" />
<Compile Include="BlockResizeArray.fs" />
<None Include="paket.template" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<ProjectReference Include="..\FSharpx.Collections\FSharpx.Collections.fsproj">
<Name>FSharpx.Collections</Name>
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Choose>
<When Condition="$(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')">
<When Condition="$(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')">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
Expand Down Expand Up @@ -122,55 +173,4 @@
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Infrastructure.fs" />
<Compile Include="AltBinaryRandomAccessList.fs" />
<Compile Include="BankersDeque.fs" />
<Compile Include="BankersQueue.fs" />
<Compile Include="BatchedDeque.fs" />
<Compile Include="BatchedQueue.fs" />
<Compile Include="BinaryRandomAccessList.fs" />
<Compile Include="BinaryRoseTree.fs" />
<Compile Include="BinaryTreeZipper.fs" />
<Compile Include="BinomialHeap.fs" />
<Compile Include="IntMap.fs" />
<Compile Include="BKTree.fs" />
<Compile Include="BootstrappedQueue.fs" />
<Compile Include="BottomUpMergeSort.fs" />
<Compile Include="Deque.fs" />
<Compile Include="DList.fs" />
<Compile Include="EagerRoseTree.fs" />
<Compile Include="FlatList.fsi" />
<Compile Include="FlatList.fs" />
<Compile Include="PairingHeap.fs" />
<Compile Include="HeapPriorityQueue.fs" />
<Compile Include="HoodMelvilleQueue.fs" />
<Compile Include="ImplicitQueue.fs" />
<Compile Include="IndexedRoseTree.fs" />
<Compile Include="LeftistHeap.fs" />
<Compile Include="ListZipper.fs" />
<Compile Include="PhysicistQueue.fs" />
<Compile Include="RealTimeDeque.fs" />
<Compile Include="RealTimeQueue.fs" />
<Compile Include="RingBuffer.fs" />
<Compile Include="RoseTree.fs" />
<Compile Include="SkewBinaryRandomAccessList.fs" />
<Compile Include="TimeSeries.fs" />
<Compile Include="CSharpCompat.fs" />
<Compile Include="BlockResizeArray.fs" />
<None Include="paket.template" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<ProjectReference Include="..\FSharpx.Collections\FSharpx.Collections.fsproj">
<Name>FSharpx.Collections</Name>
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/FSharpx.Collections/AssemblyInfo.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ open System.Runtime.CompilerServices
[<assembly: AssemblyDescriptionAttribute("FSharpx.Collections is a collection of datastructures for use with F# and C#.")>]
[<assembly: InternalsVisibleToAttribute("FSharpx.Collections.Tests")>]
[<assembly: InternalsVisibleToAttribute("FSharpx.Collections.Experimental.Tests")>]
[<assembly: AssemblyVersionAttribute("1.10.1")>]
[<assembly: AssemblyFileVersionAttribute("1.10.1")>]
[<assembly: AssemblyVersionAttribute("1.11.0")>]
[<assembly: AssemblyFileVersionAttribute("1.11.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "1.10.1"
let [<Literal>] Version = "1.11.0"
68 changes: 34 additions & 34 deletions src/FSharpx.Collections/FSharpx.Collections.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,41 @@
</Target>
-->
<Import Project="$(SolutionDir).paket\paket.targets" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Exceptions.fs" />
<Compile Include="Interfaces.fs" />
<Compile Include="Infrastructure.fs" />
<Compile Include="LazyList.fsi" />
<Compile Include="LazyList.fs" />
<Compile Include="ResizeArray.fsi" />
<Compile Include="ResizeArray.fs" />
<Compile Include="Collections.fs" />
<Compile Include="Deque.fsi" />
<Compile Include="Deque.fs" />
<Compile Include="DList.fsi" />
<Compile Include="DList.fs" />
<Compile Include="ByteString.fs" />
<Compile Include="CircularBuffer.fs" />
<Compile Include="PriorityQueue.fs" />
<Compile Include="NonEmptyList.fs" />
<Compile Include="RandomAccessList.fsi" />
<Compile Include="RandomAccessList.fs" />
<Compile Include="Queue.fsi" />
<Compile Include="Queue.fs" />
<Compile Include="Literals.fs" />
<Compile Include="PersistentVector.fsi" />
<Compile Include="PersistentVector.fs" />
<Compile Include="PersistentHashMap.fs" />
<None Include="paket.template" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<Choose>
<When Condition="$(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')">
<When Condition="$(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')">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
Expand Down Expand Up @@ -120,37 +153,4 @@
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Exceptions.fs" />
<Compile Include="Interfaces.fs" />
<Compile Include="Infrastructure.fs" />
<Compile Include="LazyList.fsi" />
<Compile Include="LazyList.fs" />
<Compile Include="ResizeArray.fsi" />
<Compile Include="ResizeArray.fs" />
<Compile Include="Collections.fs" />
<Compile Include="Deque.fsi" />
<Compile Include="Deque.fs" />
<Compile Include="DList.fsi" />
<Compile Include="DList.fs" />
<Compile Include="ByteString.fs" />
<Compile Include="CircularBuffer.fs" />
<Compile Include="PriorityQueue.fs" />
<Compile Include="NonEmptyList.fs" />
<Compile Include="RandomAccessList.fsi" />
<Compile Include="RandomAccessList.fs" />
<Compile Include="Queue.fsi" />
<Compile Include="Queue.fs" />
<Compile Include="Literals.fs" />
<Compile Include="PersistentVector.fsi" />
<Compile Include="PersistentVector.fs" />
<Compile Include="PersistentHashMap.fs" />
<None Include="paket.template" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/FSharpx.Collections.Experimental.Tests/FSharpx.Collections.Experimental.Tests.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\..\.paket\paket.targets" />
<Choose>
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="FsCheck">
<HintPath>..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll</HintPath>
Expand All @@ -145,7 +145,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions tests/FSharpx.Collections.Tests/FSharpx.Collections.Tests.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\..\.paket\paket.targets" />
<Choose>
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="FsCheck">
<HintPath>..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll</HintPath>
Expand All @@ -115,7 +115,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<When Condition="($(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 ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
Expand Down

0 comments on commit d9bb775

Please sign in to comment.