RC v3.26.0.0

oleg-shilo · Jun 26, 2017 · 69813c2 · 69813c2
1 parent d5eda72
commit 69813c2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 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/build.cmd b/Source/Build/build.cmd
@@ -146,16 +146,16 @@ copy ..\Build\CSScriptLibrary.xml %CS-S_DEV_ROOT%\lib\CSScriptLibrary.xml
 
 rem -------------------------------------------------------------------------------------
 cd ..\Build
-rem need to ensure ConfigConsole.cs doesn't contain "{ 25D84CB0", which is a formatting CSScript.Npp artefact 
-cscs.exe /l /dbg /nl "..\ConfigConsole\buildCheck.cs" >> ..\Build\build.log
+rem need to ensure ConfigConsole.cs doesn't contain "{ 25D84CB0", which is a formatting CSScript.Npp artifact 
+cscs.exe /l /dbg /pvdr:none /nl "..\ConfigConsole\buildCheck.cs" >> ..\Build\build.log
 
 rem neet to remap CSSCRIPT_DIR as otherwise ConfigConsole will be linked against choco CS-S binaries  
 set old_css_dir=%CSSCRIPT_DIR%
 set CSSCRIPT_DIR=%CS-S_DEV_ROOT%
 
 ECHO Building ConfigConsole.exe: 
 ECHO Building ConfigConsole.exe: >> ..\Build\build.log
-cscs.exe /nl /l /dbg /ew "..\ConfigConsole\ConfigConsole.cs"
+cscs.exe /nl /l /dbg -pvdr:none /ew "..\ConfigConsole\ConfigConsole.cs"
 move ..\ConfigConsole\ConfigConsole.exe ..\Build\ConfigConsole.exe
 ECHO ------------ >> ..\Build\build.log
 set CSSCRIPT_DIR=%old_css_dir% 

diff --git a/Source/Build/cscs.exe b/Source/Build/cscs.exe
diff --git a/Source/Utils.cs b/Source/Utils.cs
@@ -242,7 +242,7 @@ public static string PathCombine(string path, params string[] parts)
                 result = Path.Combine(result, item);
             return result;
 #else
-            var allParts = new[] { path ?? "" }.Concat(parts);
+            var allParts = new[] { path ?? "" }.Concat(parts.Select(x => x ?? ""));
             return Path.Combine(allParts.ToArray());
 #endif
         }

diff --git a/Source/csscript.cs b/Source/csscript.cs
@@ -1256,7 +1256,6 @@ ICodeCompiler LoadCompiler(string scriptFileName, ref string[] filesToInject)
                 }
             }
 
-            // Debug.Assert(false);
             if (options.altCompiler == "")
                 options.altCompiler = LookupDefaultRoslynCompilerFile();
             else if (options.altCompiler == "none")

diff --git a/Source/dbg.cs b/Source/dbg.cs
@@ -132,8 +132,10 @@ void WriteObject(object obj)
                     break;
                 }
 
-                if (item is DictionaryEntry entry)
+                if (item is DictionaryEntry)
                 {
+                    var entry = (DictionaryEntry)item;
+
                     write("[" + entry.Key + "]: ");
                     if (level < (depth + 1))
                     {

diff --git a/Source/dbg.res.cs b/Source/dbg.res.cs