Skip to content

Commit 1f27359

Browse files
dsymedsyme
committed
Merge pull request #4 from fsprojects/fix-1
Naming changes
2 parents 879a5f4 + e092247 commit 1f27359

25 files changed

Lines changed: 188 additions & 739 deletions

AsyncSeq.sln renamed to FSharp.Control.AsyncSeq.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
1212
EndProject
13-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AsyncSeq", "src\AsyncSeq\AsyncSeq.fsproj", "{2D4F3D0E-0E18-48D7-9C27-98864039393D}"
13+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq", "src\FSharp.Control.AsyncSeq\FSharp.Control.AsyncSeq.fsproj", "{2D4F3D0E-0E18-48D7-9C27-98864039393D}"
1414
EndProject
1515
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1616
ProjectSection(SolutionItems) = preProject
@@ -34,7 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
3434
EndProject
3535
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
3636
EndProject
37-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AsyncSeq.Tests", "tests\AsyncSeq.Tests\AsyncSeq.Tests.fsproj", "{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}"
37+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq.Tests", "tests\FSharp.Control.AsyncSeq.Tests\FSharp.Control.AsyncSeq.Tests.fsproj", "{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}"
3838
EndProject
3939
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "library", "library", "{B4BB88FA-DB8C-4651-9869-A8FEA79F044E}"
4040
ProjectSection(SolutionItems) = preProject

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
[![Issue Stats](http://issuestats.com/github/fsprojects/AsyncSeq/badge/issue)](http://issuestats.com/github/fsprojects/AsyncSeq)
2-
[![Issue Stats](http://issuestats.com/github/fsprojects/AsyncSeq/badge/pr)](http://issuestats.com/github/fsprojects/AsyncSeq)
1+
[![Issue Stats](http://issuestats.com/github/fsprojects/FSharp.Control.AsyncSeq/badge/issue)](http://issuestats.com/github/fsprojects/FSharp.Control.AsyncSeq)
2+
[![Issue Stats](http://issuestats.com/github/fsprojects/FSharp.Control.AsyncSeq/badge/pr)](http://issuestats.com/github/fsprojects/FSharp.Control.AsyncSeq)
33
[![Build status](https://ci.appveyor.com/api/projects/status/k7lyn5rqeuqagyi2/branch/master?svg=true)](https://ci.appveyor.com/project/SteffenForkmann/asyncseq/branch/master)
4-
[![Build status](https://travis-ci.org/fsprojects/AsyncSeq.svg?branch=master)](https://travis-ci.org/fsprojects/AsyncSeq)
4+
[![Build status](https://travis-ci.org/fsprojects/FSharp.Control.AsyncSeq.svg?branch=master)](https://travis-ci.org/fsprojects/AsyncSeq)
55

6-
# AsyncSeq [![NuGet Status](http://img.shields.io/nuget/v/AsyncSeq.svg?style=flat)](https://www.nuget.org/packages/AsyncSeq/)
6+
# FSharp.Control.AsyncSeq [![NuGet Status](http://img.shields.io/nuget/v/FSharp.Control.AsyncSeq.svg?style=flat)](https://www.nuget.org/packages/FSharp.Control.AsyncSeq/)
77

8-
**AsyncSeq** is a collection of asynchronous programming utilities for F#.
8+
**FSharp.Control.AsyncSeq** is a collection of asynchronous programming utilities for F#.
99

10-
See [the home page](http://fsprojects.github.io/AsyncSeq/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/AsyncSeq/tree/gh-pages)
10+
See [the home page](http://fsprojects.github.io/FSharp.Control.AsyncSeq/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/AsyncSeq/tree/gh-pages)
1111
Please contribute to this project. Don't ask for permission, just fork the repository and send pull requests.
1212

1313
Please also join the [F# Open Source Group](http://fsharp.github.com)

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.12.2 - 27.03.2015
2+
* Renamed to FSharp.Control.AsyncSeq
3+
14
### 1.12.1 - 27.03.2015
25
* Added Async.bindChoice, Async.ParallelIgnore, AsyncSeq.zipWithAsync, AsyncSeq.zappAsync, AsyncSeq.threadStateAsync, AsyncSeq.merge, AsyncSeq.traverseOptionAsync, AsyncSeq.traverseChoiceAsync
36
* Added AsyncSeq.toList, AsyncSeq.toArray, AsyncSeq.bufferByCount, AsyncSeq.unfoldAsync, AsyncSeq.concatSeq, AsyncSeq.interleave

‎build.fsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ open SourceLink
2828

2929
// The name of the project
3030
// (used by attributes in AssemblyInfo, name of a NuGet package and directory in 'src')
31-
let project = "AsyncSeq"
31+
let project = "FSharp.Control.AsyncSeq"
3232

3333
// Short summary of the project
3434
// (used as description in AssemblyInfo and as a short summary for NuGet package)
@@ -45,7 +45,7 @@ let authors = [ "Tomasz Petricek"; "David Thomas"; "Ryan Riley"; "Steffen Forkma
4545
let tags = "F#, async, fsharpx"
4646

4747
// File system information
48-
let solutionFile = "AsyncSeq.sln"
48+
let solutionFile = "FSharp.Control.AsyncSeq.sln"
4949

5050
// Pattern specifying assemblies to be tested using NUnit
5151
let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
@@ -56,7 +56,7 @@ let gitOwner = "fsprojects"
5656
let gitHome = "https://github.com/" + gitOwner
5757

5858
// The name of the project on GitHub
59-
let gitName = "AsyncSeq"
59+
let gitName = "FSharp.Control.AsyncSeq"
6060

6161
// The url for the raw files hosted
6262
let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects"

‎docs/content/index.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
AsyncSeq
1+
FSharp.Control.AsyncSeq
22
=============
33

4-
AsyncSeq is a collection of asynchronous programming utilities for F#.
4+
FSharp.Control.AsyncSeq is a collection of asynchronous programming utilities for F#.
55

66
<div class="row">
77
<div class="span1"></div>
88
<div class="span6">
99
<div class="well well-small" id="nuget">
10-
The AsyncSeq library can be <a href="https://nuget.org/packages/AsyncSeq">installed from NuGet</a>:
11-
<pre>PM> Install-Package AsyncSeq</pre>
10+
The FSharp.Control.AsyncSeq library can be <a href="https://nuget.org/packages/AsyncSeq">installed from NuGet</a>:
11+
<pre>PM> Install-Package FSharp.Control.AsyncSeq</pre>
1212
</div>
1313
</div>
1414
<div class="span1"></div>
@@ -22,7 +22,7 @@ This includes additional brief samples on using most of the functions.
2222

2323
[Terminology](terminology.html) a reference for some of the terminology around F# async.
2424

25-
[AsyncSeq](library/AsyncSeq.html) contains narrative and code samples explaining asynchronous sequences.
25+
[FSharp.Control.AsyncSeq](library/fsharp-control-AsyncSeq.html) contains narrative and code samples explaining asynchronous sequences.
2626

2727
Contributing and copyright
2828
--------------------------
@@ -36,8 +36,8 @@ The library is available under Apache 2.0 license, which allows modification and
3636
redistribution for both commercial and non-commercial purposes. For more information see the
3737
[License file][license] in the GitHub repository.
3838

39-
[content]: https://github.com/fsprojects/AsyncSeq/tree/master/docs/content
40-
[gh]: https://github.com/fsprojects/AsyncSeq
41-
[issues]: https://github.com/fsprojects/AsyncSeq/issues
42-
[readme]: https://github.com/fsprojects/AsyncSeq/blob/master/README.md
43-
[license]: https://github.com/fsprojects/AsyncSeq/blob/master/LICENSE.txt
39+
[content]: https://github.com/fsprojects/FSharp.Control.AsyncSeq/tree/master/docs/content
40+
[gh]: https://github.com/fsprojects/FSharp.Control.AsyncSeq
41+
[issues]: https://github.com/fsprojects/FSharp.Control.AsyncSeq/issues
42+
[readme]: https://github.com/fsprojects/FSharp.Control.AsyncSeq/blob/master/README.md
43+
[license]: https://github.com/fsprojects/FSharp.Control.AsyncSeq/blob/master/LICENSE.txt

‎docs/content/library/AsyncSeq.fsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(**
22
3-
# F# Async: AsyncSeq
3+
# F# Async: FSharp.Control.AsyncSeq
44
55
An AsyncSeq is a sequence in which individual elements are retrieved using an `Async` computation.
66
It is similar to `seq<'a>` in that subsequent elements are pulled lazily. Structurally it is
@@ -10,11 +10,11 @@ latter push-based. Analogs for most operations defined for `Seq`, `List` and `IO
1010
`AsyncSeq`. The power of `AsyncSeq` lies in that many of these operations also have analogs based on `Async`
1111
allowing composition of complex asynchronous workflows.
1212
13-
The `AsyncSeq` type is located in the `AsyncSeq.dll` assembly which can be loaded in F# Interactive as follows:
13+
The `AsyncSeq` type is located in the `FSharp.Control.AsyncSeq.dll` assembly which can be loaded in F# Interactive as follows:
1414
*)
1515

16-
#r "../../../bin/AsyncSeq.dll"
17-
open FSharpx.Control
16+
#r "../../../bin/FSharp.Control.AsyncSeq.dll"
17+
open FSharp.Control
1818

1919

2020

‎docs/tools/generate.fsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
// --------------------------------------------------------------------------------------
55

66
// Binaries that have XML documentation (in a corresponding generated XML file)
7-
let referenceBinaries = [ "AsyncSeq.dll" ]
7+
let referenceBinaries = [ "FSharp.Control.AsyncSeq.dll" ]
88
// Web site location for the generated documentation
9-
let website = "/AsyncSeq"
9+
let website = "/FSharp.Control.AsyncSeq"
1010

11-
let githubLink = "http://github.com/fsprojects/AsyncSeq"
11+
let githubLink = "http://github.com/fsprojects/FSharp.Control.AsyncSeq"
1212

1313
// Specify more information about your project
1414
let info =
15-
[ "project-name", "AsyncSeq"
15+
[ "project-name", "FSharp.Control.AsyncSeq"
1616
"project-author", "Thomas Petricek, David Thomas, Steffen Forkmann"
1717
"project-summary", "Async extensions for F#"
1818
"project-github", githubLink
19-
"project-nuget", "http://nuget.org/packages/AsyncSeq" ]
19+
"project-nuget", "http://nuget.org/packages/FSharp.Control.AsyncSeq" ]
2020

2121
// --------------------------------------------------------------------------------------
2222
// For typical project, no changes are needed below

‎docs/tools/templates/template.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<li class="divider"></li>
4747
<li class="nav-header">Documentation</li>
4848
<li><a href="@Root/terminology.html">Terminology</a></li>
49-
<li><a href="@Root/library/AsyncSeq.html">AsyncSeq</a></li>
49+
<li><a href="@Root/library/fsharp-control-AsyncSeq.html">AsyncSeq</a></li>
5050
<li><a href="@Root/reference/index.html">API Reference</a></li>
5151
</ul>
5252
</div>

‎src/AsyncSeq/AssemblyInfo.fs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/AsyncSeq/Async.fs‎

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)