Merge branch 'MTConnect-v2.4'

Author: PatrickRitchie

README.md

@@ -4,7 +4,7 @@
 
 [![MTConnect.NET](https://github.com/TrakHound/MTConnect.NET/actions/workflows/dotnet.yml/badge.svg)](https://github.com/TrakHound/MTConnect.NET/actions/workflows/dotnet.yml)
 
-> **New Release 5/13/2024** : Version 6.4 Released with new Agent, Adapter, & SysML Import
+> **New Release 10/21/2024** : Version 6.5 Released with support for MTConnect v2.4
 
 ## Download
 <table>
@@ -39,7 +39,7 @@
 </table>
 
 ## Overview
-MTConnect.NET is a fully featured and fully Open Source **[.NET](https://dotnet.microsoft.com/)** library for **[MTConnect](https://www.mtconnect.org/)** to develop Agents, Adapters, and Clients. Supports MTConnect Versions up to 2.3. A pre-compiled Agent application is available to download as well as an Adapter application that can be easily customized.
+MTConnect.NET is a fully featured and fully Open Source **[.NET](https://dotnet.microsoft.com/)** library for **[MTConnect](https://www.mtconnect.org/)** to develop Agents, Adapters, and Clients. Supports MTConnect Versions up to 2.4. A pre-compiled Agent application is available to download as well as an Adapter application that can be easily customized.
 
 - .NET Native MTConnect Agent
 - Adapter framework used to send data to an MTConnect Agent
@@ -49,7 +49,7 @@ MTConnect.NET is a fully featured and fully Open Source **[.NET](https://dotnet.
 - Module based Agent & Adapter architecture
     - Supports running as Windows Service with easy to use command line arguments
     - Presistent Agent Buffers that are backed up on the File System. Retains state after Agent is restarted
-- Fully compatible up to the latest MTConnect v2.3
+- Fully compatible up to the latest MTConnect v2.4
     - Kept up to date by utilizing the MTConnect SysML Model to generate source files
     - Supports multiple MTConnect Version output. Automatically removes data that is not compatible with the requested version
 - Full client support for requesting data from any MTConnect Agent (Probe, Current, Sample Stream, Assets, etc.).

agent/MTConnect.NET-Agent/README.md

@@ -28,7 +28,7 @@
 </table>
 
 ## Overview
-This project is a full implementation of an MTConnect Agent used to read data from industrial machine tools and devices. This MTConnect Agent application is fully compatible with the latest **Version 2.3 of the MTConnect Standard**.
+This project is a full implementation of an MTConnect Agent used to read data from industrial machine tools and devices. This MTConnect Agent application is fully compatible with the latest **Version 2.4 of the MTConnect Standard**.
 
 #### Features
 - Plugin architecture to support Http Server, Mqtt Server, SHDR Adapters, etc.

build/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.4.7")]
-[assembly: AssemblyFileVersion("6.4.7")]
+[assembly: AssemblyVersion("6.5.0")]
+[assembly: AssemblyFileVersion("6.5.0")]
 [assembly: AssemblyCompany("TrakHound Inc.")]
 [assembly: AssemblyCopyright("Copyright (c) 2024 TrakHound Inc., All Rights Reserved.")]

build/MTConnect.NET-SysML-Import/Program.cs

@@ -5,7 +5,7 @@
 using System.Text.Json;
 
 //var xmlPath = @"D:\TrakHound\MTConnect\MTConnectSysMLModel.xml";
-var xmlPath = @"D:\TrakHound\MTConnect\Standard\v2.3\MTConnectSysMLModel.xml";
+var xmlPath = @"D:\TrakHound\MTConnect\Standard\v2.4\MTConnectSysMLModel.xml";
 
 var mtconnectModel = MTConnectModel.Parse(xmlPath);
 

libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameter.g.cs

@@ -4,7 +4,7 @@
 namespace MTConnect.Assets.ComponentConfigurationParameters
 {
     /// <summary>
-    /// Property defining a configuration of a Component.
+    /// Property that determines the characteristic or behavior of an entity.
     /// </summary>
     public interface IParameter
     {

libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/IParameterSet.g.cs

@@ -14,7 +14,7 @@ public interface IParameterSet
         string Name { get; }
 
         /// <summary>
-        /// Property defining a configuration of a Component.
+        /// Property that determines the characteristic or behavior of an entity.
         /// </summary>
         System.Collections.Generic.IEnumerable<MTConnect.Assets.ComponentConfigurationParameters.IParameter> Parameters { get; }
     }

libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/Parameter.g.cs

@@ -6,11 +6,11 @@
 namespace MTConnect.Assets.ComponentConfigurationParameters
 {
     /// <summary>
-    /// Property defining a configuration of a Component.
+    /// Property that determines the characteristic or behavior of an entity.
     /// </summary>
     public class Parameter : IParameter
     {
-        public const string DescriptionText = "Property defining a configuration of a Component.";
+        public const string DescriptionText = "Property that determines the characteristic or behavior of an entity.";
 
 
         /// <summary>

libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSet.g.cs

@@ -19,7 +19,7 @@ public class ParameterSet : IParameterSet
         public string Name { get; set; }
 
         /// <summary>
-        /// Property defining a configuration of a Component.
+        /// Property that determines the characteristic or behavior of an entity.
         /// </summary>
         public System.Collections.Generic.IEnumerable<MTConnect.Assets.ComponentConfigurationParameters.IParameter> Parameters { get; set; }
     }

libraries/MTConnect.NET-Common/Assets/ComponentConfigurationParameters/ParameterSetDescriptions.g.cs

@@ -11,8 +11,8 @@ public static class ParameterSetDescriptions
         public const string Name = "Name of the parameter set if more than one exists.";
 
         /// <summary>
-        /// Property defining a configuration of a Component.
+        /// Property that determines the characteristic or behavior of an entity.
         /// </summary>
-        public const string Parameters = "Property defining a configuration of a Component.";
+        public const string Parameters = "Property that determines the characteristic or behavior of an entity.";
     }
 }

libraries/MTConnect.NET-Common/Devices/Components/TankComponent.g.cs

@@ -6,13 +6,13 @@
 namespace MTConnect.Devices.Components
 {
     /// <summary>
-    /// Leaf Component composed of a receptacle or container that holds material.
+    /// Leaf Component generally composed of an enclosed container.
     /// </summary>
     public class TankComponent : Component
     {
         public const string TypeId = "Tank";
         public const string NameId = "tank";
-        public new const string DescriptionText = "Leaf Component composed of a receptacle or container that holds material.";
+        public new const string DescriptionText = "Leaf Component generally composed of an enclosed container.";
 
         public override string TypeDescription => DescriptionText;