updating kestrel pure owin to netstandard 2

Author: thefringeninja

src/KestrelPureOwin/KestrelOwinServer.cs

@@ -3,15 +3,16 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Server.Kestrel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using static KestrelPureOwin.Constants;
 
 namespace KestrelPureOwin
 {
+    using Microsoft.AspNetCore.Hosting.Internal;
+    using Microsoft.AspNetCore.Server.Kestrel.Core;
+    using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv;
     using AppFunc = Func<IDictionary<string, object>, Task>;
 
     using MidFunc = Func<
@@ -49,37 +50,34 @@ public KestrelOwinServer(KestrelServerOptions options)
 
             var wrappedOptions = Options.Create(options);
 
-            var lifetime = new ApplicationLifetime();
-
             var loggerFactory = new LoggerFactory();
 
-            Server = new KestrelServer(wrappedOptions, lifetime, loggerFactory);
+            var transport = new LibuvTransportFactory(
+                Options.Create(new LibuvTransportOptions()),
+                new ApplicationLifetime(loggerFactory.CreateLogger<ApplicationLifetime>()),
+                loggerFactory);
+
+            Server = new KestrelServer(wrappedOptions, transport, loggerFactory);
         }
 
         private static KestrelServerOptions GetOptions(IDictionary<string, object> properties)
             => new KestrelServerOptions();
 
         public KestrelServer Server { get; }
 
-        public void Run(string url, Action<BuildFunc> configure)
+        public Task Run(string url, Action<BuildFunc> configure, CancellationToken cancellationToken)
         {
-            var done = new ManualResetEventSlim(false);
-
             Console.CancelKeyPress += (s, e) =>
             {
                 Console.WriteLine("Application is shutting down...");
 
-                done.Set();
-
                 e.Cancel = true;
             };
 
-            Start(url, configure);
-
-            done.Wait();
+            return Start(url, configure, cancellationToken);
         }
 
-        public void Start(string url, Action<BuildFunc> configure)
+        public Task Start(string url, Action<BuildFunc> configure, CancellationToken cancellationToken)
         {
             var application = ConfigureApplication(configure);
 
@@ -97,7 +95,7 @@ public void Start(string url, Action<BuildFunc> configure)
                 Console.WriteLine($"Now listening on: {address}");
             }
 
-            Server.Start(application);
+            return Server.StartAsync(application, cancellationToken);
         }
 
         public void Dispose() => Server.Dispose();

src/KestrelPureOwin/KestrelPureOwin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>KestrelPureOwin</AssemblyName>
     <PackageId>KestrelPureOwin</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -10,8 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.0.0" />
   </ItemGroup>
 </Project>

src/KestrelPureOwin/ReverseOwinHeaderDictionary.cs

@@ -33,6 +33,8 @@ StringValues IHeaderDictionary.this[string key]
             set { Inner[key] = value; }
         }
 
+        public long? ContentLength { get; set; }
+
         StringValues IDictionary<string, StringValues>.this[string key]
         {
             get { return Inner[key]; }

src/SqlStreamStore.HAL.DevServer/Program.cs

@@ -2,9 +2,11 @@
 {
     using System;
     using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
     using KestrelPureOwin;
     using Microsoft.AspNetCore.Server.Kestrel;
+    using Microsoft.AspNetCore.Server.Kestrel.Core;
     using SqlStreamStore.Streams;
     using BuildFunc = System.Action<
         System.Func<
@@ -19,7 +21,7 @@ internal static class Program
     {
         private static readonly Random s_random = new Random();
 
-        public static int Main(string[] args)
+        public static async Task<int> Main(string[] args)
         {
             var options = new KestrelServerOptions
             {
@@ -29,7 +31,7 @@ public static int Main(string[] args)
             using(var server = new KestrelOwinServer(options))
             using(var streamStore = new InMemoryStreamStore())
             {
-                server.Start("http://localhost:80", Configure(streamStore));
+                await server.Start("http://localhost:80", Configure(streamStore), CancellationToken.None);
 
                 DisplayMenu(streamStore);
             }

src/SqlStreamStore.HAL.DevServer/SqlStreamStore.HAL.DevServer.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\KestrelPureOwin\KestrelPureOwin.csproj" />