wip

SuaveIO · Dec 13, 2016 · 6badc99 · 6badc99
1 parent e9b6b85
commit 6badc99
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,12 @@
-# ![Suave](https://raw.githubusercontent.com/dustinmoris/Suave.AspNetCore/master/suave.png) Suave.AspNetCore
+# Suave.AspNetCore
 
 [Suave.AspNetCore](ToDo) is a small .NET Core library which provides an [ASP.NET Core middleware](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/middleware) to run a [Suave](https://suave.io/) app (on top of [Kestrel](https://github.com/aspnet/KestrelHttpServer)) within ASP.NET Core.
 
 NuGet badge here
 
 ## Current release information
 
-The current version has a dependency on [Suave 2.0.0-rc3](https://www.nuget.org/packages/Suave/2.0.0-rc3), which is not considered a stable release yet.
-
-Suave.AspNetCore only supports Suave's web request handling, but doesn't support Suave's web socket handling yet, which will be added in a later version.
+The current version has a dependency on [Suave 2.0.0-rc3](https://www.nuget.org/packages/Suave/2.0.0-rc3), which is not considered a stable release yet and only supports Suave's web request handling. Support for web sockets will come soon.
 
 ## Framework support
 

diff --git a/test/Suave.AspNetCore.App/Program.fs b/test/Suave.AspNetCore.App/Program.fs
@@ -1,15 +1,14 @@
-// Learn more about F# at http://fsharp.org
-
-open System
+open System
 open System.IO
 open Microsoft.AspNetCore.Hosting
+open Suave.AspNetCore.App
 
 [<EntryPoint>]
 let main argv = 
     let host =
         WebHostBuilder()
             .UseKestrel()
-            .UseStartup<Suave.AspNetCore.App.Startup>()
+            .UseStartup<Startup>()
             .Build()
     host.Run()
     0
diff --git a/test/Suave.AspNetCore.App/project.json b/test/Suave.AspNetCore.App/project.json
@@ -22,15 +22,11 @@
     ]
   },
   "dependencies": {
-    "Microsoft.FSharp.Core.netcore": "1.0.0-*",
-    "Microsoft.NETCore.App": {
-      "version": "1.0.0",
-      "type": "platform"
-    },
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
-    "Microsoft.Extensions.Logging.Console": "1.0.0",
-    "Suave": "2.0.0-rc2",
+    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
+    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
+    "Microsoft.Extensions.Logging.Console": "1.1.0",
+    "Suave": "2.0.0-*",
     "Suave.AspNetCore": "0.1.0",
     "Newtonsoft.Json": "9.0.1"
   },
@@ -45,17 +41,14 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
-      "imports": [
-        "portable-net45+win8",
-        "dnxcore50"
-      ]
+      "imports": "dnxcore50"
     }
   }
-}
+}
diff --git a/test/Suave.Vanilla.App/project.json b/test/Suave.Vanilla.App/project.json
@@ -10,8 +10,8 @@
     }
   },
   "dependencies": {
-    "Microsoft.FSharp.Core.netcore": "1.0.0-*",
-    "Suave": "2.0.0-rc2",
+    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
+    "Suave": "2.0.0-*",
     "Newtonsoft.Json": "9.0.1"
   },
   "tools": {
@@ -25,17 +25,14 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
-      "imports": [
-        "portable-net45+win8",
-        "dnxcore50"
-      ]
+      "imports": "dnxcore50"
     }
   }
-}
+}