Decermber 2023 updates

.gitignore

@@ -231,3 +231,4 @@ project.assets.json
 /BuildTools/signtool.exe
 /src/gitversion.json
 /src/178 - External Logger/DiscordLib
+/BuildTools/AzureSign/azuresign.bat

BuildTools/signMeSha.bat

@@ -1,13 +1,12 @@
 rem SPDX-FileCopyrightText: Copyright (c) 2009-2020 TRUMPF Laser GmbH, authors: C-Labs
 rem SPDX-License-Identifier: CC0-1.0
 if not exist "%~dp0\real.sign" goto noSign
-echo signing with c8f244b6856c3a16604e7c00a0dd645c15ebe05a ts: http://timestamp.digicert.com
-set "SignToolEXE=%~dp0\signtool.exe"
-if exist %SignToolEXE% goto signNow
-xcopy "%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe" "%~dp0"
-:signNow
-echo %SignToolEXE%
-%SignToolEXE% sign /sha1 c8f244b6856c3a16604e7c00a0dd645c15ebe05a /t http://timestamp.digicert.com %1
+if not exist "%CDE_CODE_SIGN%\azuresecrets.bat" goto noSecrets
+echo Setting Azure Vault secrets
+call ""%CDE_CODE_SIGN%\azuresecrets.bat"
+:noSecrets
+echo Signing with Azure Vault Key
+AzureSignTool.exe sign -du "https://c-labs.com" -fd sha1 -kvu %CDE_KVU% -kvi %CDE_KVI% -kvt %CDE_KVT% -kvs %CDE_KVS% -kvc %CDE_KVC% -tr http://timestamp.digicert.com -td sha1 %1
 goto exit
 :noSign
 echo !!!!!!! Skipped signing: No "%~dp0\real.sign" file found - expected if not an official build.

src/040 - C-MyComputer/C-DMyComputer (PC)/cmyComputerCommon.cs

@@ -30,7 +30,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             MyBaseEngine.AddCapability(eThingCaps.ComputerHealth);
             MyBaseEngine.AddCapability(eThingCaps.HardwareAccess);
             MyBaseEngine.AddCapability(eThingCaps.DoNotIsolate);
-            MyBaseEngine.SetPluginInfo("Monitors the health of all your Nodes", 0, null, "FA3:f108", "C-Labs and its licensors", "http://www.c-labs.com", new List<string>());
+            MyBaseEngine.SetPluginInfo("Monitors the health of all your Nodes", 0, null, "FA3:f108", "C-Labs and its licensors", "http://www.c-labs.com", new List<string> { "Service" });
             MyBaseEngine.AddManifestFiles(new List<string> { "System.Management.dll", "System.Diagnostics.PerformanceCounter.dll" });
         }
 

src/066 - C-MyVThings/C-DMyVThings/C-DMyVThings.csproj

@@ -14,6 +14,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <ProjectName>$(AssemblyName).$(TargetFramework)</ProjectName>
     <DefineConstants>CDE_SYSLOG;TRACE;$(DefineConstants)</DefineConstants>
+	  <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/066 - C-MyVThings/C-DMyVThings/VThingsCommon.cs

