- Fixed false positive of OutOfDate detection. Caused by the imported…

… files stored in the script file stamp without full path
AzizDZH · Dec 27, 2022 · 2c0642b · 2c0642b
1 parent 3b0bba7
commit 2c0642b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/src/cscs/ScriptParser.cs b/src/cscs/ScriptParser.cs
@@ -1,9 +1,9 @@
+using csscript;
+using CSScripting;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using csscript;
-using CSScripting;
 
 namespace CSScriptLib
 {
@@ -254,6 +254,12 @@ void ProcessFile(ScriptInfo fileInfo)
                     {
                         importedFile.ProcessFile(); //parse now namespaces, ref. assemblies and scripts; also it will do namespace renaming
 
+
+                        this.SearchDirs = this.SearchDirs.ToList()
+                                              .AddIfNotThere(importedFile.fileName.GetDirName())
+                                              .ToArray();
+
+
                         this.fileParsers.Add(importedFile);
                         this.fileParsers.Sort(fileComparer);
 
@@ -284,6 +290,7 @@ void ProcessFile(ScriptInfo fileInfo)
                                 dirs.Add(Path.GetFullPath(dir));
                             else
                                 dirs.Add(Path.Combine(Path.GetDirectoryName(importedFile.fileName), dir));
+
                         this.SearchDirs = dirs.ToArray();
                     }
                     else

diff --git a/src/cscs/Utils/Utils.cs b/src/cscs/Utils/Utils.cs
@@ -30,11 +30,13 @@
 
 #endregion Licence...
 
+using csscript;
+using CSScripting.CodeDom;
+using CSScriptLib;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using static System.Environment;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -43,9 +45,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using csscript;
-using CSScripting.CodeDom;
-using CSScriptLib;
+using static System.Environment;
 
 namespace CSScripting
 {
@@ -1639,23 +1639,7 @@ public string[] AddItems(string[] files, bool isAssembly, string[] searchDirs)
             else
             {
                 foreach (string file in files)
-                {
-                    string fullPath = Path.GetFullPath(file);
-
-                    bool local = false;
-
-                    foreach (string dir in searchDirs)
-                    {
-                        local = dir.SamePathAs(fullPath.GetDirName());
-                        if (local)
-                            break;
-                    }
-
-                    if (local)
-                        AddItem(Path.GetFileName(file), File.GetLastWriteTimeUtc(file), false);
-                    else
-                        AddItem(file, File.GetLastWriteTimeUtc(file), false);
-                }
+                    AddItem(file, File.GetLastWriteTimeUtc(file), false);
             }
             return newProbingDirs.ToArray();
         }