Updated to cleanup dmapp versions

Author: janstaelensskyline

Sdk/Sdk.csproj

@@ -40,6 +40,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
     <PackageReference Include="Skyline.DataMiner.CICD.Common" Version="1.0.5-alpha" />
+    <PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.11" />
     <PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.0.13-foxtrot" />
     <PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.0.16-alpha" />
     <PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.0.0-alpha4" />

Sdk/Tasks/DmappCreation.cs

@@ -5,13 +5,17 @@ namespace Skyline.DataMiner.Sdk.Tasks
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
+    using System.Security.Cryptography;
+    using System.Text;
+    using System.Text.RegularExpressions;
 
     using Microsoft.Build.Framework;
 
     using Nito.AsyncEx.Synchronous;
 
     using Skyline.AppInstaller;
     using Skyline.DataMiner.CICD.Common;
+    using Skyline.DataMiner.CICD.DMApp.Common;
     using Skyline.DataMiner.CICD.FileSystem;
     using Skyline.DataMiner.CICD.Parsers.Common.VisualStudio.Projects;
     using Skyline.DataMiner.Sdk.Helpers;
@@ -274,7 +278,7 @@ private bool TryCreateAppPackageBuilder(PackageCreationData preparedData, DataMi
             if (dataMinerProjectType != DataMinerProjectType.Package)
             {
                 // Use default install script
-                appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, PackageVersion, preparedData.MinimumRequiredDmVersion);
+                appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, CleanDmappVersion(PackageVersion), preparedData.MinimumRequiredDmVersion);
                 return true;
             }
 
@@ -286,10 +290,33 @@ private bool TryCreateAppPackageBuilder(PackageCreationData preparedData, DataMi
                 return false;
             }
 
-            appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, PackageVersion, preparedData.MinimumRequiredDmVersion, packageResult.Script);
+            appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, CleanDmappVersion(PackageVersion), preparedData.MinimumRequiredDmVersion, packageResult.Script);
             return true;
         }
 
+        public static string CleanDmappVersion(string version)
+        {
+            // Check if version matches a.b.c
+            if (Regex.IsMatch(version, @"^\d+\.\d+\.\d+$"))
+            {
+                return version;
+            }
+
+            // Check if version matches a.b.c.d
+            if (Regex.IsMatch(version, @"^\d+\.\d+\.\d+\.\d+$"))
+            {
+                return DMAppVersion.FromProtocolVersion(version).ToString();
+            }
+
+            // Check if version matches a.b.c-text
+            if (Regex.IsMatch(version, @"^\d+\.\d+\.\d+-\w+$"))
+            {
+                return DMAppVersion.FromPreRelease(version).ToString();
+            }
+
+            throw new ArgumentException("Invalid version format.");
+        }
+
         /// <summary>
         /// Cancel the ongoing task.
         /// </summary>