rename FSharpx.Core --> FSharpx.Extras and simplify

FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj → FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj

@@ -7,11 +7,11 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>ad500a06-96ed-408c-9472-262cdc2a119b</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FSharpx.Core.Tests</RootNamespace>
-    <AssemblyName>FSharpx.Core.Tests</AssemblyName>
+    <RootNamespace>FSharpx.Extras.Tests</RootNamespace>
+    <AssemblyName>FSharpx.Extras.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
-    <Name>FSharpx.Core.Tests</Name>
+    <Name>FSharpx.Extras.Tests</Name>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -24,7 +24,7 @@
     <OutputPath>..\bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Debug\FSharpx.Core.Tests.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\FSharpx.Extras.Tests.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,7 +33,7 @@
     <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\FSharpx.Core.Tests.xml</DocumentationFile>
+    <DocumentationFile>bin\FSharpx.Extras.Tests.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') And '$(TargetFrameworkProfile)' == ''">
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
@@ -86,8 +86,8 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\FSharpx.Core\FSharpx.Core.fsproj">
-      <Name>FSharpx.Core</Name>
+    <ProjectReference Include="..\src\FSharpx.Extras\FSharpx.Extras.fsproj">
+      <Name>FSharpx.Extras</Name>
       <Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
       <Private>False</Private>
     </ProjectReference>

FSharpx.Core.Tests/OptionTests.fs → 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

FSharpx.sln → 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

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)

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
 

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)
 

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

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

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 {

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

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<int>(3)

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

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

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

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

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

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

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

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

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

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

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

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,22 +20,22 @@ 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.
 
 
 *)
 
 #r "FSharpx.Collections.dll"
-#r "FSharpx.Core.dll"
+#r "FSharpx.Extras.dll"
 
 open FSharpx
 

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

packages/repositories.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="..\FSharpx.Core.Tests\packages.config" />
-  <repository path="..\src\FSharpx.Core\packages.config" />
+  <repository path="..\FSharpx.Extras.Tests\packages.config" />
+  <repository path="..\src\FSharpx.Extras\packages.config" />
   <repository path="..\tests\FSharpx.CSharpTests\packages.config" />
   <repository path="..\tests\FSharpx.Http.Tests\packages.config" />
   <repository path="..\tests\FSharpx.Observable.Tests\packages.config" />

src/FSharpx.Core/AssemblyInfo.fs → 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
 
 [<assembly: Guid ("1e95a279-c2a9-498b-bc72-6e7a0d6854ce")>]
 
-[<assembly: AssemblyTitle ("FSharpx")>]
+[<assembly: AssemblyTitle ("FSharpx.Extras")>]
 
-[<assembly: AssemblyDescription ("FSharpx.Core and FSharpx.Functional implement general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
+[<assembly: AssemblyDescription ("FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
 
 It currently implements:
 
@@ -30,11 +30,11 @@ It currently implements:
 * Additional functions around collections
 * Functions to make C# - F# interop easier.")>]
 
-[<assembly: AssemblyProduct ("FSharpx")>]
+[<assembly: AssemblyProduct ("FSharpx.Extras")>]
 
-[<assembly: AssemblyVersion ("1.9.4")>]
+[<assembly: AssemblyVersion ("1.10.0")>]
 
-[<assembly: AssemblyFileVersion ("1.9.4")>]
+[<assembly: AssemblyFileVersion ("1.10.0")>]
 
 [<assembly: AssemblyDelaySign (false)>]