@@ -20,15 +20,13 @@ namespace CDMyVThings
 {
     public class eVThings : TheDeviceTypeEnum
     {
-        //public const string eVAlarm = "Alarm";
         public const string eVTimer = "Timer";
         public const string eVCountdown = "Countdown";
         public const string eMemoryTag = "Memory Tag";
         public const string eNMIElement = "NMI Element";
         public const string eDataGenerator = "Data Generator";
         public const string eDataVerifier = "Data Verifier";
         public const string eVStateSensor = "Virtual State Sensor";
-        //public const string eNMIControl = "NMI Control";
         public const string eSineWave = "Sine Wave";
         public const string eVirtualSensor = "Virtual Sensor";
         public const string eDataPlayback = "Data Playback";
@@ -42,7 +40,7 @@ public class eVThings : TheDeviceTypeEnum
         IconUrl = iconUrl,
         Developer = "C-Labs",
         DeveloperUrl = "http://www.c-labs.com",
-        Categories = new string[] { },
+        Categories = new string[] { "Digital-Thing" },
         IsService = true,
         EngineID = "{B9DBC881-0EA8-4FA6-98B8-2C646B6B848F}",
         AcceptsFilePush = true,

src/066 - C-MyVThings/C-DMyVThings/ViewModel/theDataPlayback.cs

@@ -24,67 +24,8 @@
 namespace CDMyVThings.ViewModel
 {
     [DeviceType(DeviceType = eVThings.eDataPlayback, Description = "Data Player reads recorded thing updates and plays them back.", Capabilities = new[] { eThingCaps.ConfigManagement })]
-    public class TheDataPlayback: ICDEThing
+    public class TheDataPlayback: TheThingBase
     {
-        #region ICDEThing Methods
-        public void SetBaseThing(TheThing pThing)
-        {
-            MyBaseThing = pThing;
-        }
-        public TheThing GetBaseThing()
-        {
-            return MyBaseThing;
-        }
-        public virtual cdeP GetProperty(string pName, bool DoCreate)
-        {
-            return MyBaseThing?.GetProperty(pName, DoCreate);
-        }
-        public virtual cdeP SetProperty(string pName, object pValue)
-        {
-            return MyBaseThing?.SetProperty(pName, pValue);
-        }
-
-        public void RegisterEvent(string pName, Action<ICDEThing, object> pCallBack)
-        {
-            MyBaseThing?.RegisterEvent(pName, pCallBack);
-        }
-        public void UnregisterEvent(string pName, Action<ICDEThing, object> pCallBack)
-        {
-            MyBaseThing?.UnregisterEvent(pName, pCallBack);
-        }
-        public void FireEvent(string pEventName, ICDEThing sender, object pPara, bool FireAsync)
-        {
-            MyBaseThing?.FireEvent(pEventName, sender, pPara, FireAsync);
-        }
-        public bool HasRegisteredEvents(string pEventName)
-        {
-            if (MyBaseThing != null)
-                return MyBaseThing.HasRegisteredEvents(pEventName);
-            return false;
-        }
-
-        public virtual void HandleMessage(ICDEThing sender, object pMsg)
-        { }
-
-
-        protected TheThing MyBaseThing;
-
-        protected bool mIsUXInitCalled;
-        protected bool mIsUXInitialized;
-        protected bool mIsInitCalled;
-        protected bool mIsInitialized;
-        public bool IsUXInit()
-        { return mIsUXInitialized; }
-        public bool IsInit()
-        { return mIsInitialized; }
-
-        /// <summary>
-        /// The possible types of WeMo devices that can be detected
-        /// </summary>
-        #endregion
-
-        private IBaseEngine MyBaseEngine;
-
         // KPIs/Status
         public bool IsActive
         {
@@ -618,7 +559,7 @@ private async Task PlaybackLoop(TheThing tThingOverride, CancellationToken cance
         long _propertyCounter;
         DateTimeOffset _lastSendTime;
 
-        public virtual bool Init()
+        public override bool Init()
         {
             if (mIsInitCalled) return false;
             mIsInitCalled = true;
@@ -669,18 +610,11 @@ public virtual bool Init()
             return true;
         }
 
-        public bool Delete()
-        {
-            mIsInitialized = false;
-            // TODO Properly implement delete
-            return true;
-        }
-
         protected TheFormInfo MyStatusForm;
         protected TheDashPanelInfo SummaryForm;
         protected TheFieldInfo CountBar;
         protected TheFieldInfo PropTable;
-        public virtual bool CreateUX()
+        public override bool CreateUX()
         {
             if (mIsUXInitCalled) return false;
             mIsUXInitCalled = true;
@@ -721,8 +655,8 @@ public virtual bool CreateUX()
 
             TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.SingleEnded, 90, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackInputFileName#Input File###", nameof(InputFileName), new nmiCtrlSingleEnded() { ParentFld = 49 });
             TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.Number, 86, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackNumberThings#Number Things###", nameof(ParallelPlaybackCount), new nmiCtrlNumber() { TileWidth = 3, ParentFld = 49 });
-            TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.SingleEnded, 110, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackEngineName#Engine Name###", nameof(PlaybackEngineName), new nmiCtrlSingleEnded() { ParentFld = 49 });
-            TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.SingleEnded, 115, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackDeviceType#Device Type###", nameof(PlaybackDeviceType), new nmiCtrlSingleEnded() { ParentFld = 49 });
+            TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.ThingPicker, 110, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackEngineName#Engine Name###", nameof(PlaybackEngineName), new nmiCtrlThingPicker() { IncludeEngines=true, Filter="DeviceType=IBaseEngine", ParentFld = 49 });
+            TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.DeviceTypePicker, 115, 2, 0x0, "###CDMyVThings.TheVThings#PlaybackDeviceType#Device Type###", nameof(PlaybackDeviceType), new nmiCtrlDeviceTypePicker() { ParentFld = 49 });
 
 
             TheNMIEngine.AddSmartControl(MyBaseThing, MyStatusForm, eFieldType.CollapsibleGroup, 120, 2, 0x0, "###CDMyVThings.TheVThings#Settings#Upload file...###", null, new nmiCtrlCollapsibleGroup() { ParentFld = 49, DoClose = true, IsSmall = true });
@@ -766,7 +700,7 @@ void sinkFileReceived(ICDEThing pThing, object pFileName)
             TheCommCore.PublishToOriginator(pMsg.Message, new TSM(eEngineName.NMIService, "NMI_TOAST", $"###Input data file ({pMsg.Message.TXT}) received!###"));
         }
 
-
+        IBaseEngine MyBaseEngine;
         public TheDataPlayback(TheThing pThing, IBaseEngine pEngine)
         {
             if (pThing != null)

src/078 - CDMyOPCUAClient/CDMyOPCUAClient/CDMyOPCUAClient.csproj

@@ -11,6 +11,7 @@
     <PackageId>CDMyOPCUAClient</PackageId>
     <Version>5.145.0</Version>
     <Authors>Markus Horstmann</Authors>
+	  <LangVersion>preview</LangVersion>
     <Company>C-Labs</Company>
     <Product>CDMyOPCUAClient for $(TargetFramework)</Product>
     <Copyright>Copyright © 2017-2022 TRUMPF Laser GmbH, authors: C-Labs</Copyright>

src/078 - CDMyOPCUAClient/CDMyOPCUAClient/cdeOPCUaClient.cs

@@ -40,9 +40,10 @@ public class eOPCDeviceTypes
                 "Opc.Ua.Client.dll",
                 "Opc.Ua.Configuration.dll"
         },
+        Categories = ["Protocol"],
         Platforms = new cdePlatform[]
         {
-            cdePlatform.X64_V3, cdePlatform.X32_V4, cdePlatform.NETSTD_V20,
+            cdePlatform.NETSTD_V20,
         }
         )]
     partial class cdeOPCUaClient : ThePluginBase

src/079 - CDMyMessages/C-DMyMessages/myMessages.cs

@@ -29,7 +29,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             base.InitEngineAssets(pBase);
             MyBaseEngine.SetFriendlyName("My Messaging Service");  
             MyBaseEngine.SetEngineID(new Guid("{7B56E698-59B5-4A11-BFE7-FDB06A912FDC}")); 
-            MyBaseEngine.SetPluginInfo("Send email and other messages to people, social media and other recipients", 0, null, "FA3:f658", "C-Labs", "http://www.c-labs.com", new List<string>());
+            MyBaseEngine.SetPluginInfo("Send email and other messages to people, social media and other recipients", 0, null, "FA3:f658", "C-Labs", "http://www.c-labs.com", new List<string> { "Service" });
             MyBaseEngine.GetEngineState().IsAllowedUnscopedProcessing = true;
         }
         #endregion

src/093 - CDMyNetwork/C-DMyNetwork/C-DMyNetwork.csproj

@@ -9,6 +9,7 @@
         <Authors>Chris Muench</Authors>
         <Company>C-Labs</Company>
         <Product>C-DMyNetwork</Product>
+	  <LangVersion>preview</LangVersion>
         <Description>Network Services</Description>
         <Copyright>Copyright © 2017-2022 TRUMPF Laser GmbH, authors: C-Labs</Copyright>
         <ProjectName>$(AssemblyName).$(TargetFramework)</ProjectName>

src/093 - CDMyNetwork/C-DMyNetwork/cdeMyNetwork.cs

@@ -27,6 +27,7 @@ public class eNetworkServiceTypes : TheDeviceTypeEnum
         LongDescription = "This service allows to monitors network services",
         IconUrl = "FA3:f6ff",
         Developer = "C-Labs",
+        Categories = ["Service"],
         DeveloperUrl = "http://www.c-labs.com"
         )]
     partial class MyNetworkServices : ThePluginBase

