diff --git a/FSharp.Control.Reactive.sln b/FSharp.Control.Reactive.sln index 6cc4a9c..5bb38f8 100644 --- a/FSharp.Control.Reactive.sln +++ b/FSharp.Control.Reactive.sln @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/paket.dependencies b/paket.dependencies index 78bbae0..bda45d3 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -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 diff --git a/paket.lock b/paket.lock index 7f1427b..0fb2eb2 100644 --- a/paket.lock +++ b/paket.lock @@ -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) diff --git a/paket.template b/paket.template index 03211f2..f7f6a08 100644 --- a/paket.template +++ b/paket.template @@ -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 diff --git a/src/FSharp.Control.Reactive/FSharp.Control.Reactive.fsproj b/src/FSharp.Control.Reactive/FSharp.Control.Reactive.fsproj index fe39657..c0c53f7 100644 --- a/src/FSharp.Control.Reactive/FSharp.Control.Reactive.fsproj +++ b/src/FSharp.Control.Reactive/FSharp.Control.Reactive.fsproj @@ -60,16 +60,7 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -78,138 +69,21 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windows8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net40\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net45\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\sl5\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windowsphone71\System.Reactive.Core.dll - True - True - - - - + - ..\..\packages\Rx-Core\lib\windowsphone8\System.Reactive.Core.dll + ..\..\packages\System.Reactive.Core\lib\net45\System.Reactive.Core.dll True True - + - ..\..\packages\Rx-Core\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-win81+wpa81\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll + ..\..\packages\System.Reactive.Core\lib\net46\System.Reactive.Core.dll True True @@ -217,91 +91,10 @@ - - - - ..\..\packages\Rx-Interfaces\lib\windows8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net40\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net45\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\sl5\System.Reactive.Interfaces.dll - True - True - - - - + - ..\..\packages\Rx-Interfaces\lib\windowsphone71\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\windowsphone8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-win81+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll + ..\..\packages\System.Reactive.Interfaces\lib\net45\System.Reactive.Interfaces.dll True True @@ -309,91 +102,19 @@ - + - ..\..\packages\Rx-Linq\lib\windows8\System.Reactive.Linq.dll + ..\..\packages\System.Reactive.Linq\lib\net45\System.Reactive.Linq.dll True True - + - ..\..\packages\Rx-Linq\lib\net40\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\net45\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\sl5\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone71\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-win81+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll + ..\..\packages\System.Reactive.Linq\lib\net46\System.Reactive.Linq.dll True True @@ -401,91 +122,19 @@ - + - ..\..\packages\Rx-PlatformServices\lib\windows8\System.Reactive.PlatformServices.dll + ..\..\packages\System.Reactive.PlatformServices\lib\net45\System.Reactive.PlatformServices.dll True True - + - ..\..\packages\Rx-PlatformServices\lib\net40\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\net45\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\sl5\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone71\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll + ..\..\packages\System.Reactive.PlatformServices\lib\net46\System.Reactive.PlatformServices.dll True True @@ -493,152 +142,14 @@ - - - - ..\..\packages\Rx-Providers\lib\windows8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net40\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net45\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - + - - ..\..\packages\Rx-Providers\lib\sl5\System.Reactive.Providers.dll + + ..\..\packages\System.Reactive.Windows.Threading\lib\net45\System.Reactive.Windows.Threading.dll True True - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone71\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-windows8+net45+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-win81+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Providers.dll - True - True - - - True - - + True diff --git a/src/FSharp.Control.Reactive/paket.references b/src/FSharp.Control.Reactive/paket.references index 74fa508..355c615 100644 --- a/src/FSharp.Control.Reactive/paket.references +++ b/src/FSharp.Control.Reactive/paket.references @@ -1,5 +1,2 @@ FSharp.Core -Rx-Core -Rx-Interfaces -Rx-Linq -Rx-Providers +System.Reactive diff --git a/targets/FSharp.Control.Reactive.Net40/FSharp.Control.Reactive.Net40.fsproj b/targets/FSharp.Control.Reactive.Net40/FSharp.Control.Reactive.Net40.fsproj deleted file mode 100644 index 17c670f..0000000 --- a/targets/FSharp.Control.Reactive.Net40/FSharp.Control.Reactive.Net40.fsproj +++ /dev/null @@ -1,651 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {0e1cdeab-ff72-46cb-a399-612a565a81d7} - Library - FSharp.Control.Reactive - FSharp.Control.Reactive - v4.0 - FSharp.Control.Reactive - ..\ - - - - true - full - false - false - bin - DEBUG;TRACE - 3 - bin\FSharp.Control.Reactive.XML - - - pdbonly - true - true - ..\..\bin\v4.0 - TRACE - 3 - ..\..\bin\v4.0\FSharp.Control.Reactive.XML - - - 11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - AssemblyInfo.fs - - - Observable.fs - - - - - - - - - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\Rx-Core\lib\windows8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net40\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net45\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\sl5\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windowsphone71\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windowsphone8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-win81+wpa81\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll - True - True - - - - - - - - - ..\..\packages\Rx-Interfaces\lib\windows8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net40\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net45\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\sl5\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\windowsphone71\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\windowsphone8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-win81+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - - - ..\..\packages\Rx-Linq\lib\windows8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\net40\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\net45\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\sl5\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone71\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-win81+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windows8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\net40\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\net45\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\sl5\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone71\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - - - ..\..\packages\Rx-Providers\lib\windows8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net40\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net45\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\sl5\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone71\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-windows8+net45+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-win81+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - \ No newline at end of file diff --git a/targets/FSharp.Control.Reactive.Net40/paket.references b/targets/FSharp.Control.Reactive.Net40/paket.references deleted file mode 100644 index 74fa508..0000000 --- a/targets/FSharp.Control.Reactive.Net40/paket.references +++ /dev/null @@ -1,5 +0,0 @@ -FSharp.Core -Rx-Core -Rx-Interfaces -Rx-Linq -Rx-Providers diff --git a/targets/FSharp.Control.Reactive.Profile259/FSharp.Control.Reactive.Profile259.fsproj b/targets/FSharp.Control.Reactive.Profile259/FSharp.Control.Reactive.Profile259.fsproj deleted file mode 100644 index 5bad1c4..0000000 --- a/targets/FSharp.Control.Reactive.Profile259/FSharp.Control.Reactive.Profile259.fsproj +++ /dev/null @@ -1,636 +0,0 @@ - - - - - Debug - AnyCPU - 2.0 - 62d8f232-59ce-4755-8851-65847dc310e3 - Library - FSharp.Control.Reactive.Profile259 - FSharp.Control.Reactive - v4.5 - Profile259 - netcore - 3.259.4.0 - true - FSharp.Control.Reactive.Profile259 - - - true - full - false - false - ..\..\bin\profile259 - DEBUG;TRACE - 3 - ..\..\bin\profile259\FSharp.Control.Reactive.XML - - - pdbonly - true - true - ..\..\bin\profile259 - TRACE - 3 - ..\..\bin\profile259\FSharp.Control.Reactive.XML - - - 12 - - - - - AssemblyInfo.fs - - - Observable.fs - - - - - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\Rx-Core\lib\windows8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net40\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\net45\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\sl5\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windowsphone71\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\windowsphone8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-win81+wpa81\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\..\packages\Rx-Core\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll - True - True - - - - - - - - - ..\..\packages\Rx-Interfaces\lib\windows8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net40\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\net45\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\sl5\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\windowsphone71\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\windowsphone8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-win81+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\..\packages\Rx-Interfaces\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - - - ..\..\packages\Rx-Linq\lib\windows8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\net40\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\net45\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\sl5\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone71\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\windowsphone8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-win81+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\..\packages\Rx-Linq\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windows8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\net40\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\net45\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\sl5\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone71\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\windowsphone8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\..\packages\Rx-PlatformServices\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - - - ..\..\packages\Rx-Providers\lib\windows8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net40\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\net45\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\sl5\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone71\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\windowsphone8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-windows8+net45+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-win81+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\..\packages\Rx-Providers\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - diff --git a/targets/FSharp.Control.Reactive.Profile259/paket.references b/targets/FSharp.Control.Reactive.Profile259/paket.references deleted file mode 100644 index fc58fa4..0000000 --- a/targets/FSharp.Control.Reactive.Profile259/paket.references +++ /dev/null @@ -1,5 +0,0 @@ -FSharp.Core -Rx-Core -Rx-Interfaces -Rx-Linq -Rx-Providers \ No newline at end of file diff --git a/tests/FSharp.Control.Reactive.Tests.fsproj b/tests/FSharp.Control.Reactive.Tests.fsproj index f804d5d..8071bce 100644 --- a/tests/FSharp.Control.Reactive.Tests.fsproj +++ b/tests/FSharp.Control.Reactive.Tests.fsproj @@ -55,12 +55,6 @@ - - ..\packages\NUnit.Runners\tools\lib\nunit.core.dll - - - ..\packages\NUnit.Runners\tools\lib\nunit.core.interfaces.dll - @@ -72,7 +66,7 @@ - + ..\packages\FsCheck\lib\net45\FsCheck.dll @@ -81,45 +75,9 @@ - - - - ..\packages\FsCheck\lib\portable-net45+netcore45\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wp8\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wpa81+wp8\FsCheck.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -128,72 +86,29 @@ - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - + - - ..\packages\NUnit\lib\net20\nunit.framework.dll + + ..\packages\Microsoft.Reactive.Testing\lib\net45\Microsoft.Reactive.Testing.dll True True - + - - ..\packages\NUnit\lib\net40\nunit.framework.dll + + ..\packages\Microsoft.Reactive.Testing\lib\net46\Microsoft.Reactive.Testing.dll True True - + + + ..\packages\NUnit\lib\net45\nunit.framework.dll @@ -202,194 +117,21 @@ - - - - ..\packages\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\windows8\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\net40\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\net45\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\sl5\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\windowsphone71\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\windowsphone8\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll - True - True - - - - - - - ..\packages\Rx-Core\lib\portable-win81+wpa81\System.Reactive.Core.dll - True - True - - - - + - ..\packages\Rx-Core\lib\portable-net40+sl5+win8+wp8\System.Reactive.Core.dll + ..\packages\System.Reactive.Core\lib\net45\System.Reactive.Core.dll True True - + - ..\packages\Rx-Core\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll - True - True - - - - - - - - - ..\packages\Rx-Experimental\lib\windows8\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\net40\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\net45\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\sl5\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\windowsphone71\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\windowsphone8\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\portable-windows8+net45+wp8\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\portable-win81+wpa81\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\portable-net40+sl5+win8+wp8\System.Reactive.Experimental.dll - True - True - - - - - - - ..\packages\Rx-Experimental\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Experimental.dll + ..\packages\System.Reactive.Core\lib\net46\System.Reactive.Core.dll True True @@ -397,91 +139,10 @@ - - - - ..\packages\Rx-Interfaces\lib\windows8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\net40\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\net45\System.Reactive.Interfaces.dll - True - True - - - - + - ..\packages\Rx-Interfaces\lib\sl5\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\windowsphone71\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\windowsphone8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\portable-win81+wpa81\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\portable-net40+sl5+win8+wp8\System.Reactive.Interfaces.dll - True - True - - - - - - - ..\packages\Rx-Interfaces\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces\lib\net45\System.Reactive.Interfaces.dll True True @@ -489,91 +150,19 @@ - - - - ..\packages\Rx-Linq\lib\windows8\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\net40\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\net45\System.Reactive.Linq.dll - True - True - - - - + - ..\packages\Rx-Linq\lib\sl5\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq\lib\net45\System.Reactive.Linq.dll True True - + - ..\packages\Rx-Linq\lib\windowsphone71\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\windowsphone8\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\portable-win81+wpa81\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\portable-net40+sl5+win8+wp8\System.Reactive.Linq.dll - True - True - - - - - - - ..\packages\Rx-Linq\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq\lib\net46\System.Reactive.Linq.dll True True @@ -581,91 +170,19 @@ - - - - ..\packages\Rx-PlatformServices\lib\windows8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\net40\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\net45\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\sl5\System.Reactive.PlatformServices.dll - True - True - - - - + - ..\packages\Rx-PlatformServices\lib\windowsphone71\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices\lib\net45\System.Reactive.PlatformServices.dll True True - + - ..\packages\Rx-PlatformServices\lib\windowsphone8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\portable-win81+wpa81\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\portable-net40+sl5+win8+wp8\System.Reactive.PlatformServices.dll - True - True - - - - - - - ..\packages\Rx-PlatformServices\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices\lib\net46\System.Reactive.PlatformServices.dll True True @@ -673,216 +190,24 @@ - + - - ..\packages\Rx-Providers\lib\windows8\System.Reactive.Providers.dll + + ..\packages\System.Reactive.Windows.Threading\lib\net45\System.Reactive.Windows.Threading.dll True True - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\net40\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\net45\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\sl5\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\windowsphone71\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\windowsphone8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\portable-windows8+net45+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\portable-win81+wpa81\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\portable-net40+sl5+win8+wp8\System.Reactive.Providers.dll - True - True - - - True - - - True - - - - - - - ..\packages\Rx-Providers\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Providers.dll - True - True - - - True - - + True - - - - ..\packages\Rx-Testing\lib\windows8\Microsoft.Reactive.Testing.dll - True - True - - - - - - - ..\packages\Rx-Testing\lib\net40\Microsoft.Reactive.Testing.dll - True - True - - - True - - - - - - - ..\packages\Rx-Testing\lib\net45\Microsoft.Reactive.Testing.dll - True - True - - - True - - - - + - - ..\packages\Rx-Testing\lib\sl5\Microsoft.Reactive.Testing.dll - True - True - - - True - - - - - - - ..\packages\Rx-Testing\lib\windowsphone71\Microsoft.Reactive.Testing.dll - True - True - - - - - - - ..\packages\Rx-Testing\lib\windowsphone8\Microsoft.Reactive.Testing.dll + + ..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll True True diff --git a/tests/ObservableSpecs.fs b/tests/ObservableSpecs.fs index e93ff7f..dfeeee1 100644 --- a/tests/ObservableSpecs.fs +++ b/tests/ObservableSpecs.fs @@ -149,7 +149,7 @@ let ``Zipping two observable sequences of different types creates a single zippe let obs1 = Observable.Return 1 let obs2 = Observable.Return "A" let zipped = Observable.zip obs1 obs2 - let result = zipped |> Observable.First + let result = zipped |> Observable.Wait let expected = ( 1, "A" ) Assert.That(result, Is.EqualTo expected) @@ -159,7 +159,7 @@ let ``ZipWith on two observable sequences of different types creates a single zi let obs1 = Observable.Return 1 let obs2 = Observable.Return "A" let zipped = Observable.zipWith tuple obs1 obs2 - let result = zipped |> Observable.First + let result = zipped |> Observable.Wait let expected = ( 1, "A" ) Assert.That(result, Is.EqualTo expected) diff --git a/tests/paket.references b/tests/paket.references index 74fb725..7254546 100644 --- a/tests/paket.references +++ b/tests/paket.references @@ -1,12 +1,6 @@ FSharp.Core NUnit NUnit.Runners -Rx-Core -Rx-Experimental -Rx-Interfaces -Rx-Linq -Rx-Main -Rx-PlatformServices -Rx-Providers -Rx-Testing -FsCheck \ No newline at end of file +System.Reactive +Microsoft.Reactive.Testing +FsCheck