Support SolutionFilter files

Author: MichielOda

Sdk/Helpers/ProjectReferenceHelper.cs

@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Text.Json;
     using System.Text.RegularExpressions;
     using System.Xml;
     using System.Xml.Linq;
@@ -18,13 +19,13 @@ public static bool TryResolveProjectReferences(Project packageProject, out List<
             includedProjectPaths = null;
             errorMessage = null;
 
-            string solutionFolder = FileSystem.Instance.Directory.GetParentDirectory(packageProject.ProjectDirectory);
+            string rootFolder = FileSystem.Instance.Directory.GetParentDirectory(packageProject.ProjectDirectory);
             const string xmlFileName = "ProjectReferences.xml";
             string xmlFilePath = FileSystem.Instance.Path.Combine(packageProject.ProjectDirectory, "PackageContent", xmlFileName);
 
             try
             {
-                includedProjectPaths = ResolveProjectReferences(xmlFilePath, solutionFolder);
+                includedProjectPaths = ResolveProjectReferences(xmlFilePath, rootFolder);
                 return true;
             }
             catch (FileNotFoundException)
@@ -43,7 +44,7 @@ public static bool TryResolveProjectReferences(Project packageProject, out List<
             return false;
         }
 
-        private static List<string> ResolveProjectReferences(string xmlFilePath, string solutionFolder)
+        private static List<string> ResolveProjectReferences(string xmlFilePath, string rootFolder)
         {
             // Load the XML file
             var doc = XDocument.Load(xmlFilePath);
@@ -55,6 +56,33 @@ private static List<string> ResolveProjectReferences(string xmlFilePath, string
                                      .Select(attr => attr.Value)
                                      .ToList();
 
+            var includeSolutionFilters = doc.Descendants(ns + "SolutionFilter")
+                                     .Attributes("Include")
+                                     .Select(attr => attr.Value)
+                                     .ToList();
+
+            // Readout solution filter files and add them to the include patterns
+            foreach (string includeSolutionFilter in includeSolutionFilters)
+            {
+                var filters = FileSystem.Instance.Directory.GetFiles(rootFolder, "*.slnf", SearchOption.AllDirectories)
+                                        .Where(path => MatchesPattern(path, includeSolutionFilter));
+
+                foreach (string filter in filters)
+                {
+                    string json = FileSystem.Instance.File.ReadAllText(filter);
+                    JsonDocument jsonFilter = JsonDocument.Parse(json);
+
+                    if (jsonFilter.RootElement.TryGetProperty("solution", out JsonElement solution) && solution.TryGetProperty("projects", out JsonElement projects)
+                        && projects.ValueKind== JsonValueKind.Array)
+                    {
+                        foreach (JsonElement project in projects.EnumerateArray())
+                        {
+                            includePatterns.Add($"..\\{project}");
+                        }
+                    }
+                }
+            }
+
             var excludePatterns = doc.Descendants(ns + "ProjectReference")
                                      .Attributes("Exclude")
                                      .Select(attr => attr.Value)
@@ -73,8 +101,8 @@ private static List<string> ResolveProjectReferences(string xmlFilePath, string
             var includedProjects = new HashSet<string>();
             foreach (var pattern in includePatterns)
             {
-                var resolvedPaths = Directory.GetFiles(solutionFolder, "*.csproj", SearchOption.AllDirectories)
-                                             .Where(path => MatchesPattern(path, pattern));
+                var resolvedPaths = FileSystem.Instance.Directory.GetFiles(rootFolder, "*.csproj", SearchOption.AllDirectories)
+                                              .Where(path => MatchesPattern(path, pattern));
                 foreach (var path in resolvedPaths)
                 {
                     includedProjects.Add(path);
@@ -84,15 +112,15 @@ private static List<string> ResolveProjectReferences(string xmlFilePath, string
             // Apply Exclude patterns
             foreach (var pattern in excludePatterns)
             {
-                var resolvedPaths = Directory.GetFiles(solutionFolder, "*.csproj", SearchOption.AllDirectories)
-                                             .Where(path => MatchesPattern(path, pattern));
+                var resolvedPaths = FileSystem.Instance.Directory.GetFiles(rootFolder, "*.csproj", SearchOption.AllDirectories)
+                                              .Where(path => MatchesPattern(path, pattern));
                 foreach (var path in resolvedPaths)
                 {
                     includedProjects.Remove(path);
                 }
             }
 
-            return includedProjects.ToList();
+            return includedProjects.Distinct().ToList();
         }
 
         private static bool MatchesPattern(string filePath, string pattern)
@@ -102,5 +130,13 @@ private static bool MatchesPattern(string filePath, string pattern)
             string normalizedPattern = pattern.Replace("*", ".*").Replace(@"\", @"\\");
             return Regex.IsMatch(filePath, normalizedPattern, RegexOptions.IgnoreCase);
         }
+
+        private class SolutionFilter
+        {
+            public string Path { get; set; }
+
+            public string[] Projects { get; set; }
+        }
+
     }
 }

Sdk/Sdk.csproj

@@ -23,6 +23,7 @@
     <BuildOutputTargetFolder>Sdk</BuildOutputTargetFolder>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+    <PackageVersion>0.1.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -40,6 +41,7 @@
     <PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.0.13-foxtrot" 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" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
@@ -50,7 +52,7 @@
   </Target>
 
   <Target Name="LocalTesting" AfterTargets="Pack" Condition="'$(Configuration)' == 'Debug'">
-    <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\skyline.dataminer.sdk" />
+    <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\skyline.dataminer.sdk\$(PackageVersion)" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\$(BaseOutputPath)$(Configuration)\$(AssemblyName).$(PackageVersion).nupkg" DestinationFolder="$(USERPROFILE)\Documents\MyNugets" />
     <Message Text="### Finished copying new package. ###" Importance="High" /> 
   </Target>

Sdk/Tasks/DmappCreation.cs

@@ -144,7 +144,6 @@ private void AddProjectToPackage(PackageCreationData preparedData, AppPackage.Ap
                     Log.LogError("Including a package project inside another package project is not supported.");
                     break;
 
-                case DataMinerProjectType.Unknown:
                 default:
                     Log.LogError($"Project {preparedData.Project.ProjectName} could not be added to package due to an unknown DataMinerType.");
                     return;