Merge from 'upstream/master'

Resolve conflict in Return removal

Author: wilsoncg

.editorconfig

@@ -0,0 +1,13 @@
+# All files
+[*]
+end_of_line              = crlf
+indent_style             = space
+insert_final_newline     = true
+trim_trailing_whitespace = true
+# Project files
+[*.{csproj,fsproj}]
+indent_size          = 2
+# Code files
+[*.{cs,csx,fs,fsx,vb,vbx,xml}]
+indent_size          = 4
+charset              = utf-8-bom

.paket/Paket.Restore.targets

@@ -6,10 +6,10 @@ matrix:
       dist: trusty
       sudo: false
       mono: latest
-      dotnet: 2.1.300
+      dotnet: 3.0
     - os: osx # OSX 10.12
       osx_image: xcode9.1
-      dotnet: 2.1.300
+      dotnet: 3.0.100
       mono: latest
       sudo: false
 
@@ -23,4 +23,4 @@ script:
 
 branches:
   except:
-    - gh-pages
+    - gh-pages

.travis.yml

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29924.181
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml

FSharp.Control.AsyncSeq.sln

@@ -1,3 +1,6 @@
+### 2.0.23 - 29.01.2019
+* Adding .NET IAsyncEnumerable conversion functions (ofAsyncEnum and toAsyncEnum) [#96](https://github.com/fsprojects/FSharp.Control.AsyncSeq/pull/96)
+
 ### 2.0.22 - 29.09.2019
 * Rename toList and toArray to toListSynchronously and toArraySynchronously
 * Add ofSeqAsync and concat

RELEASE_NOTES.md

@@ -1,6 +1,6 @@
 environment:
-  CLI_VERSION: 2.0.0
-image: Visual Studio 2017
+  CLI_VERSION: 3.0.100
+image: Visual Studio 2019
 init:
   - git config --global core.autocrlf input
 build_script:

appveyor.yml

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.300"
+    "version": "3.0.100"
   }
 }

global.json

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Control.AsyncSeq")>]
 [<assembly: AssemblyProductAttribute("src/FSharp.Control.AsyncSeq")>]
 [<assembly: AssemblyDescriptionAttribute("Asynchronous sequences for F#")>]
-[<assembly: AssemblyVersionAttribute("2.0.22")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.22")>]
+[<assembly: AssemblyVersionAttribute("2.0.23")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.23")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Control.AsyncSeq"
     let [<Literal>] AssemblyProduct = "src/FSharp.Control.AsyncSeq"
     let [<Literal>] AssemblyDescription = "Asynchronous sequences for F#"
-    let [<Literal>] AssemblyVersion = "2.0.22"
-    let [<Literal>] AssemblyFileVersion = "2.0.22"
+    let [<Literal>] AssemblyVersion = "2.0.23"
+    let [<Literal>] AssemblyFileVersion = "2.0.23"