diff --git a/FSharpx.Core.nuspec b/FSharp.Extras.nuspec similarity index 100% rename from FSharpx.Core.nuspec rename to FSharp.Extras.nuspec diff --git a/FSharpx.Core.Tests/AwaitHelpers.fs b/FSharpx.Extras.Tests/AwaitHelpers.fs similarity index 100% rename from FSharpx.Core.Tests/AwaitHelpers.fs rename to FSharpx.Extras.Tests/AwaitHelpers.fs diff --git a/FSharpx.Core.Tests/AwaitObservableTests.fs b/FSharpx.Extras.Tests/AwaitObservableTests.fs similarity index 100% rename from FSharpx.Core.Tests/AwaitObservableTests.fs rename to FSharpx.Extras.Tests/AwaitObservableTests.fs diff --git a/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj b/FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj similarity index 92% rename from FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj rename to FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj index f15747cf..d1f4858e 100644 --- a/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj +++ b/FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj @@ -7,11 +7,11 @@ 2.0 ad500a06-96ed-408c-9472-262cdc2a119b Library - FSharpx.Core.Tests - FSharpx.Core.Tests + FSharpx.Extras.Tests + FSharpx.Extras.Tests v4.0 4.3.0.0 - FSharpx.Core.Tests + FSharpx.Extras.Tests ..\ true @@ -24,7 +24,7 @@ ..\bin\Debug\ TRACE;DEBUG;NET40 3 - bin\Debug\FSharpx.Core.Tests.xml + bin\Debug\FSharpx.Extras.Tests.xml pdbonly @@ -33,7 +33,7 @@ ..\bin\ TRACE 3 - bin\FSharpx.Core.Tests.xml + bin\FSharpx.Extras.Tests.xml $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets @@ -86,8 +86,8 @@ - - FSharpx.Core + + FSharpx.Extras {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} False diff --git a/FSharpx.Core.Tests/FSharpx.Core.Tests.ncrunchproject b/FSharpx.Extras.Tests/FSharpx.Extras.Tests.ncrunchproject similarity index 100% rename from FSharpx.Core.Tests/FSharpx.Core.Tests.ncrunchproject rename to FSharpx.Extras.Tests/FSharpx.Extras.Tests.ncrunchproject diff --git a/FSharpx.Core.Tests/FSharpx.Core.Tests.v2.ncrunchproject b/FSharpx.Extras.Tests/FSharpx.Extras.Tests.v2.ncrunchproject similarity index 100% rename from FSharpx.Core.Tests/FSharpx.Core.Tests.v2.ncrunchproject rename to FSharpx.Extras.Tests/FSharpx.Extras.Tests.v2.ncrunchproject diff --git a/FSharpx.Core.Tests/ObservableMock.fs b/FSharpx.Extras.Tests/ObservableMock.fs similarity index 100% rename from FSharpx.Core.Tests/ObservableMock.fs rename to FSharpx.Extras.Tests/ObservableMock.fs diff --git a/FSharpx.Core.Tests/OptionTests.fs b/FSharpx.Extras.Tests/OptionTests.fs similarity index 98% rename from FSharpx.Core.Tests/OptionTests.fs rename to FSharpx.Extras.Tests/OptionTests.fs index b87deec8..f27e18bc 100644 --- a/FSharpx.Core.Tests/OptionTests.fs +++ b/FSharpx.Extras.Tests/OptionTests.fs @@ -4,7 +4,6 @@ open System open System.Threading open System.Threading.Tasks -open FSharpx.Core open FSharpx open FsUnit diff --git a/FSharpx.Core.Tests/app.config b/FSharpx.Extras.Tests/app.config similarity index 100% rename from FSharpx.Core.Tests/app.config rename to FSharpx.Extras.Tests/app.config diff --git a/FSharpx.Core.Tests/packages.config b/FSharpx.Extras.Tests/packages.config similarity index 100% rename from FSharpx.Core.Tests/packages.config rename to FSharpx.Extras.Tests/packages.config diff --git a/FSharpx.sln b/FSharpx.Extras.sln similarity index 96% rename from FSharpx.sln rename to FSharpx.Extras.sln index 87e193ef..766f98af 100644 --- a/FSharpx.sln +++ b/FSharpx.Extras.sln @@ -5,7 +5,7 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}" ProjectSection(SolutionItems) = preProject build.fsx = build.fsx - FSharpx.Core.nuspec = FSharpx.Core.nuspec + FSharpx.Extras.nuspec = FSharpx.Extras.nuspec docs\tools\generate.fsx = docs\tools\generate.fsx docs\content\index.fsx = docs\content\index.fsx LICENSE.md = LICENSE.md @@ -17,7 +17,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Tests", "tests\FSha EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpx.CSharpTests", "tests\FSharpx.CSharpTests\FSharpx.CSharpTests.csproj", "{4354A199-6ACF-4DB5-A8FA-BAD638D1D0E3}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Core", "src\FSharpx.Core\FSharpx.Core.fsproj", "{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Extras", "src\FSharpx.Extras\FSharpx.Extras.fsproj", "{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{EFB3F0C2-10B4-4EF5-8FA7-CC39880067A1}" ProjectSection(SolutionItems) = preProject @@ -47,7 +47,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{04FE33 .nuget\packages.config = .nuget\packages.config EndProjectSection EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Core.Tests", "FSharpx.Core.Tests\FSharpx.Core.Tests.fsproj", "{AD500A06-96ED-408C-9472-262CDC2A119B}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Extras.Tests", "FSharpx.Extras.Tests\FSharpx.Extras.Tests.fsproj", "{AD500A06-96ED-408C-9472-262CDC2A119B}" EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Text.StructuredFormat", "src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.fsproj", "{65E077ED-F51A-42D7-8004-E90D60AF8B8F}" EndProject diff --git a/README.md b/README.md index 84968b4e..ee5bd480 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ [![Issue Stats](http://issuestats.com/github/fsprojects/fsharpx/badge/issue)](http://issuestats.com/github/fsprojects/fsharpx) [![Issue Stats](http://issuestats.com/github/fsprojects/fsharpx/badge/pr)](http://issuestats.com/github/fsprojects/fsharpx) -# FSharpx [![NuGet Status](http://img.shields.io/nuget/v/FSharpx.Core.svg?style=flat)](https://www.nuget.org/packages/FSharpx.Core/) +# FSharpx.Extras [![NuGet Status](http://img.shields.io/nuget/v/FSharpx.Extras.svg?style=flat)](https://www.nuget.org/packages/FSharpx.Core/) -**FSharpx** is a collection of libraries and tools for use with F#. +**FSharpx.Extras** is a collection of libraries and tools for use with F#. -See [the home page](http://fsprojects.github.io/fsharpx/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/fsharpx/tree/gh-pages) +See [the home page](http://fsprojects.github.io/FSharpx.Extras/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/fsharpx/tree/gh-pages) Please contribute to this project. Don't ask for permission, just fork the repository and send pull requests. Please also join the [F# Open Source Group](http://fsharp.github.com) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index bb8fe0bb..23f2a16f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 1.10.0 - Renamed to FSharpx.Extras +* Renamed to FSharpx.Core to FSharpx.Extras + ### 1.9.4 - Remove Obsolete method * Remove the WebClient extension method that has long ago been moved to FSharp.Core diff --git a/build.fsx b/build.fsx index 63b10164..908a9525 100644 --- a/build.fsx +++ b/build.fsx @@ -24,7 +24,6 @@ let mail = "ryan.riley@panesofglass.org" let homepage = "http://github.com/fsprojects/FSharpx.Extras" // .NET Frameworks -let net35 = "v3.5" let net40 = "v4.0" // directories @@ -64,7 +63,7 @@ let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ let release = parseReleaseNotes (File.ReadAllLines "RELEASE_NOTES.md") -let fxVersions = [net35; net40] +let fxVersions = [net40] let normalizeFrameworkVersion fxVersion = let v = ("[^\\d]" >=> "") fxVersion @@ -73,7 +72,7 @@ let normalizeFrameworkVersion fxVersion = let buildLibParams fxVersion = ["TargetFrameworkVersion", fxVersion "DefineConstants", "NET" + normalizeFrameworkVersion fxVersion - "TargetFSharpCoreVersion", (if fxVersion = net35 then "2.3.0.0" else "4.3.0.0") ] + "TargetFSharpCoreVersion", "4.3.0.0" ] // tools let nunitVersion = GetPackageVersion packagesDir "NUnit.Runners" @@ -114,7 +113,7 @@ Target "AssemblyInfo" (fun _ -> Target "Build" (fun _ -> for fxVersion in fxVersions do // Only generate tests for net40 - (if fxVersion = net35 then !! "src/**/*.fsproj" else !! "*.sln") + !! "*.sln" |> MSBuild (buildDirVer fxVersion) "Rebuild" (["Configuration","Release"] @ buildLibParams fxVersion) |> ignore) diff --git a/docs/content/AsyncFileExtensions.fsx b/docs/content/AsyncFileExtensions.fsx index b9b42bb8..e8ada3b4 100644 --- a/docs/content/AsyncFileExtensions.fsx +++ b/docs/content/AsyncFileExtensions.fsx @@ -1,6 +1,6 @@  -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control diff --git a/docs/content/AsyncSeqObservable.fsx b/docs/content/AsyncSeqObservable.fsx index c00791dc..f46daac4 100644 --- a/docs/content/AsyncSeqObservable.fsx +++ b/docs/content/AsyncSeqObservable.fsx @@ -5,7 +5,7 @@ // This example demonstrates how to convert IObservable<'T> to AsyncSeq<'T> -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control open System.Windows.Forms diff --git a/docs/content/AutoCancel.fsx b/docs/content/AutoCancel.fsx index 86136006..b59b15c6 100644 --- a/docs/content/AutoCancel.fsx +++ b/docs/content/AutoCancel.fsx @@ -6,7 +6,7 @@ // This example demonstrates how to use 'AutoCancelAgent' // The agent automatically stops its body when disposed. -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control let op = async { diff --git a/docs/content/BatchProcessing.fsx b/docs/content/BatchProcessing.fsx index 76e2b859..b0acb501 100644 --- a/docs/content/BatchProcessing.fsx +++ b/docs/content/BatchProcessing.fsx @@ -7,7 +7,7 @@ // The agent groups received messages in groups with a maximal // size and emits them with a maximal timeout. -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control open System.Drawing diff --git a/docs/content/BlockingQueue.fsx b/docs/content/BlockingQueue.fsx index 339df35c..c8f3c814 100644 --- a/docs/content/BlockingQueue.fsx +++ b/docs/content/BlockingQueue.fsx @@ -6,7 +6,7 @@ // This example demonstrates how to use 'BlockingAgent' // The agent implements producer/consumer concurrent pattern. -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control let buffer = new BlockingQueueAgent(3) diff --git a/docs/content/Caching.fsx b/docs/content/Caching.fsx index 6e995fc4..2d871eab 100644 --- a/docs/content/Caching.fsx +++ b/docs/content/Caching.fsx @@ -5,7 +5,7 @@ // This example demonstrates how to use 'Async.Cache' and 'AsyncSeq.cache' -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control // The Async.Cache combinator makes it possible to create asynchronous diff --git a/docs/content/CircularBuffer.fsx b/docs/content/CircularBuffer.fsx index a0c839d2..950d244d 100644 --- a/docs/content/CircularBuffer.fsx +++ b/docs/content/CircularBuffer.fsx @@ -8,7 +8,7 @@ #r "System.dll" #I @"../../bin/v4.0" -#r @"FSharpx.Core.dll" +#r @"FSharpx.Extras.dll" #r @"FSharpx.Collections.dll" open System diff --git a/docs/content/Crawler.fsx b/docs/content/Crawler.fsx index e2b15c13..720f3ce9 100644 --- a/docs/content/Crawler.fsx +++ b/docs/content/Crawler.fsx @@ -10,7 +10,7 @@ // The first version performs single-threaded random walk (returned // as an asynchronous sequence) and the second version is concurrent. -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" #r @"..\..\packages\HtmlAgilityPack.1.4.2\lib\HtmlAgilityPack.dll" open System diff --git a/docs/content/DiningPhilosophers.fsx b/docs/content/DiningPhilosophers.fsx index 882a0c3f..e654004a 100644 --- a/docs/content/DiningPhilosophers.fsx +++ b/docs/content/DiningPhilosophers.fsx @@ -1,4 +1,4 @@ -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open System open System.Threading diff --git a/docs/content/MouseFollow.fsx b/docs/content/MouseFollow.fsx index f22b6806..f8bb1cba 100644 --- a/docs/content/MouseFollow.fsx +++ b/docs/content/MouseFollow.fsx @@ -6,7 +6,7 @@ // This example demonstrates how to implement a simple mouse following // algorithm using asynchronous sequences and Observable.window -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open FSharpx.Control open System.Drawing diff --git a/docs/content/Santa.fsx b/docs/content/Santa.fsx index 244de8a1..90866e44 100644 --- a/docs/content/Santa.fsx +++ b/docs/content/Santa.fsx @@ -11,7 +11,7 @@ * *) -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open System open System.Threading diff --git a/docs/content/StmSample.fsx b/docs/content/StmSample.fsx index 9a040963..a3483dea 100644 --- a/docs/content/StmSample.fsx +++ b/docs/content/StmSample.fsx @@ -1,4 +1,4 @@ -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open System open System.Threading diff --git a/docs/content/StockStream.fsx b/docs/content/StockStream.fsx index b2bb07c6..aae3fd43 100644 --- a/docs/content/StockStream.fsx +++ b/docs/content/StockStream.fsx @@ -12,7 +12,7 @@ // Also available at: http://fssnip.net/7X -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open System open System.Net diff --git a/docs/content/StructuredFormatSample.fsx b/docs/content/StructuredFormatSample.fsx index c85b5fd1..4dd832ba 100644 --- a/docs/content/StructuredFormatSample.fsx +++ b/docs/content/StructuredFormatSample.fsx @@ -5,7 +5,7 @@ // This example demonstrates how to use printer combinator library. -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" #r @"..\..\bin\v4.0\FSharpx.Text.StructuredFormat.dll" open Microsoft.FSharp.Text.StructuredFormat diff --git a/docs/content/UndoSample.fsx b/docs/content/UndoSample.fsx index 9ae1f074..8d682487 100644 --- a/docs/content/UndoSample.fsx +++ b/docs/content/UndoSample.fsx @@ -1,4 +1,4 @@ -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" open System open FSharpx.Undo diff --git a/docs/content/WebProxy.fsx b/docs/content/WebProxy.fsx index 08ea0bf5..61336219 100644 --- a/docs/content/WebProxy.fsx +++ b/docs/content/WebProxy.fsx @@ -5,7 +5,7 @@ // This example demonstrates how to implement simple HTTP proxy -#r @"../../bin/v4.0/FSharpx.Core.dll" +#r @"../../bin/v4.0/FSharpx.Extras.dll" #r @"..\..\bin\v4.0\FSharpx.Http.dll" open FSharpx.Control open FSharpx.IO diff --git a/docs/content/index.fsx b/docs/content/index.fsx index 4e6d9585..4f2c9198 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -4,11 +4,11 @@ #I "../../bin/v4.0" (** -# FSharpx.Core and other Extras +# FSharpx.Extras -## FSharpx.Core +## FSharpx.Extras -FSharpx.Core currently implements: +FSharpx.Extras implements: * Several standard monads: State, Reader, Writer, Either, Continuation, Distribution @@ -20,14 +20,14 @@ FSharpx.Core currently implements: * Functions to make C# - F# interop easier. -* FSharpx.Http provides a few features for working with HTTP applications. +* A few features for working with HTTP applications. -FSharpx.Core is a set of additions on top of FSharpx.Collections and FSharpx.Async +FSharpx.Extras is a set of additions on top of FSharpx.Collections and FSharpx.Async -## Extras +## FSharpx.Text.StructuredFormat -These are some adhoc components which are now rarely used: +This is a separate component: * FSharpx.Text.StructuredFormat provides data structures and functions for pretty printers. @@ -35,7 +35,7 @@ These are some adhoc components which are now rarely used: *) #r "FSharpx.Collections.dll" -#r "FSharpx.Core.dll" +#r "FSharpx.Extras.dll" open FSharpx diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index a476f21f..6a1c945e 100644 --- a/docs/tools/generate.fsx +++ b/docs/tools/generate.fsx @@ -4,7 +4,7 @@ // -------------------------------------------------------------------------------------- // Binaries that have XML documentation (in a corresponding generated XML file) -let referenceBinaries = [ "FSharpx.Core.dll" ] +let referenceBinaries = [ "FSharpx.Extras.dll" ] // Web site location for the generated documentation let website = "." @@ -16,7 +16,7 @@ let info = "project-author", "Steffan Forkmann and others" "project-summary", "Extra components for FSharpx" "project-github", githubLink - "project-nuget", "https://www.nuget.org/packages/FSharpx.Core/" ] + "project-nuget", "https://www.nuget.org/packages/FSharpx.Extras/" ] // -------------------------------------------------------------------------------------- // For typical project, no changes are needed below diff --git a/packages/repositories.config b/packages/repositories.config index 7e3ee0d2..2b4a42fa 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -1,7 +1,7 @@  - - + + diff --git a/src/FSharpx.Core/AssemblyInfo.fs b/src/FSharpx.Extras/AssemblyInfo.fs similarity index 69% rename from src/FSharpx.Core/AssemblyInfo.fs rename to src/FSharpx.Extras/AssemblyInfo.fs index 70a82624..12b59697 100644 --- a/src/FSharpx.Core/AssemblyInfo.fs +++ b/src/FSharpx.Extras/AssemblyInfo.fs @@ -1,4 +1,4 @@ -module FSharpx.Core.AssemblyInfo +module FSharpx.Extras.AssemblyInfo #nowarn "49" // uppercase argument names #nowarn "67" // this type test or downcast will always hold #nowarn "66" // tis upast is unnecessary - the types are identical @@ -18,9 +18,9 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 [] -[] +[] -[] -[] +[] -[] +[] -[] +[] [] diff --git a/src/FSharpx.Core/CSharpCompat.fs b/src/FSharpx.Extras/CSharpCompat.fs similarity index 100% rename from src/FSharpx.Core/CSharpCompat.fs rename to src/FSharpx.Extras/CSharpCompat.fs diff --git a/src/FSharpx.Core/ComputationExpressions/Continuation.fs b/src/FSharpx.Extras/ComputationExpressions/Continuation.fs similarity index 100% rename from src/FSharpx.Core/ComputationExpressions/Continuation.fs rename to src/FSharpx.Extras/ComputationExpressions/Continuation.fs diff --git a/src/FSharpx.Core/ComputationExpressions/Enumerator.fs b/src/FSharpx.Extras/ComputationExpressions/Enumerator.fs similarity index 100% rename from src/FSharpx.Core/ComputationExpressions/Enumerator.fs rename to src/FSharpx.Extras/ComputationExpressions/Enumerator.fs diff --git a/src/FSharpx.Core/ComputationExpressions/Monad.fs b/src/FSharpx.Extras/ComputationExpressions/Monad.fs similarity index 100% rename from src/FSharpx.Core/ComputationExpressions/Monad.fs rename to src/FSharpx.Extras/ComputationExpressions/Monad.fs diff --git a/src/FSharpx.Core/Conneg.fs b/src/FSharpx.Extras/Conneg.fs similarity index 100% rename from src/FSharpx.Core/Conneg.fs rename to src/FSharpx.Extras/Conneg.fs diff --git a/src/FSharpx.Core/FSharpx.Core.fsproj b/src/FSharpx.Extras/FSharpx.Extras.fsproj similarity index 96% rename from src/FSharpx.Core/FSharpx.Core.fsproj rename to src/FSharpx.Extras/FSharpx.Extras.fsproj index 5d8793e2..9cdc2959 100644 --- a/src/FSharpx.Core/FSharpx.Core.fsproj +++ b/src/FSharpx.Extras/FSharpx.Extras.fsproj @@ -8,10 +8,10 @@ {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} Library FSharpx - FSharpx.Core + FSharpx.Extras v4.0 4.3.0.0 - FSharpx.Core + FSharpx.Extras ..\..\ @@ -25,7 +25,7 @@ ..\..\bin\Debug\ TRACE;DEBUG 3 - ..\..\bin\Debug\FSharpx.Core.xml + ..\..\bin\Debug\FSharpx.Extras.xml pdbonly @@ -34,7 +34,7 @@ ..\..\bin\ TRACE 3 - ..\..\bin\FSharpx.Core.xml + ..\..\bin\FSharpx.Extras.xml NET35 diff --git a/src/FSharpx.Core/IO.fs b/src/FSharpx.Extras/IO.fs similarity index 100% rename from src/FSharpx.Core/IO.fs rename to src/FSharpx.Extras/IO.fs diff --git a/src/FSharpx.Core/Iteratee.fs b/src/FSharpx.Extras/Iteratee.fs similarity index 100% rename from src/FSharpx.Core/Iteratee.fs rename to src/FSharpx.Extras/Iteratee.fs diff --git a/src/FSharpx.Core/JSON.fs b/src/FSharpx.Extras/JSON.fs similarity index 100% rename from src/FSharpx.Core/JSON.fs rename to src/FSharpx.Extras/JSON.fs diff --git a/src/FSharpx.Core/Lazy.fs b/src/FSharpx.Extras/Lazy.fs similarity index 100% rename from src/FSharpx.Core/Lazy.fs rename to src/FSharpx.Extras/Lazy.fs diff --git a/src/FSharpx.Core/Lens.fs b/src/FSharpx.Extras/Lens.fs similarity index 100% rename from src/FSharpx.Core/Lens.fs rename to src/FSharpx.Extras/Lens.fs diff --git a/src/FSharpx.Core/Linq/Linq.fs b/src/FSharpx.Extras/Linq/Linq.fs similarity index 100% rename from src/FSharpx.Core/Linq/Linq.fs rename to src/FSharpx.Extras/Linq/Linq.fs diff --git a/src/FSharpx.Core/Linq/Linq.fsi b/src/FSharpx.Extras/Linq/Linq.fsi similarity index 100% rename from src/FSharpx.Core/Linq/Linq.fsi rename to src/FSharpx.Extras/Linq/Linq.fsi diff --git a/src/FSharpx.Core/Monoid.fs b/src/FSharpx.Extras/Monoid.fs similarity index 100% rename from src/FSharpx.Core/Monoid.fs rename to src/FSharpx.Extras/Monoid.fs diff --git a/src/FSharpx.Core/Net.fs b/src/FSharpx.Extras/Net.fs similarity index 100% rename from src/FSharpx.Core/Net.fs rename to src/FSharpx.Extras/Net.fs diff --git a/src/FSharpx.Core/Pluralizer.fs b/src/FSharpx.Extras/Pluralizer.fs similarity index 100% rename from src/FSharpx.Core/Pluralizer.fs rename to src/FSharpx.Extras/Pluralizer.fs diff --git a/src/FSharpx.Core/Prelude.fs b/src/FSharpx.Extras/Prelude.fs similarity index 100% rename from src/FSharpx.Core/Prelude.fs rename to src/FSharpx.Extras/Prelude.fs diff --git a/src/FSharpx.Core/Regex.fs b/src/FSharpx.Extras/Regex.fs similarity index 100% rename from src/FSharpx.Core/Regex.fs rename to src/FSharpx.Extras/Regex.fs diff --git a/src/FSharpx.Core/Stm.fs b/src/FSharpx.Extras/Stm.fs similarity index 100% rename from src/FSharpx.Core/Stm.fs rename to src/FSharpx.Extras/Stm.fs diff --git a/src/FSharpx.Core/Strings.fs b/src/FSharpx.Extras/Strings.fs similarity index 100% rename from src/FSharpx.Core/Strings.fs rename to src/FSharpx.Extras/Strings.fs diff --git a/src/FSharpx.Core/TimeMeasurement.fs b/src/FSharpx.Extras/TimeMeasurement.fs similarity index 100% rename from src/FSharpx.Core/TimeMeasurement.fs rename to src/FSharpx.Extras/TimeMeasurement.fs diff --git a/src/FSharpx.Core/TreeZipper.fs b/src/FSharpx.Extras/TreeZipper.fs similarity index 100% rename from src/FSharpx.Core/TreeZipper.fs rename to src/FSharpx.Extras/TreeZipper.fs diff --git a/src/FSharpx.Core/app.config b/src/FSharpx.Extras/app.config similarity index 100% rename from src/FSharpx.Core/app.config rename to src/FSharpx.Extras/app.config diff --git a/src/FSharpx.Core/packages.config b/src/FSharpx.Extras/packages.config similarity index 100% rename from src/FSharpx.Core/packages.config rename to src/FSharpx.Extras/packages.config diff --git a/src/FSharpx.Http/FSharpx.Http.fsproj b/src/FSharpx.Http/FSharpx.Http.fsproj deleted file mode 100644 index d771dfb2..00000000 --- a/src/FSharpx.Http/FSharpx.Http.fsproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {60f3bb81-5449-45dd-a217-b6045327680c} - Library - FSharpx.Http - FSharpx.Http - v4.0 - 4.3.0.0 - FSharpx.Http - - - true - full - false - false - ..\..\bin\Debug\ - DEBUG;TRACE - 3 - ..\..\bin\Debug\FSharpx.Http.xml - - - pdbonly - true - true - ..\..\bin\ - TRACE - 3 - ..\..\bin\FSharpx.Http.xml - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - - - False - - - False - FSharp.Core - FSharp.Core.dll - $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll - - - - - - - FSharpx.Core - {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} - False - - - \ No newline at end of file diff --git a/src/FSharpx.Observable/AssemblyInfo.fs b/src/FSharpx.Observable/AssemblyInfo.fs deleted file mode 100644 index 54af6dd5..00000000 --- a/src/FSharpx.Observable/AssemblyInfo.fs +++ /dev/null @@ -1,35 +0,0 @@ -module FSharpx.Observable.AssemblyInfo -#nowarn "49" // uppercase argument names -#nowarn "67" // this type test or downcast will always hold -#nowarn "66" // tis upast is unnecessary - the types are identical -#nowarn "58" // possible incorrect indentation.. -#nowarn "57" // do not use create_DelegateEvent -#nowarn "51" // address-of operator can occur in the code -open System -open System.Reflection -open System.Runtime.CompilerServices -open System.Runtime.InteropServices -exception ReturnException183c26a427ae489c8fd92ec21a0c9a59 of obj -exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -() diff --git a/src/FSharpx.Observable/FSharpx.Observable.fsproj b/src/FSharpx.Observable/FSharpx.Observable.fsproj deleted file mode 100644 index 04fbe033..00000000 --- a/src/FSharpx.Observable/FSharpx.Observable.fsproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {2e802f54-9cd0-4b0a-b834-5c5979403b50} - Library - FSharpx.Observable - FSharpx.Observable - v4.0 - 4.3.0.0 - FSharpx.Observable - - - true - full - false - false - ..\..\bin\Debug\ - DEBUG;TRACE - 3 - bin\Debug\FSharpx.Observable.xml - - - pdbonly - true - true - ..\..\bin\ - TRACE - 3 - bin\Release\FSharpx.Observable.xml - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - - - - False - - - False - FSharp.Core - FSharp.Core.dll - $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll - - - - - - - FSharpx.Core - {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} - False - - - \ No newline at end of file diff --git a/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs b/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs index a91ffffb..ac55f717 100644 --- a/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs +++ b/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs @@ -20,15 +20,15 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 [] -[] [] -[] +[] -[] +[] [] diff --git a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj index ea6af9b1..7977daee 100644 --- a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj +++ b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj @@ -100,9 +100,9 @@ - + {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} - FSharpx.Core + FSharpx.Extras diff --git a/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj b/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj index 8f1aaf16..aa07ea50 100644 --- a/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj +++ b/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj @@ -62,9 +62,9 @@ True - + {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} - FSharpx.Core + FSharpx.Extras diff --git a/tests/FSharpx.Tests/FSharpx.Tests.fsproj b/tests/FSharpx.Tests/FSharpx.Tests.fsproj index cb882b4d..84e0acf9 100644 --- a/tests/FSharpx.Tests/FSharpx.Tests.fsproj +++ b/tests/FSharpx.Tests/FSharpx.Tests.fsproj @@ -135,8 +135,8 @@ - - FSharpx.Core + + FSharpx.Extras {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} True