From fbbed96633f1e6b2168c2408da0f1f55b92269a2 Mon Sep 17 00:00:00 2001
From: Thomas Fuchs <tfuchs@phoenixcontact.com>
Date: Thu, 7 Dec 2023 12:41:16 +0100
Subject: [PATCH] Upgrade to MORYX8

---
 Directory.Build.targets                                    | 4 ++--
 src/MyApplication.App/MyApplication.App.csproj             | 2 +-
 src/MyApplication.App/Program.cs                           | 7 +++++--
 src/MyApplication.Resources/MyApplication.Resources.csproj | 2 +-
 src/MyApplication.Resources/SomeResource.cs                | 2 +-
 src/MyApplication/MyApplication.csproj                     | 2 +-
 src/MyApplication/Resources/ISomeResource.cs               | 2 +-
 src/Tests/MyApplication.Tests/MyApplication.Tests.csproj   | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6b143af..fede190 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,8 +3,8 @@
 
   <!-- Central package version management -->
   <PropertyGroup>
-    <MoryxFrameworkVersion>6.1.3</MoryxFrameworkVersion>
-    <MoryxFactoryVersion>6.1.1</MoryxFactoryVersion>
+    <MoryxFrameworkVersion>8.*</MoryxFrameworkVersion>
+    <MoryxFactoryVersion>8.*</MoryxFactoryVersion>
   </PropertyGroup>
 
   <!-- Package versions for package references across all projects -->
diff --git a/src/MyApplication.App/MyApplication.App.csproj b/src/MyApplication.App/MyApplication.App.csproj
index a76bccb..7ae74f6 100644
--- a/src/MyApplication.App/MyApplication.App.csproj
+++ b/src/MyApplication.App/MyApplication.App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MyApplication.App/Program.cs b/src/MyApplication.App/Program.cs
index 068cddd..dd62e7f 100644
--- a/src/MyApplication.App/Program.cs
+++ b/src/MyApplication.App/Program.cs
@@ -7,6 +7,7 @@
 using Moryx.Asp.Integration;
 using Moryx.Model;
 using Moryx.Runtime.Kernel;
+using Moryx.Runtime.Modules;
 using Moryx.Tools;
 using MyApplication.App;
 using System.Globalization;
@@ -99,8 +100,10 @@
 #endregion
 
 app.Services.UseMoryxConfigurations("Config");
-app.Services.StartMoryxModules();
+
+var moduleManager = app.Services.GetRequiredService<IModuleManager>();
+moduleManager.StartModules();
 
 app.Run();
 
-app.Services.StopMoryxModules();
+moduleManager.StopModules();
diff --git a/src/MyApplication.Resources/MyApplication.Resources.csproj b/src/MyApplication.Resources/MyApplication.Resources.csproj
index 7b350f3..1fe1899 100644
--- a/src/MyApplication.Resources/MyApplication.Resources.csproj
+++ b/src/MyApplication.Resources/MyApplication.Resources.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	
 	<ItemGroup>
diff --git a/src/MyApplication.Resources/SomeResource.cs b/src/MyApplication.Resources/SomeResource.cs
index 7eb9a9b..977b554 100644
--- a/src/MyApplication.Resources/SomeResource.cs
+++ b/src/MyApplication.Resources/SomeResource.cs
@@ -7,7 +7,7 @@
 namespace MyApplication.Resources
 {
     [ResourceRegistration] // Only necessary for dependency injection like logging or parallel operations
-    public class SomeResource : PublicResource, ISomeResource
+    public class SomeResource : Resource, ISomeResource
     {
         [DataMember, EntrySerialize]
         [Description("Configured value for the capabilities")]
diff --git a/src/MyApplication/MyApplication.csproj b/src/MyApplication/MyApplication.csproj
index 701370e..d8714f5 100644
--- a/src/MyApplication/MyApplication.csproj
+++ b/src/MyApplication/MyApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 	
   <ItemGroup>
diff --git a/src/MyApplication/Resources/ISomeResource.cs b/src/MyApplication/Resources/ISomeResource.cs
index 1af7d12..67cfaae 100644
--- a/src/MyApplication/Resources/ISomeResource.cs
+++ b/src/MyApplication/Resources/ISomeResource.cs
@@ -2,7 +2,7 @@
 
 namespace MyApplication.Resources
 {
-    public interface ISomeResource : IPublicResource
+    public interface ISomeResource : IResource
     {
     }
 }
\ No newline at end of file
diff --git a/src/Tests/MyApplication.Tests/MyApplication.Tests.csproj b/src/Tests/MyApplication.Tests/MyApplication.Tests.csproj
index d3d7878..6c1cbb8 100644
--- a/src/Tests/MyApplication.Tests/MyApplication.Tests.csproj
+++ b/src/Tests/MyApplication.Tests/MyApplication.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <DebugType>full</DebugType>
   </PropertyGroup>