src/103 - CMyVisitorLog/C-DMyVisitorLog/TheVisitorService.cs

@@ -43,7 +43,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             MyBaseEngine.SetEngineService(true);                      
 
             MyBaseEngine.SetEngineID(new Guid("{AAE144FE-364F-4FA0-9E67-ABC0A3A26A53}")); 
-            MyBaseEngine.SetPluginInfo("This service allows you to track Visitors", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", null); 
+            MyBaseEngine.SetPluginInfo("This service allows you to track Visitors", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string> { "Service" }); 
 
             MyBaseEngine.SetVersion(0);
         }

src/123 - CDMyModbus/CDMyModbus/ModbusService.cs

@@ -43,7 +43,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             });
 
             MyBaseEngine.SetEngineID(new Guid("{7E749DF5-10CD-4671-AB58-05EF078C9125}")); 
-            MyBaseEngine.SetPluginInfo("This service allows you to connect to devices via Modbus", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { }); 
+            MyBaseEngine.SetPluginInfo("This service allows you to connect to devices via Modbus", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { "Protocol" }); 
         }
 
         public override bool Init()

src/149 - CDMyRulesEngine/CDMyRulesEngine/cdeTheRulesEngine.cs

@@ -26,7 +26,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             base.InitEngineAssets(pBase);
             MyBaseEngine.SetFriendlyName("The Rules Engine");
             MyBaseEngine.AddCapability(eThingCaps.RulesEngine);
