build: Migrated DTO objects to a TwinGet.AutomationInterface.Dto pr…

…oject Updated all projects to .NET 8 for consistency.
ahuca · Dec 17, 2023 · 308e53d · 308e53d
1 parent 0d2aa66
commit 308e53d
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 17 deletions.
diff --git a/TwinGet.sln b/TwinGet.sln
@@ -15,9 +15,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BDB6B966-4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwinGet.AutomationInterface.Test", "test\TwinGet.AutomationInterface.Test\TwinGet.AutomationInterface.Test.csproj", "{0A952D6F-9D6D-45B0-8535-E10ED8029B6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwinGet.Utils", "src\TwinGet.Utils\TwinGet.Utils.csproj", "{C29610F6-4B71-49AD-B57F-784467C1CF1F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwinGet.Utils", "src\TwinGet.Utils\TwinGet.Utils.csproj", "{C29610F6-4B71-49AD-B57F-784467C1CF1F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwinGet.Utils.Test", "test\TwinGet.Utils.Test\TwinGet.Utils.Test.csproj", "{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwinGet.Utils.Test", "test\TwinGet.Utils.Test\TwinGet.Utils.Test.csproj", "{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwinGet.AutomationInterface.Dto", "src\TwinGet.AutomationInterface.Dto\TwinGet.AutomationInterface.Dto\TwinGet.AutomationInterface.Dto.csproj", "{563081EB-AA78-4C47-8826-1DB5F1D724DE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,6 +51,10 @@ Global
 		{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{563081EB-AA78-4C47-8826-1DB5F1D724DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{563081EB-AA78-4C47-8826-1DB5F1D724DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{563081EB-AA78-4C47-8826-1DB5F1D724DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{563081EB-AA78-4C47-8826-1DB5F1D724DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -60,6 +66,7 @@ Global
 		{0A952D6F-9D6D-45B0-8535-E10ED8029B6B} = {BDB6B966-4B82-4F51-9487-91CD520BC5AE}
 		{C29610F6-4B71-49AD-B57F-784467C1CF1F} = {46CA5D70-7812-4809-8B40-31392DE18AA1}
 		{1D55596F-6184-4DA6-9DFE-BDB9B358EA4B} = {BDB6B966-4B82-4F51-9487-91CD520BC5AE}
+		{563081EB-AA78-4C47-8826-1DB5F1D724DE} = {46CA5D70-7812-4809-8B40-31392DE18AA1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42610935-EABE-41BA-A9A9-57FB7A657F65}

diff --git a/...ileDeserialization/ITwincatProjectData.cs → ...ationInterface.Dto/ITwincatProjectData.cs b/...ileDeserialization/ITwincatProjectData.cs → ...ationInterface.Dto/ITwincatProjectData.cs
@@ -1,6 +1,6 @@
 // This file is licensed to you under MIT license.
 
-namespace TwinGet.AutomationInterface.ProjectFileDeserialization
+namespace TwinGet.AutomationInterface.Dto
 {
     /// <summary>
     /// Every xml-serializeable object that models a TwinCAT project file should implement this interface.

diff --git a/...jectFileDeserialization/PlcProjectData.cs → ...AutomationInterface.Dto/PlcProjectData.cs b/...jectFileDeserialization/PlcProjectData.cs → ...AutomationInterface.Dto/PlcProjectData.cs
@@ -3,7 +3,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace TwinGet.AutomationInterface.ProjectFileDeserialization
+namespace TwinGet.AutomationInterface.Dto
 {
     [XmlRoot("Project", Namespace = "http://schemas.microsoft.com/developer/msbuild/2003")]
     public class PlcProjectData : ITwincatProjectData

diff --git a/src/TwinGet.AutomationInterface.Dto/TwinGet.AutomationInterface.Dto/README.md b/src/TwinGet.AutomationInterface.Dto/TwinGet.AutomationInterface.Dto/README.md
@@ -0,0 +1,3 @@
+# TwinGet.AutomationInterface.Dto
+
+A project containing of only data transfer objects (DTOs).
diff --git a/...ectFileDeserialization/TcSmProjectData.cs → ...utomationInterface.Dto/TcSmProjectData.cs b/...ectFileDeserialization/TcSmProjectData.cs → ...utomationInterface.Dto/TcSmProjectData.cs
@@ -3,7 +3,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace TwinGet.AutomationInterface.ProjectFileDeserialization
+namespace TwinGet.AutomationInterface.Dto
 {
     [XmlRoot("TcSmProject")]
     public class TcSmProjectData : ITwincatProjectData

diff --git a/...ationInterface.Dto/TwinGet.AutomationInterface.Dto/TwinGet.AutomationInterface.Dto.csproj b/...ationInterface.Dto/TwinGet.AutomationInterface.Dto/TwinGet.AutomationInterface.Dto.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamesapce>TwinGet.AutomationInterface.Dto</RootNamesapce>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <NoWarn>CS8618</NoWarn>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/TwinGet.AutomationInterface/PlcProject.cs b/src/TwinGet.AutomationInterface/PlcProject.cs
@@ -1,8 +1,8 @@
 // This file is licensed to you under MIT license.
 
 using TCatSysManagerLib;
+using TwinGet.AutomationInterface.Dto;
 using TwinGet.AutomationInterface.Exceptions;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
 using TwinGet.AutomationInterface.Utils;
 
 namespace TwinGet.AutomationInterface

diff --git a/src/TwinGet.AutomationInterface/TwinGet.AutomationInterface.csproj b/src/TwinGet.AutomationInterface/TwinGet.AutomationInterface.csproj
@@ -30,6 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\TwinGet.AutomationInterface.Dto\TwinGet.AutomationInterface.Dto\TwinGet.AutomationInterface.Dto.csproj" />
     <ProjectReference Include="..\TwinGet.Utils\TwinGet.Utils.csproj" />
   </ItemGroup>
 

diff --git a/src/TwinGet.AutomationInterface/TwincatProject.cs b/src/TwinGet.AutomationInterface/TwincatProject.cs
@@ -1,8 +1,8 @@
 // This file is licensed to you under MIT license.
 
 using EnvDTE;
+using TwinGet.AutomationInterface.Dto;
 using TwinGet.AutomationInterface.Exceptions;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
 using TwinGet.AutomationInterface.Utils;
 using ITcSysManagerAlias = TCatSysManagerLib.ITcSysManager15;
 

diff --git a/src/TwinGet.AutomationInterface/Utils/TwincatUtils.cs b/src/TwinGet.AutomationInterface/Utils/TwincatUtils.cs
@@ -2,15 +2,15 @@
 
 using Microsoft.Build.Construction;
 using TCatSysManagerLib;
+using TwinGet.AutomationInterface.Dto;
 using TwinGet.AutomationInterface.Exceptions;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
 using ITcSmTreeItemAlias = TCatSysManagerLib.ITcSmTreeItem9;
 using ITcSysManagerAlias = TCatSysManagerLib.ITcSysManager15;
-using TwingetProjectElement = TwinGet.AutomationInterface.ProjectFileDeserialization.ProjectElement;
+using TwingetProjectElement = TwinGet.AutomationInterface.Dto.ProjectElement;
 
 namespace TwinGet.AutomationInterface.Utils
 {
-    internal static class TwincatUtils
+    public static class TwincatUtils
     {
         public static ITcPlcIECProject3? LookUpPlcProject(this ITcSysManagerAlias systemManager, string name)
         {

diff --git a/src/TwinGet.Core/TwinGet.Core.csproj b/src/TwinGet.Core/TwinGet.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamesapce>TwinGet.Core</RootNamesapce>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

diff --git a/src/TwinGet.Utils/TwinGet.Utils.csproj b/src/TwinGet.Utils/TwinGet.Utils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/test/TwinGet.AutomationInterface.Test/ProjectFileDeserialization/PlcProjectDataTests.cs b/test/TwinGet.AutomationInterface.Test/ProjectFileDeserialization/PlcProjectDataTests.cs
@@ -1,7 +1,7 @@
 // This file is licensed to you under MIT license.
 
 using System.Xml.Serialization;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
+using TwinGet.AutomationInterface.Dto;
 
 namespace TwinGet.AutomationInterface.Test.ProjectFileDeserialization
 {

diff --git a/test/TwinGet.AutomationInterface.Test/ProjectFileDeserialization/TcSmProjectDataTests.cs b/test/TwinGet.AutomationInterface.Test/ProjectFileDeserialization/TcSmProjectDataTests.cs
@@ -1,7 +1,7 @@
 // This file is licensed to you under MIT license.
 
 using System.Xml.Serialization;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
+using TwinGet.AutomationInterface.Dto;
 
 namespace TwinGet.AutomationInterface.Test.ProjectFileDeserialization
 {

diff --git a/test/TwinGet.AutomationInterface.Test/TestUtils/TestPlcProject.cs b/test/TwinGet.AutomationInterface.Test/TestUtils/TestPlcProject.cs
@@ -1,8 +1,8 @@
 // This file is licensed to you under MIT license.
 
 using System.Xml.Serialization;
+using TwinGet.AutomationInterface.Dto;
 using TwinGet.AutomationInterface.Exceptions;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
 
 namespace TwinGet.AutomationInterface.Test.TestUtils
 {

diff --git a/test/TwinGet.AutomationInterface.Test/TestUtils/TestTwincatProject.cs b/test/TwinGet.AutomationInterface.Test/TestUtils/TestTwincatProject.cs
@@ -1,8 +1,8 @@
 // This file is licensed to you under MIT license.
 
 using System.Xml.Serialization;
+using TwinGet.AutomationInterface.Dto;
 using TwinGet.AutomationInterface.Exceptions;
-using TwinGet.AutomationInterface.ProjectFileDeserialization;
 
 namespace TwinGet.AutomationInterface.Test.TestUtils
 {

diff --git a/test/TwinGet.Utils.Test/TwinGet.Utils.Test.csproj b/test/TwinGet.Utils.Test/TwinGet.Utils.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>