Issue #71: Issue with multiple indirect relative paths (2)

oleg-shilo · Jun 29, 2017 · e4dbec5 · e4dbec5
1 parent ff5e924
commit e4dbec5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/Source/Build/CSScriptLibrary.dll b/Source/Build/CSScriptLibrary.dll
diff --git a/Source/Build/CSScriptLibrary.v3.5.dll b/Source/Build/CSScriptLibrary.v3.5.dll
diff --git a/Source/Build/cscs.exe b/Source/Build/cscs.exe
diff --git a/Source/Settings.cs b/Source/Settings.cs
@@ -748,6 +748,9 @@ internal void Save(string fileName, bool throwOnError)
                 doc.DocumentElement.AppendChild(doc.CreateElement("reportDetailedErrorInfo")).AppendChild(doc.CreateTextNode(ReportDetailedErrorInfo.ToString()));
                 doc.DocumentElement.AppendChild(doc.CreateElement("enableDbgPrint")).AppendChild(doc.CreateTextNode(enableDbgPrint.ToString()));
 
+                if (ResolveRelativeFromParentScriptLocation != false)
+                    doc.DocumentElement.AppendChild(doc.CreateElement("resolveRelativeFromParentScriptLocation")).AppendChild(doc.CreateTextNode(ResolveRelativeFromParentScriptLocation.ToString()));
+
                 if (hideOptions != HideOptions.HideAll)
                     doc.DocumentElement.AppendChild(doc.CreateElement("hideOptions")).AppendChild(doc.CreateTextNode(hideOptions.ToString()));
 
@@ -910,6 +913,7 @@ public static Settings Load(string fileName, bool createAlways)
                     node = data.SelectSingleNode("autoclass.decorateAlways"); if (node != null) settings.autoClass_DecorateAlways = node.InnerText.ToLower() == "true";
                     node = data.SelectSingleNode("hideCompilerWarnings"); if (node != null) settings.hideCompilerWarnings = node.InnerText.ToLower() == "true";
                     node = data.SelectSingleNode("inMemoryAsm"); if (node != null) settings.inMemoryAsm = node.InnerText.ToLower() == "true";
+                    node = data.SelectSingleNode("resolveRelativeFromParentScriptLocation"); if (node != null) settings.ResolveRelativeFromParentScriptLocation = node.InnerText.ToLower() == "true";
                     node = data.SelectSingleNode("concurrencyControl"); if (node != null) settings.concurrencyControl = (ConcurrencyControl)Enum.Parse(typeof(ConcurrencyControl), node.InnerText, false);
                     node = data.SelectSingleNode("TargetFramework"); if (node != null) settings.TargetFramework = node.InnerText;
                     node = data.SelectSingleNode("defaultRefAssemblies"); if (node != null) settings.defaultRefAssemblies = node.InnerText;

diff --git a/Source/cscscript/CSScriptLibrary.xml b/Source/cscscript/CSScriptLibrary.xml