Update to MORYX-Core Future

1nf0rmagician · 1nf0rmagician · commit 9e90f67d3710 · 2022-08-23T13:09:13.000+02:00
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -3,7 +3,7 @@
 
   <!-- Central package version management -->
   <PropertyGroup>
-    <MoryxCoreVersion>3.0.0</MoryxCoreVersion>
+    <MoryxCoreVersion>4.0.0-future.528</MoryxCoreVersion>
     <MoryxAbstractionLayerVersion>5.2.1</MoryxAbstractionLayerVersion>
   </PropertyGroup>
 
diff --git a/NuGet.Config b/NuGet.Config
@@ -11,6 +11,7 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="MORYX" value="https://www.myget.org/F/moryx/api/v3/index.json" />
+	<add key="MORYX" value="https://www.myget.org/F/moryx/api/v3/index.json" />
+	<add key="MORYX-Future" value="https://www.myget.org/F/moryx-future/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/Moryx.ControlSystem/Moryx.ControlSystem.csproj b/src/Moryx.ControlSystem/Moryx.ControlSystem.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Bundle assembly for ControlSystem and extensions</Description>
     <CreatePackage>true</CreatePackage>
diff --git a/src/Moryx.Orders/IOperationLogger.cs b/src/Moryx.Orders/IOperationLogger.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using Moryx.Logging;
 
 namespace Moryx.Orders
diff --git a/src/Moryx.Orders/Moryx.Orders.csproj b/src/Moryx.Orders/Moryx.Orders.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Bundle assembly for Orders and extensions</Description>
     <CreatePackage>true</CreatePackage>
diff --git a/src/Moryx.Orders/OperationLogMessage.cs b/src/Moryx.Orders/OperationLogMessage.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0
 
 using System;
+using Microsoft.Extensions.Logging;
 using Moryx.Logging;
 
 namespace Moryx.Orders
diff --git a/src/Moryx.ProcessData/Moryx.ProcessData.csproj b/src/Moryx.ProcessData/Moryx.ProcessData.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Bundle assembly for process data and listeners</Description>
     <CreatePackage>true</CreatePackage>
diff --git a/src/Moryx.Users/Moryx.Users.csproj b/src/Moryx.Users/Moryx.Users.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Bundle assembly for Users and extensions</Description>
     <CreatePackage>true</CreatePackage>
diff --git a/src/Tests/Moryx.ControlSystem.Tests/Moryx.ControlSystem.Tests.csproj b/src/Tests/Moryx.ControlSystem.Tests/Moryx.ControlSystem.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <DebugType>full</DebugType>
   </PropertyGroup>
diff --git a/src/Tests/Moryx.ProcessData.Tests/Moryx.ProcessData.Tests.csproj b/src/Tests/Moryx.ProcessData.Tests/Moryx.ProcessData.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <DebugType>full</DebugType>
   </PropertyGroup>
diff --git a/src/Tests/Moryx.ProcessData.Tests/ProcessDataListenerTests.cs b/src/Tests/Moryx.ProcessData.Tests/ProcessDataListenerTests.cs
@@ -6,6 +6,8 @@
 using Moq.Protected;
 using Moryx.ProcessData.Listener;
 using NUnit.Framework;
+using Moryx.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Moryx.ProcessData.Tests
 {
@@ -23,7 +25,7 @@ public void Setup()
                 CallBase = true
             };
 
-            _listenerMock.Object.Logger = new DummyLogger();
+            _listenerMock.Object.Logger = new ModuleLogger("Dummy", typeof(ProcessDataListenerBase), new NullLoggerFactory());
 
             _listenerConfig = new ProcessDataListenerConfig();
             _listenerMock.Object.Initialize(_listenerConfig);
