Skip to content

Commit

Permalink
Merge pull request #90 from jakelishman/master
Browse files Browse the repository at this point in the history
Update to Rx-3.0
  • Loading branch information
cloudRoutine committed Sep 13, 2016
2 parents f8d3d62 + d06a60b commit dc567dc
Show file tree
Hide file tree
Showing 13 changed files with 113 additions and 2,594 deletions.
18 changes: 1 addition & 17 deletions FSharp.Control.Reactive.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Reactive.Tests", "tests\FSharp.Control.Reactive.Tests.fsproj", "{A8EBB4A5-80ED-43D5-8D7D-6A0F4E228C2F}"
EndProject
Expand Down Expand Up @@ -45,14 +45,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{5EB1DFE0-EC6
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1C8DDC6C-C9CC-4349-AB08-B202F9D36065}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Reactive.Profile259", "targets\FSharp.Control.Reactive.Profile259\FSharp.Control.Reactive.Profile259.fsproj", "{62D8F232-59CE-4755-8851-65847DC310E3}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Reactive", "src\FSharp.Control.Reactive\FSharp.Control.Reactive.fsproj", "{ED23F688-C0D0-4102-93D5-0D832633F66D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "targets", "targets", "{84548CB8-41B3-4E22-AD1B-F78C4E3D3091}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Reactive.Net40", "targets\FSharp.Control.Reactive.Net40\FSharp.Control.Reactive.Net40.fsproj", "{0E1CDEAB-FF72-46CB-A399-612A565A81D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -63,18 +57,10 @@ Global
{A8EBB4A5-80ED-43D5-8D7D-6A0F4E228C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8EBB4A5-80ED-43D5-8D7D-6A0F4E228C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8EBB4A5-80ED-43D5-8D7D-6A0F4E228C2F}.Release|Any CPU.Build.0 = Release|Any CPU
{62D8F232-59CE-4755-8851-65847DC310E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62D8F232-59CE-4755-8851-65847DC310E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62D8F232-59CE-4755-8851-65847DC310E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62D8F232-59CE-4755-8851-65847DC310E3}.Release|Any CPU.Build.0 = Release|Any CPU
{ED23F688-C0D0-4102-93D5-0D832633F66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED23F688-C0D0-4102-93D5-0D832633F66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED23F688-C0D0-4102-93D5-0D832633F66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED23F688-C0D0-4102-93D5-0D832633F66D}.Release|Any CPU.Build.0 = Release|Any CPU
{0E1CDEAB-FF72-46CB-A399-612A565A81D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E1CDEAB-FF72-46CB-A399-612A565A81D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E1CDEAB-FF72-46CB-A399-612A565A81D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E1CDEAB-FF72-46CB-A399-612A565A81D7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -86,7 +72,5 @@ Global
{AB2D0E6D-7335-44A6-9A7B-55C58C858279} = {A10EE113-56C8-45E7-8970-B03F17AC3F8E}
{57CF7CB9-B2E3-406A-994D-1C85AD11A524} = {E14EBCFE-FE32-46B2-876D-66D38AB53B1E}
{5EB1DFE0-EC60-4031-87E9-771F3848A728} = {57CF7CB9-B2E3-406A-994D-1C85AD11A524}
{62D8F232-59CE-4755-8851-65847DC310E3} = {84548CB8-41B3-4E22-AD1B-F78C4E3D3091}
{0E1CDEAB-FF72-46CB-A399-612A565A81D7} = {84548CB8-41B3-4E22-AD1B-F78C4E3D3091}
EndGlobalSection
EndGlobal
7 changes: 3 additions & 4 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
source http://nuget.org/api/v2
redirects on
framework: auto-detect

nuget FAKE
nuget FsCheck
nuget SourceLink.Fake
nuget Nuget.CommandLine
nuget FSharp.Core ~> 4.0.0.1
nuget Rx-Experimental ~> 2.2.5
nuget Rx-Main ~> 2.2.5
nuget Rx-PlatformServices ~> 2.2.5
nuget Rx-Testing ~> 2.2.5
nuget System.Reactive ~> 3.0
nuget Microsoft.Reactive.Testing
nuget NUnit
nuget NUnit.Runners
nuget FSharp.Formatting
Expand Down
88 changes: 51 additions & 37 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,57 @@
REDIRECTS: ON
FRAMEWORK: NET45, NET46
NUGET
remote: http://www.nuget.org/api/v2
specs:
FAKE (4.25.4)
FsCheck (2.2.4)
FAKE (4.37.2)
FsCheck (2.6)
FSharp.Core (>= 3.1.2.5)
FSharp.Compiler.Service (2.0.0.4)
FSharp.Compiler.Service (6.0.2)
System.Collections.Immutable (>= 1.2)
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
FSharp.Core (4.0.0.1)
FSharp.Formatting (2.14)
FSharp.Compiler.Service (>= 2.0.0.3 < 2.1)
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
FSharpVSPowerTools.Core (2.3)
FSharp.Compiler.Service (>= 2.0.0.3)
NuGet.CommandLine (3.3)
NUnit (3.0.1)
NUnit.Console (3.0.1)
NUnit.Runners (3.0.1)
NUnit.Console (3.0.1)
Rx-Core (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Experimental (2.2.5)
Rx-Core (>= 2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Linq (>= 2.2.5)
Rx-Providers (>= 2.2.5)
Rx-Interfaces (2.2.5)
Rx-Linq (2.2.5)
Rx-Core (>= 2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Main (2.2.5)
Rx-Core (>= 2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Linq (>= 2.2.5)
Rx-PlatformServices (>= 2.2.5)
Rx-PlatformServices (2.2.5)
Rx-Core (>= 2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Providers (2.2.5)
Rx-Main (>= 2.2.5)
Rx-Testing (2.2.5)
Rx-Main (>= 2.2.5)
FSharp.Formatting (2.10)
FSharp.Compiler.Service (>= 0.0.87)
FSharpVSPowerTools.Core (1.8)
FSharpVSPowerTools.Core (1.8)
FSharp.Compiler.Service (>= 0.0.87)
Microsoft.Reactive.Testing (3.0)
System.Reactive.Linq (>= 3.0)
System.Reactive.PlatformServices (>= 3.0)
xunit.assert (>= 2.1)
NuGet.CommandLine (3.4.3)
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)
SourceLink.Fake (1.1)
System.Collections.Immutable (1.2)
System.Reactive (3.0)
System.Reactive.Core (>= 3.0)
System.Reactive.Interfaces (>= 3.0)
System.Reactive.Linq (>= 3.0)
System.Reactive.PlatformServices (>= 3.0)
System.Reactive.Windows.Threading (>= 3.0)
System.Reactive.Core (3.0)
System.Reactive.Interfaces (>= 3.0)
System.Reactive.Interfaces (3.0)
System.Reactive.Linq (3.0)
System.Reactive.Core (>= 3.0)
System.Reactive.Interfaces (>= 3.0)
System.Reactive.PlatformServices (3.0)
System.Reactive.Core (>= 3.0)
System.Reactive.Interfaces (>= 3.0)
System.Reactive.Windows.Threading (3.0)
System.Reactive.Core (>= 3.0)
System.Reflection.Metadata (1.4.1-beta-24227-04)
System.Collections.Immutable (>= 1.2)
xunit.assert (2.1)
10 changes: 1 addition & 9 deletions paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,11 @@ iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/docs/files/
tags
F#, FSharp, Reactive Extensions, Rx
dependencies
Rx-Core >= LOCKEDVERSION
Rx-Interfaces >= LOCKEDVERSION
Rx-Linq >= LOCKEDVERSION
System.Reactive >= LOCKEDVERSION
excludedependencies
FSharp.Core
files
./bin/v4.0/FSharp.Control.Reactive.dll ==> lib/net40
./bin/v4.0/FSharp.Control.Reactive.XML ==> lib/net40
./bin/v4.0/FSharp.Control.Reactive.?db ==> lib/net40
./bin/v4.5/FSharp.Control.Reactive.dll ==> lib/net45
./bin/v4.5/FSharp.Control.Reactive.XML ==> lib/net45
./bin/v4.5/FSharp.Control.Reactive.?db ==> lib/net45
./bin/profile259/FSharp.Control.Reactive.dll ==> lib/profile259
./bin/profile259/FSharp.Control.Reactive.XML ==> lib/profile259
./bin/profile259/FSharp.Control.Reactive.?db ==> lib/profile259
include-pdbs true
Loading

0 comments on commit dc567dc

Please sign in to comment.