Usage of asp.net core app framework instead of sdk

mmarkwort · Sep 30, 2021 · 44b4fbd · 44b4fbd
1 parent 009c12f
commit 44b4fbd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 25 deletions.
diff --git a/src/DependentTestModule/Moryx.DependentTestModule.csproj b/src/DependentTestModule/Moryx.DependentTestModule.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <Description>Moryx Runtime Plugin: DependentTestModule</Description>
+    <Description>Moryx Runtime Module: DependentTestModule</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Moryx.Runtime.Kestrel/ControllerProxySubResolver.cs b/src/Moryx.Runtime.Kestrel/ControllerProxySubResolver.cs
@@ -6,7 +6,6 @@
 using Castle.Core;
 using Castle.MicroKernel;
 using Castle.MicroKernel.Context;
-using Microsoft.AspNetCore.Mvc;
 using Moryx.Container;
 
 namespace Moryx.Runtime.Kestrel
@@ -16,13 +15,15 @@ namespace Moryx.Runtime.Kestrel
     /// </summary>
     internal class ControllerProxySubResolver : ISubDependencyResolver
     {
+        public Type Controller { get; }
+
+        public IContainer Container { get; }
+
         public ControllerProxySubResolver(Type controller, IContainer container)
         {
             Controller = controller;
             Container = container;
         }
-        public Type Controller { get; }
-        public IContainer Container { get; }
 
         public bool CanResolve(CreationContext context, ISubDependencyResolver contextHandlerResolver, ComponentModel model, DependencyModel dependency)
         {

diff --git a/src/Moryx.TestModule.Kestrel/Controllers/TestController.cs b/src/Moryx.TestModule.Kestrel/Controllers/TestController.cs
@@ -1,7 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
+// Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+using Microsoft.AspNetCore.Mvc;
 using Moryx.Container;
 
-namespace Moryx.TestModule.Kestrel.Controllers
+namespace Moryx.TestModule.Kestrel
 {
     [ApiController]
     [Component(LifeCycle.Transient)]

diff --git a/src/Moryx.TestModule.Kestrel/ModuleController/ModuleConfig.cs b/src/Moryx.TestModule.Kestrel/ModuleController/ModuleConfig.cs
@@ -1,10 +1,10 @@
-// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG
+// Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
 using System.Runtime.Serialization;
 using Moryx.Configuration;
 
-namespace Moryx.TestModule
+namespace Moryx.TestModule.Kestrel
 {
     [DataContract]
     public class ModuleConfig : ConfigBase

diff --git a/src/Moryx.TestModule.Kestrel/ModuleController/ModuleConsole.cs b/src/Moryx.TestModule.Kestrel/ModuleController/ModuleConsole.cs
@@ -1,13 +1,10 @@
-// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG
+// Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
 using System;
-using System.ComponentModel;
 using Moryx.Runtime.Modules;
-using Moryx.Serialization;
-using IContainer = Moryx.Container.IContainer;
 
-namespace Moryx.TestModule
+namespace Moryx.TestModule.Kestrel
 {
     [ServerModuleConsole]
     internal class ModuleConsole : IServerModuleConsole

diff --git a/src/Moryx.TestModule.Kestrel/ModuleController/ModuleController.cs b/src/Moryx.TestModule.Kestrel/ModuleController/ModuleController.cs
@@ -1,24 +1,22 @@
-// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG
+// Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
 using System.ComponentModel;
-using System.Threading;
 using Moryx.Communication.Endpoints;
 using Moryx.Runtime.Container;
 using Moryx.Runtime.Modules;
-using Moryx.TestModule.Kestrel.Controllers;
 
-namespace Moryx.TestModule.Kestrel.ModuleController
+namespace Moryx.TestModule.Kestrel
 {
     [ServerModule(ModuleName)]
-    [Description("Test module for System tests")]
+    [Description("Test module for testing ")]
     public class ModuleController : ServerModuleFacadeControllerBase<ModuleConfig>
     {
         private IEndpointHost _host;
         public const string ModuleName = "KestrelTester";
 
         #region Dependencies
-        
+
         /// <summary>
         /// Host factory to create wcf services
         /// </summary>
@@ -31,8 +29,6 @@ public class ModuleController : ServerModuleFacadeControllerBase<ModuleConfig>
         /// </summary>
         public override string Name => ModuleName;
 
-        #region State transition
-
         /// <inheritdoc />
         protected override void OnInitialize()
         {
@@ -53,6 +49,5 @@ protected override void OnStop()
         {
             _host.Stop();
         }
-        #endregion
     }
 }
diff --git a/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj b/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
-    <Description>Moryx Runtime Plugin: KestrelTestModule.</Description>
+    <Description>Moryx Runtime Module: KestrelTestModule.</Description>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 

diff --git a/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj.DotSettings b/src/Moryx.TestModule.Kestrel/Moryx.TestModule.Kestrel.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=controllers/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=modulecontroller/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/StartProject.Core/StartProject.Core.csproj b/src/StartProject.Core/StartProject.Core.csproj
@@ -1,10 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Moryx.Runtime.DbUpdate\Moryx.Runtime.DbUpdate.csproj" />
     <ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />

diff --git a/src/TestModule/Moryx.TestModule.csproj b/src/TestModule/Moryx.TestModule.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <Description>Moryx Runtime Plugin: TestModule.</Description>
+    <Description>Moryx Runtime Module: TestModule.</Description>
   </PropertyGroup>
 
   <ItemGroup>