-            MyBaseEngine.SetPluginInfo("The C-Labs Rules engine", 0, null, "toplogo-150.png", "C-Labs", "https://www.c-labs.com", null);
+            MyBaseEngine.SetPluginInfo("The C-Labs Rules engine", 0, null, "toplogo-150.png", "C-Labs", "https://www.c-labs.com", new List<string> { "Service" });
             MyBaseEngine.SetEngineID(new Guid("{843B73BA-028F-4BDF-A102-D1E545204036}"));
         }
 

src/150 - CDMyMSSQL/CDMyMSSQL/TheStorageCommon.cs

@@ -30,7 +30,7 @@ public override void InitEngineAssets(IBaseEngine pEngine)
             MyBaseEngine.AddCapability(eThingCaps.DistributedStorage);
             MyBaseEngine.AddCapability(eThingCaps.MustBePresent);
             MyBaseEngine.GetEngineState().IsAllowedUnscopedProcessing = true;
-            MyBaseEngine.SetPluginInfo("Distributed Storage Service for MS-SQL", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { "IStorageService" });
+            MyBaseEngine.SetPluginInfo("Distributed Storage Service for MS-SQL", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { "IStorageService", "Service" });
             MyBaseEngine.AddManifestFiles(new List<string> { "System.Data.SqlClient.dll" });
         }
         #endregion

src/151 - CDMyWebRelay/CDMyWebRelay/cde_WebRelayCommon.cs

@@ -35,6 +35,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             MyBaseEngine.SetEngineID(new Guid("{A5FD8A57-C4B9-4EDB-8965-082D3F466E33}"));
             MyBaseEngine.SetFriendlyName("The Web Relay Service");
             MyBaseEngine.GetEngineState().IsAllowedUnscopedProcessing = TheBaseAssets.MyServiceHostInfo.IsCloudService;
+            MyBaseEngine.SetPluginInfo("This service allows you relay web pages", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string> { "Service" });
         }
         #endregion
 

src/160 - CDMyImages/CDMyImages/TheImageService.cs

@@ -26,7 +26,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             MyBaseEngine.SetFriendlyName("Image Service");
             MyBaseEngine.GetEngineState().IsAcceptingFilePush = true;
             MyBaseEngine.SetEngineID(new Guid("{795370F8-EF3A-4F1F-BBE0-F16053329B90}"));
-            MyBaseEngine.SetPluginInfo("This service allows you to manage images", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { });
+            MyBaseEngine.SetPluginInfo("This service allows you to manage images", 0, null, "toplogo-150.png", "C-Labs", "http://www.c-labs.com", new List<string>() { "Digital-Thing" });
         }
 
         public override bool Init()

src/175 - ThingProvisioning/CDMyThingProvisioning/cdeThingProvisioning.cs

@@ -58,7 +58,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
                                        "toplogo-150.png",       // pIcon - custom icon.
                                        "C-Labs",                // pDeveloper - name of the plugin developer.
                                        "http://www.c-labs.com", // pDeveloperUrl - URL to developer home page.
-                                       new List<string>() { }); // pCategories - Search categories for service.
+                                       new List<string>() { "Service" }); // pCategories - Search categories for service.
         }
 
         TheStorageMirror<ScriptSnapshot> MyScriptTableStorage;

src/178 - External Logger/CDMyLogger/TheLoggerService.cs

@@ -57,7 +57,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
                                        "toplogo-150.png",       // pIcon - custom icon.
                                        "C-Labs",                // pDeveloper - name of the plugin developer.
                                        "http://www.c-labs.com", // pDeveloperUrl - URL to developer home page.
