Switch to class library ASP refernce

mmarkwort · Sep 20, 2021 · 7a3545b · 7a3545b
1 parent 14c2a28
commit 7a3545b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/src/Moryx.Runtime.Kestrel/Moryx.Runtime.Kestrel.csproj b/src/Moryx.Runtime.Kestrel/Moryx.Runtime.Kestrel.csproj
@@ -1,19 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Kestrel support for Moryx</Description>
     <CreatePackage>true</CreatePackage>
     <PackageTags>MORYX;Runtime;Server</PackageTags>
     <OutputType>Library</OutputType>
-    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Castle.Windsor.Extensions.DependencyInjection" Version="5.1.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Moryx\Moryx.csproj" />
   </ItemGroup>

diff --git a/src/Moryx.Runtime.Kestrel/Startup.cs b/src/Moryx.Runtime.Kestrel/Startup.cs
@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Moryx.Configuration;
 
 namespace Moryx.Runtime.Kestrel
 {

diff --git a/src/Moryx.Runtime.Kestrel/VersionController.cs b/src/Moryx.Runtime.Kestrel/VersionController.cs
@@ -1,31 +1,28 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Moryx.Communication.Endpoints;
-using Moryx.Container;
 
 namespace Moryx.Runtime.Kestrel
 {
     [ApiController, Route("endpoints")]
+    [Produces("application/json")]
     public class VersionController : Controller
     {
         public EndpointCollector Collector { get; set; }
 
         [HttpGet]
-        [Produces("application/json")]
         public Endpoint[] AllEndpoints()
         {
             return Collector.AllEndpoints;
         }
 
         [HttpGet("service/{service}")]
-        [Produces("application/json")]
         public Endpoint[] FilteredEndpoints(string service)
         {
             return Collector.AllEndpoints.Where(e => e.Service == service).ToArray();
         }
 
         [HttpGet("endpoint/{endpoint}")]
-        [Produces("application/json")]
         public Endpoint GetEndpointConfig(string endpoint)
         {
             return Collector.AllEndpoints.FirstOrDefault(e => e.Path == endpoint);

diff --git a/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj b/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
@@ -10,6 +10,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Moryx\Moryx.csproj" />
     <ProjectReference Include="..\Moryx.Runtime\Moryx.Runtime.csproj" />

diff --git a/src/StartProject.Core/StartProject.Core.csproj b/src/StartProject.Core/StartProject.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>