Merge pull request #25 from SkylineCommunications/NonCSharpExeInSolut…

…ionWithLibrary Fixed issue with non C# exe in a solution that contains a library
SkylineCommunications · Feb 7, 2024 · 445d95d · 445d95d
2 parents e221b6e + bd13cea
commit 445d95d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Assemblers.Automation/AutomationScriptBuilder.cs b/Assemblers.Automation/AutomationScriptBuilder.cs
@@ -41,7 +41,7 @@ public class AutomationScriptBuilder
         /// <exception cref="ArgumentNullException"><paramref name="script"/> is <see langword="null"/>.</exception>
         [Obsolete("Use the constructor with the solutionDirectory so it can take in account the NuGet.config from the solution.")]
         public AutomationScriptBuilder(Script script, IDictionary<string, Project> projects, IEnumerable<Script> allScripts)
-            : this(script,  projects, allScripts, solutionDirectory: null)
+            : this(script, projects, allScripts, solutionDirectory: null)
         {
         }
 
@@ -102,7 +102,7 @@ public AutomationScriptBuilder(Script script, IDictionary<string, Project> proje
 
         private IDictionary<string, Project> Projects { get; }
 
-        private IEnumerable<Script> AllScripts { get;  }
+        private IEnumerable<Script> AllScripts { get; }
 
         /// <summary>
         /// Combines all the cs files in the project into a single string.
@@ -131,6 +131,13 @@ public static string CombineProjectFiles(Project project)
         /// <returns>True when finding the project name. Otherwise false.</returns>
         public static bool TryFindProjectPlaceholder(string text, out string projectName, out Match match)
         {
+            if (String.IsNullOrWhiteSpace(text))
+            {
+                match = null;
+                projectName = null;
+                return false;
+            }
+
             match = RegexProjectPlaceholder.Match(text);
             if (match.Success)
             {
@@ -201,7 +208,7 @@ private async Task<NuGetPackageAssemblyData> ProcessPackageReferences(EditXml.Xm
             {
                 nugetAssemblyData = await packageReferenceProcessor.ProcessAsync(packageIdentities, project.TargetFrameworkMoniker, DevPackHelper.AutomationDevPackNuGetDependenciesIncludingTransitive).ConfigureAwait(false);
                 LogDebug($"NuGetPackageAssemblyData: {nugetAssemblyData}");
-                
+
                 ProcessFrameworkAssemblies(editExe, nugetAssemblyData);
                 ProcessLibAssemblies(editExe, buildResultItems, nugetAssemblyData);
             }
@@ -425,7 +432,7 @@ private void ProcessReference(Reference r, EditXml.XmlElement editExe, NuGetPack
             LogDebug($"ProcessReference|Add Param for {dll}");
             AddOrUpdateReferenceInExeBlock(_fileSystem, dll, editExe);
         }
-        
+
         private static void AddOrUpdateReferenceInExeBlock(IFileSystem fs, string dll, EditXml.XmlElement editExe)
         {
             if (HasDllImport(fs, editExe, dll, out var existing))
@@ -592,7 +599,7 @@ private void BuildScriptReferences(EditXml.XmlElement editExe, Project project)
             }
         }
 
-        private (string scriptName, ScriptExe scriptExe)FindExeFromOtherScript(Project project, ProjectReference r)
+        private (string scriptName, ScriptExe scriptExe) FindExeFromOtherScript(Project project, ProjectReference r)
         {
             // Check if the exe block belongs to another script.
             foreach (var script in AllScripts)

diff --git a/Assemblers.AutomationTests/AutomationScriptBuilderTests.cs b/Assemblers.AutomationTests/AutomationScriptBuilderTests.cs
@@ -24,6 +24,8 @@ public class AutomationScriptBuilderTests
         [TestMethod]
         [DataRow("[Project:SVD-1_2]", "SVD-1_2")]
         [DataRow("[Project:TV2D-SRM-LSO.Satellite Downlink [DVB-S2.S2X]_63000]", "TV2D-SRM-LSO.Satellite Downlink [DVB-S2.S2X]_63000")]
+        [DataRow("", null)]
+        [DataRow(null, null)]
         public void SLDisCompiler_AutomationScriptBuilder_TryFindProjectPlaceholder(string text, string expectedOutput)
         {
             // Act