Skip to content

Commit 5931e6f

Browse files
dsymedsyme
committed
Merge pull request #321 from fsprojects/fix-1
FSharpx.Core --> FSharpx.Extras and modernize
2 parents acd23f0 + 7f28af6 commit 5931e6f

100 files changed

Lines changed: 183 additions & 660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

FSharpx.Core.Tests/AwaitHelpers.fs renamed to FSharpx.Extras.Tests/AwaitHelpers.fs

File renamed without changes.

FSharpx.Core.Tests/AwaitObservableTests.fs renamed to FSharpx.Extras.Tests/AwaitObservableTests.fs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ open System
44
open System.Threading
55
open System.Threading.Tasks
66

7-
open FSharpx.Control.Observable
8-
97
open FsUnit
108
open NUnit.Framework
9+
open FSharpx.Control
10+
open FSharpx.Control.AsyncExtensions
11+
open FSharpx.Control.StreamReaderExtensions
12+
open FSharpx.Control.Observable
1113

1214
[<TestFixture>]
1315
type ``AwaitObservable Tests``() =
@@ -26,7 +28,7 @@ type ``AwaitObservable Tests``() =
2628
[<Test; Ignore("Failing on appveyor ('A continuation provided by Async.FromContinuations was invoked multiple times')") >]
2729
member test.``AwaitObservable yields the first value from the sources Next``() =
2830
let source = new ObservableMock<string>()
29-
let wf = Async.AwaitObservable source
31+
let wf = Async .AwaitObservable source
3032
let awaiter = startAsAwaiter wf
3133
source.AssertSubscribtion(TimeSpan.FromSeconds(1.0))
3234
source.Next("ONE")

FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj renamed to FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>ad500a06-96ed-408c-9472-262cdc2a119b</ProjectGuid>
99
<OutputType>Library</OutputType>
10-
<RootNamespace>FSharpx.Core.Tests</RootNamespace>
11-
<AssemblyName>FSharpx.Core.Tests</AssemblyName>
10+
<RootNamespace>FSharpx.Extras.Tests</RootNamespace>
11+
<AssemblyName>FSharpx.Extras.Tests</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
14-
<Name>FSharpx.Core.Tests</Name>
14+
<Name>FSharpx.Extras.Tests</Name>
1515
<TargetFrameworkProfile />
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
@@ -24,7 +24,7 @@
2424
<OutputPath>..\bin\Debug\</OutputPath>
2525
<DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
2626
<WarningLevel>3</WarningLevel>
27-
<DocumentationFile>bin\Debug\FSharpx.Core.Tests.xml</DocumentationFile>
27+
<DocumentationFile>bin\Debug\FSharpx.Extras.Tests.xml</DocumentationFile>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3030
<DebugType>pdbonly</DebugType>
@@ -33,7 +33,7 @@
3333
<OutputPath>..\bin\</OutputPath>
3434
<DefineConstants>TRACE</DefineConstants>
3535
<WarningLevel>3</WarningLevel>
36-
<DocumentationFile>bin\FSharpx.Core.Tests.xml</DocumentationFile>
36+
<DocumentationFile>bin\FSharpx.Extras.Tests.xml</DocumentationFile>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') And '$(TargetFrameworkProfile)' == ''">
3939
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
@@ -49,6 +49,14 @@
4949
</PropertyGroup>
5050
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5151
<ItemGroup>
52+
<Reference Include="FSharp.Control.AsyncSeq">
53+
<HintPath>..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="FSharpx.Async">
57+
<HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
5260
<Reference Include="FSharpx.Collections">
5361
<HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
5462
<Private>True</Private>
@@ -78,8 +86,8 @@
7886
<None Include="app.config" />
7987
</ItemGroup>
8088
<ItemGroup>
81-
<ProjectReference Include="..\src\FSharpx.Core\FSharpx.Core.fsproj">
82-
<Name>FSharpx.Core</Name>
89+
<ProjectReference Include="..\src\FSharpx.Extras\FSharpx.Extras.fsproj">
90+
<Name>FSharpx.Extras</Name>
8391
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
8492
<Private>False</Private>
8593
</ProjectReference>

FSharpx.Core.Tests/FSharpx.Core.Tests.ncrunchproject renamed to FSharpx.Extras.Tests/FSharpx.Extras.Tests.ncrunchproject

File renamed without changes.

FSharpx.Core.Tests/FSharpx.Core.Tests.v2.ncrunchproject renamed to FSharpx.Extras.Tests/FSharpx.Extras.Tests.v2.ncrunchproject

File renamed without changes.

FSharpx.Core.Tests/ObservableMock.fs renamed to FSharpx.Extras.Tests/ObservableMock.fs

File renamed without changes.

FSharpx.Core.Tests/OptionTests.fs renamed to FSharpx.Extras.Tests/OptionTests.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ open System
44
open System.Threading
55
open System.Threading.Tasks
66

7-
open FSharpx.Core
87
open FSharpx
98

109
open FsUnit

src/FSharpx.Core/app.config renamed to FSharpx.Extras.Tests/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

FSharpx.Core.Tests/packages.config renamed to FSharpx.Extras.Tests/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="FSharp.Control.AsyncSeq" version="1.15.0" targetFramework="net40" />
4+
<package id="FSharpx.Async" version="1.12.0" targetFramework="net40" />
35
<package id="FSharpx.Collections" version="1.9.4" targetFramework="net40" />
46
<package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
57
<package id="NUnit" version="2.6.2" targetFramework="net40" />

FSharpx.Core.nuspec renamed to FSharpx.Extras.nuspec

File renamed without changes.

0 commit comments

Comments
 (0)