Fix exception & support custom dlls in scripts

Author: MichielOda

Sdk/Sdk.csproj

@@ -38,7 +38,7 @@
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" PrivateAssets="all" />
     <PackageReference Include="Skyline.DataMiner.CICD.Common" Version="1.0.5-alpha" PrivateAssets="all" />
     <PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.0.13-foxtrot" PrivateAssets="all" />
-    <PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.0.15" PrivateAssets="all" />
+    <PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.0.16-alpha" PrivateAssets="all" />
     <PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="1.0.4" PrivateAssets="all" />
   </ItemGroup>
 

Sdk/Sdk/Sdk.targets

@@ -11,6 +11,7 @@
             ProjectFile="$(MSBuildProjectFile)"
             ProjectType="$(DataMinerType)"
             BaseOutputPath="$(BaseOutputPath)"
+            Configuraiton="$(Configuration)"
             Version="$(Version)"
             MinimumSupportedDmVersion="$(MinimumSupportedDmVersion)"
             />

Sdk/SubTasks/AutomationScriptStyle.cs

@@ -62,11 +62,9 @@ public static async Task<PackageResult> TryCreatePackage(PackageCreationData dat
                 {
                     appPackageAutomationScriptBuilder = new AppPackageAutomationScript.AppPackageAutomationScriptBuilder(script.Name, data.Version, ConvertToBytes(buildResultItems.Document));
                 }
-                    
-                foreach (PackageAssemblyReference packageAssemblyReference in buildResultItems.Assemblies)
-                {
-                    appPackageAutomationScriptBuilder.WithAssembly(packageAssemblyReference.AssemblyPath, packageAssemblyReference.AssemblyPath);
-                }
+
+                AddNuGetAssemblies(buildResultItems, appPackageAutomationScriptBuilder);
+                AddDllAssemblies(buildResultItems, appPackageAutomationScriptBuilder);
 
                 result.Script = appPackageAutomationScriptBuilder.Build();
                 result.IsSuccess = true;
@@ -80,6 +78,44 @@ public static async Task<PackageResult> TryCreatePackage(PackageCreationData dat
             return result;
         }
 
+        private static void AddDllAssemblies(BuildResultItems buildResultItems, AppPackageAutomationScript.AppPackageAutomationScriptBuilder appPackageAutomationScriptBuilder)
+        {
+            foreach (DllAssemblyReference assemblyReference in buildResultItems.DllAssemblies)
+            {
+                if (assemblyReference.AssemblyPath == null)
+                {
+                    continue;
+                }
+
+                string folder = @"C:\Skyline DataMiner\ProtocolScripts";
+                if (assemblyReference.IsFilesPackage)
+                {
+                    folder = @"C:\Skyline DataMiner\Files";
+                }
+
+                var destinationFolderPath = FileSystem.Instance.Path.Combine(folder, assemblyReference.DllImport);
+                var destinationDirectory = FileSystem.Instance.Path.GetDirectoryName(destinationFolderPath);
+
+                appPackageAutomationScriptBuilder.WithAssembly(assemblyReference.AssemblyPath, destinationDirectory);
+            }
+        }
+
+        private static void AddNuGetAssemblies(BuildResultItems buildResultItems, AppPackageAutomationScript.AppPackageAutomationScriptBuilder appPackageAutomationScriptBuilder)
+        {
+            foreach (PackageAssemblyReference assemblyReference in buildResultItems.Assemblies)
+            {
+                if (assemblyReference.AssemblyPath == null)
+                {
+                    continue;
+                }
+
+                var destinationFolderPath = FileSystem.Instance.Path.Combine(@"C:\Skyline DataMiner\ProtocolScripts\DllImport", assemblyReference.DllImport);
+                var destinationDirectory = FileSystem.Instance.Path.GetDirectoryName(destinationFolderPath);
+
+                appPackageAutomationScriptBuilder.WithAssembly(assemblyReference.AssemblyPath, destinationDirectory);
+            }
+        }
+
         public class PackageResult
         {
             public IAppPackageAutomationScript Script { get; set; }

Sdk/Tasks/DmappCreation.cs

@@ -25,8 +25,9 @@ public class DmappCreation : Task, ICancelableTask
         public string ProjectFile { get; set; }
         public string ProjectType { get; set; }
         public string BaseOutputPath { get; set; }
+        public string Configuration { get; set; }
         public string Version { get; set; }
-        public string MinimumSupportedDmVersion { get; set; }
+        public string MinimumRequiredDmVersion { get; set; }
 
         public override bool Execute()
         {
@@ -85,7 +86,7 @@ public override bool Execute()
                     return false;
                 }
 
-                string destinationFilePath = Path.Combine(BaseOutputPath, $"{preparedData.Project.ProjectName}.{Version}.dmapp");
+                string destinationFilePath = Path.Combine(BaseOutputPath, Configuration, $"{preparedData.Project.ProjectName}.{Version}.dmapp");
                 IAppPackage package = appPackageBuilder.Build();
                 string about = package.CreatePackage(destinationFilePath);
                 Log.LogMessage(MessageImportance.Low, $"About created package:{Environment.NewLine}{about}");
@@ -106,14 +107,15 @@ public override bool Execute()
         private bool TryCreateAppPackageBuilder(PackageCreationData preparedData, DataMinerProjectType dataMinerProjectType,
             out AppPackage.AppPackageBuilder appPackageBuilder)
         {
-            appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, Version, preparedData.MinimumSupportedDmVersion);
+            appPackageBuilder = null;
 
             if (dataMinerProjectType != DataMinerProjectType.Package)
             {
+                appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, Version, preparedData.MinimumRequiredDmVersion);
                 return true;
             }
 
-            // Create custom install script.
+            // Create package with this project as the install script.
             AutomationScriptStyle.PackageResult packageResult = AutomationScriptStyle.TryCreatePackage(preparedData, createAsTempFile: true).WaitAndUnwrapException();
 
             if (!packageResult.IsSuccess)
@@ -123,7 +125,7 @@ private bool TryCreateAppPackageBuilder(PackageCreationData preparedData, DataMi
             }
 
             var installScript = new AppPackageScript(packageResult.Script.Script, packageResult.Script.Assemblies.Select(assembly => assembly.AssemblyFilePath));
-            appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, Version, preparedData.MinimumSupportedDmVersion, installScript);
+            appPackageBuilder = new AppPackage.AppPackageBuilder(preparedData.Project.ProjectName, Version, preparedData.MinimumRequiredDmVersion, installScript);
 
             return true;
         }
@@ -153,7 +155,7 @@ private PackageCreationData PrepareData()
             }
 
             string version = GlobalDefaults.MinimumSupportDataMinerVersionForDMApp;
-            if (DataMinerVersion.TryParse(MinimumSupportedDmVersion, out DataMinerVersion dmVersion))
+            if (DataMinerVersion.TryParse(MinimumRequiredDmVersion, out DataMinerVersion dmVersion))
             {
                 version = dmVersion.ToStrictString();
             }
@@ -163,7 +165,7 @@ private PackageCreationData PrepareData()
                 Project = project,
                 LinkedProjects = referencedProjects,
                 Version = Version,
-                MinimumSupportedDmVersion = version
+                MinimumRequiredDmVersion = version
             };
         }
 
@@ -175,7 +177,7 @@ internal class PackageCreationData
 
             public string Version { get; set; }
 
-            public string MinimumSupportedDmVersion { get; set; }
+            public string MinimumRequiredDmVersion { get; set; }
         }
     }
 }