Merge chore/sysml-import-template-compliance (PR TrakHound#224) into integration/up-to-pr-224 on top of integration/up-to-pr-223

# Conflicts:
#	MTConnect.NET.sln
#	build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs
#	build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumStringDescriptions.scriban
#	build/MTConnect.NET-SysML-Import/Xml/Templates/XmlCuttingToolLifeCycle.scriban
#	libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.g.cs

Author: ottobolyos

MTConnect.NET.sln

@@ -74,6 +74,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-XML-Tests", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-SysML-Import", "build\MTConnect.NET-SysML-Import\MTConnect.NET-SysML-Import.csproj", "{C5F7C26D-F394-42F6-852B-C6981A99AA0F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-SysML-Import-Tests", "tests\MTConnect.NET-SysML-Import-Tests\MTConnect.NET-SysML-Import-Tests.csproj", "{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-AgentProcessor-Python", "agent\Processors\MTConnect.NET-AgentProcessor-Python\MTConnect.NET-AgentProcessor-Python.csproj", "{F6FDE58F-6520-4BFB-9587-A7FF66628AD8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-AgentModule-MqttRelay", "agent\Modules\MTConnect.NET-AgentModule-MqttRelay\MTConnect.NET-AgentModule-MqttRelay.csproj", "{CB2E7F5A-55D5-43BD-ABC8-145E8436BE88}"
@@ -297,6 +299,14 @@ Global
 		{8AD3DE52-3EC4-49BC-B512-9976477C1E63}.Package|Any CPU.Build.0 = Debug|Any CPU
 		{8AD3DE52-3EC4-49BC-B512-9976477C1E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AD3DE52-3EC4-49BC-B512-9976477C1E63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Docker|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Docker|Any CPU.Build.0 = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Package|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Package|Any CPU.Build.0 = Debug|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5F7C26D-F394-42F6-852B-C6981A99AA0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5F7C26D-F394-42F6-852B-C6981A99AA0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5F7C26D-F394-42F6-852B-C6981A99AA0F}.Docker|Any CPU.ActiveCfg = Debug|Any CPU
@@ -587,6 +597,7 @@ Global
 		{AE09D1CA-5572-40BF-B984-74230E8634E1} = {14375E03-6BF8-45E6-B868-D2399368992B}
 		{3E89B860-A428-470C-8E48-0DDABC4027F0} = {14375E03-6BF8-45E6-B868-D2399368992B}
 		{8B61CE3B-DC8A-47CE-A34B-38BC57DFFD57} = {14375E03-6BF8-45E6-B868-D2399368992B}
+		{9B5A2D9F-1E4C-4F8B-A7D2-3E6C8B4F2A9D} = {14375E03-6BF8-45E6-B868-D2399368992B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CC13D3AD-18BF-4695-AB2A-087EF0885B20}

build/MTConnect.NET-SysML-Import/CSharp/TemplateRenderer.cs

@@ -300,11 +300,10 @@ public static void Render(MTConnectModel mtconnectModel, string outputPath)
                         //
                         // The full import-side classModels list is passed too so the
                         // walk can find parents that are present in the SysML graph but
-                        // never reach `templates` (e.g. `Assets.CuttingTools.Measurement`,
-                        // an abstract base whose .g.cs is hand-maintained / frozen and
-                        // therefore not re-emitted by any current renderer flow). The
-                        // child ToolingMeasurement still extends it at C# compile time,
-                        // so its `Code` property hides Measurement.Code and needs `new`.
+                        // never reach `templates` (e.g. abstract bases whose .g.cs is
+                        // hand-maintained / frozen and therefore not re-emitted by any
+                        // current renderer flow) — the child class still extends them at
+                        // C# compile time, so any name collision needs the `new` marker.
                         MarkInheritedProperties(templates, classModels);
 
                         // Mark each ClassModel's ParentHasRules flag so Model.scriban
@@ -500,7 +499,7 @@ private static void WriteDescriptions(ITemplateModel template, string outputPath
         ///     <see cref="MTConnectClassModel.ParentName"/> through every
         ///     ClassModel the renderer has assembled. This catches the
         ///     overwhelming majority of cases (Asset.SerialNumber ⇒
-        ///     CuttingToolAsset, Measurement.Code ⇒ ToolingMeasurement, etc.).
+        ///     CuttingToolAsset, Component.Uuid ⇒ Device, etc.).
         ///   </item>
         ///   <item>
         ///     Hand-stitched seeds for inheritance links the SysML model does
@@ -652,19 +651,25 @@ private static void MarkInheritedProperties(
                         break;
 
                     case "Assets.CuttingTools.ToolingMeasurement":
-                        // No hand-stitched inheritance seed needed. The
-                        // Assets.CuttingTools.Measurement base IS produced
-                        // by the current renderer flow (via
-                        // MTConnectAssetInformationModel.ParseAssetInformationModel's
-                        // sharedMeasurement injection which imports the
-                        // Pallet Measurement class under Assets.CuttingTools),
-                        // so the export-side ClassModel graph already carries
-                        // its property list. The Pallet Measurement lacks
-                        // Code, and the interface IMeasurement.g.cs likewise
-                        // has Code commented out — hence emitting `new` on
-                        // ToolingMeasurement.Code would raise CS0109 on both
-                        // the class and interface sides. Fall through to the
-                        // default inheritance walk with no override.
+                        // ToolingMeasurement extends `Measurement` (the
+                        // CuttingTools abstract Measurement base, NOT
+                        // Assets.Pallet.Measurement). The SysML v2.7 XMI
+                        // relocates `Code` onto ToolingMeasurement — the
+                        // parent Measurement (both class and interface)
+                        // no longer declares Code, so ToolingMeasurement's
+                        // `Code` is a fresh introduction that hides
+                        // nothing. Emitting `new` here would raise CS0109
+                        // on both the class and the interface. No hand-
+                        // stitched inheritance seed is needed for this
+                        // template — leave the case block as a marker so
+                        // the intentional emptiness is documented. The
+                        // Assets.CuttingTools.Measurement base is emitted
+                        // by the current renderer flow via the
+                        // sharedMeasurement injection in
+                        // MTConnectAssetInformationModel, so the export-
+                        // side ClassModel graph carries its property list
+                        // and the default inheritance walk resolves
+                        // correctly.
                         break;
                 }
 

build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban

@@ -52,4 +52,4 @@ namespace MTConnect.Assets.CuttingTools.Measurements
             {{ if (units_enum) }}Units = {{units_enum}};{{ end }}
         }
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.CompositionType.scriban

@@ -53,4 +53,4 @@ namespace MTConnect.Devices.Compositions
         /// </summary>
         public {{name}}() { Type = TypeId; }
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.DataItemType.scriban

@@ -270,4 +270,4 @@ namespace MTConnect.Devices.DataItems
         }
 {{- end }}
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/Devices.Device.scriban

@@ -764,4 +764,4 @@ namespace MTConnect.Devices
             return null;
         }
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/Enum.scriban

@@ -17,4 +17,4 @@ namespace {{namespace}}
         {{ end }}
 {{- end }}
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumOrStringDescriptions.scriban

@@ -41,4 +41,4 @@ namespace {{namespace}}
         }
 {{- end }}
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/EnumString.scriban

@@ -17,4 +17,4 @@ namespace {{namespace}}
         {{ end }}
 {{- end }}
     }
-}
+}

build/MTConnect.NET-SysML-Import/CSharp/Templates/Interface.scriban

@@ -21,4 +21,4 @@ namespace {{namespace}}
         {{ end }}{{ end }}
 {{- end }}
     }
-}
+}