WebHosting is now running with ASP.NET Core 3.0

Author: mayuki

sandbox/WebHostingApp/WebHostingApp.csproj

@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MicroBatchFramework.WebHosting\MicroBatchFramework.WebHosting.csproj" />
     <ProjectReference Include="..\..\src\MicroBatchFramework\MicroBatchFramework.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 </Project>

src/MicroBatchFramework.WebHosting/BatchEngineSwaggerMiddleware.cs

@@ -26,7 +26,7 @@ public BatchEngineSwaggerMiddleware(RequestDelegate next, TargetBatchTypeCollect
             this.options = options;
         }
 
-        public Task Invoke(HttpContext httpContext)
+        public async Task Invoke(HttpContext httpContext)
         {
             // reference embedded resouces
             const string prefix = "MicroBatchFramework.WebHosting.Swagger.SwaggerUI.";
@@ -42,8 +42,8 @@ public Task Invoke(HttpContext httpContext)
                 var bytes = builder.BuildSwaggerJson();
                 httpContext.Response.Headers["Content-Type"] = new[] { "application/json" };
                 httpContext.Response.StatusCode = 200;
-                httpContext.Response.Body.Write(bytes, 0, bytes.Length);
-                return EmptyTask;
+                await httpContext.Response.Body.WriteAsync(bytes, 0, bytes.Length);
+                return;
             }
 
             var myAssembly = typeof(BatchEngineSwaggerMiddleware).GetTypeInfo().Assembly;
@@ -55,13 +55,14 @@ public Task Invoke(HttpContext httpContext)
                     if (stream == null)
                     {
                         // not found, standard request.
-                        return next(httpContext);
+                        await next(httpContext);
+                        return;
                     }
 
                     httpContext.Response.Headers["Content-Type"] = new[] { mediaType };
                     httpContext.Response.StatusCode = 200;
                     var response = httpContext.Response.Body;
-                    stream.CopyTo(response);
+                    await stream.CopyToAsync(response);
                 }
                 else
                 {
@@ -74,26 +75,24 @@ public Task Invoke(HttpContext httpContext)
                     {
                         using (var ms = new MemoryStream())
                         {
-                            stream.CopyTo(ms);
+                            await stream.CopyToAsync(ms);
                             bytes = options.ResolveCustomResource(path, ms.ToArray());
                         }
                     }
 
                     if (bytes == null)
                     {
                         // not found, standard request.
-                        return next(httpContext);
+                        await next(httpContext);
+                        return;
                     }
 
                     httpContext.Response.Headers["Content-Type"] = new[] { mediaType };
                     httpContext.Response.StatusCode = 200;
                     var response = httpContext.Response.Body;
-                    response.Write(bytes, 0, bytes.Length);
+                    await response.WriteAsync(bytes, 0, bytes.Length);
                 }
             }
-
-
-            return EmptyTask;
         }
 
         static string GetMediaType(string path)

src/MicroBatchFramework.WebHosting/MicroBatchFramework.WebHosting.csproj

@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Swagger\SwaggerUI\*" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 
   <ItemGroup>