-                                       new List<string>() { }); // pCategories - Search categories for service.
+                                       new List<string>() { "Service" }); // pCategories - Search categories for service.
             MyBaseEngine.AddManifestFiles(new List<string> { "Discord.Net.Core.dll", "Discord.Net.Rest.dll", "Discord.Net.Webhook.dll", "Newtonsoft.Json.dll" });
             MyBaseEngine.AddCapability(eThingCaps.LoggerEngine);
             MyBaseEngine.AddCapability(eThingCaps.ConfigManagement);

src/179 - Mesh Sender/CDMyMeshSender/CDMyMeshSender.csproj

@@ -10,6 +10,7 @@
     <RootNamespace>CDMyMeshSender</RootNamespace>
     <PackageId>CDMyMeshSender</PackageId>
     <Version>5.145.0</Version>
+	  <LangVersion>preview</LangVersion>
     <Authors>Markus Horstmann</Authors>
     <Company>C-Labs</Company>
     <Product>CDMyMeshSender</Product>

src/179 - Mesh Sender/CDMyMeshSender/TheMeshSenderService.cs

@@ -59,8 +59,9 @@ public static string GetValues()
         DeveloperUrl = "http://www.c-labs.com",
         CDEMinVersion = 4.2050,
         ManifestFiles = new string[] { },
+        Categories = ["Service"],
         Platforms = new[] {
-            cdePlatform.X64_V3, cdePlatform.X32_V4, cdePlatform.NETSTD_V20
+            cdePlatform.NETSTD_V20
         })
     ]
     class MeshSenderService : ThePluginBase

src/180 - Mesh Receiver/CDMyMeshReceiver/TheMeshReceiverService.cs

@@ -57,7 +57,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             MyBaseEngine.SetEngineService(true);                            //Keep True if this class is a service
 
             MyBaseEngine.SetEngineID(new Guid("{BF99690D-6114-427F-B17A-A606BE3145BD}")); //TODO: Step 2 - set Plugin GUID
-            MyBaseEngine.SetPluginInfo("This service allows to receive data from a CDEngine mesh and place them into CDEngine Things.", 0, null, "", "C-Labs and its licensors", "http://www.c-labs.com", new List<string>() { });
+            MyBaseEngine.SetPluginInfo("This service allows to receive data from a CDEngine mesh and place them into CDEngine Things.", 0, null, "", "C-Labs and its licensors", "http://www.c-labs.com", new List<string>() { "Service" });
 
             MyBaseEngine.SetCDEMinVersion(4.011);
             MyBaseEngine.AddManifestFiles(new List<string>

src/182 - MQTT Sender/CDMyMqttSender/CDMyMqttSender.csproj

@@ -10,6 +10,7 @@
     <RootNamespace>CDMyMqttSender</RootNamespace>
     <PackageId>CDMyMqttSender</PackageId>
     <Version>5.100.0</Version>
+	  <LangVersion>preview</LangVersion>
     <Authors>Markus Horstmann</Authors>
     <Company>C-Labs</Company>
     <Product>CDMyMqttSender for $(TargetFramework)</Product>

src/182 - MQTT Sender/CDMyMqttSender/TheMqttSenderService.cs

@@ -46,7 +46,8 @@ public static string GetValues()
         ManifestFiles = new [] {
                 // MQTT Receiver
                 "GnatMQ.dll",
-            }
+            },
+        Categories = ["Protocol"]
         )
     ]
     class MqttSenderService : ThePluginBase

src/188 - PrometheusExporter/CDMyPrometheusExporter/ThePrometheusService.cs

@@ -49,7 +49,7 @@ public override void InitEngineAssets(IBaseEngine pBase)
             base.InitEngineAssets(pBase);
             MyBaseEngine.SetFriendlyName("Prometheus Exporter");      
             MyBaseEngine.SetEngineID(new Guid("{AF65D637-191B-40BA-8302-BDD254E11DFE}"));
-            MyBaseEngine.SetPluginInfo("This service allows to export Thing properties as metrics to Prometheus.", 0, null, "images/prometheus_logo_grey.png", "C-Labs and its licensors", "http://www.c-labs.com", new List<string>() { });
+            MyBaseEngine.SetPluginInfo("This service allows to export Thing properties as metrics to Prometheus.", 0, null, "images/prometheus_logo_grey.png", "C-Labs and its licensors", "http://www.c-labs.com", new List<string>() { "Service" });
             MyBaseEngine.AddManifestFiles(new List<string> {
                 "Prometheus.NetStandard.dll", /*"ClientBin\\Scripts\\CreatePrometheusExporter.cdescript"*/
             });