# Release v4.6.4

--- ## Changes ### CLI - CLI: Removed runtime dependency on `*.CSharp.Scripting.CSharpScript.dll` if Roslyn is not used as an engine. ### CSScriptLib - no changes
AzizDZH · Jan 21, 2023 · 4229827 · 4229827
1 parent b8d9520
commit 4229827
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 48 deletions.
diff --git a/help.txt b/help.txt
@@ -1,4 +1,4 @@
-C# Script execution engine (.NET Core). Version 4.6.3.0.
+C# Script execution engine (.NET Core). Version 4.6.4.0.
 Copyright (C) 2004-2020 Oleg Shilo.
 
 

diff --git a/src/1.build-binaries.cmd b/src/1.build-binaries.cmd
@@ -42,7 +42,7 @@ rem copy .\css\bin\Release\css.exe ".\out\Windows\css.exe"
 
 echo =====================
 echo Building (cd: %cd%)
-echo =====================
+echo ---------------------
 
 del .\out\*.*nupkg 
 
@@ -90,7 +90,7 @@ popd
 
 echo =====================
 echo Aggregating (cd: %cd%)
-echo =====================
+echo ---------------------
 copy "out\Windows\win" "out\Windows" /Y
 copy "out\Windows\console" "out\Windows" /Y
 del "out\Linux\*.pdb" 
@@ -112,12 +112,15 @@ copy "out\static_content\-self\-test\*" "out\Linux\-self\-test\"
 
 xcopy /s /q "out\static_content\-wdbg\*" "out\Windows\-wdbg\" 
 xcopy /s /q "out\static_content\-wdbg\*" "out\Linux\-wdbg\" 
+
+
+echo =====================
+echo Clearing possible WDBG test/dev files
+echo ---------------------
 rd /S /Q .\out\Linux\-wdbg\dbg-server\bin\
 rd /S /Q .\out\Windows\-wdbg\dbg-server\bin\
 rd /S /Q .\out\WindowLinux\-wdbg\dbg-server\obj\
 rd /S /Q .\out\Windows\-wdbg\dbg-server\obj\
-rd /S /Q .\out\WindowLinux\-wdbg\test\
-rd /S /Q .\out\Windows\-wdbg\test\
 del out\Linux\-wdbg\test*.cs
 del out\Windows\-wdbg\test*.cs
 
@@ -131,15 +134,15 @@ cd out\Windows
 
 echo =====================
 echo Aggregating packages (cd: %cd%)
-echo =====================
+echo ---------------------
 .\cscs -c:0 ..\..\CSScriptLib\src\CSScriptLib\output\aggregate.cs
 cd ..\..
 
 copy CSScriptLib\src\CSScriptLib\output\*.*nupkg out\
 
 echo =====================
 echo Packaging (cd: %cd%)
-echo =====================
+echo ---------------------
 
 cd out\Linux
 echo cd: %cd%
@@ -153,7 +156,7 @@ cd ..\..
 
 echo =====================
 echo Injecting version in file names
-echo =====================
+echo ---------------------
 
 cd out\Windows
 .\cscs -c:0 ..\..\CSScriptLib\src\CSScriptLib\output\aggregate.cs

diff --git a/src/CSScriptLib/src/CSScriptLib/CSScriptLib.csproj b/src/CSScriptLib/src/CSScriptLib/CSScriptLib.csproj
@@ -13,7 +13,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>4.6.3</Version>
+    <Version>4.6.4</Version>
     <Authors>Oleg Shilo</Authors>
     <Description>CS-Script engine Class Library for .NET 5 (and higher)</Description>
     <Copyright>(C) 2018-2022 Oleg Shilo</Copyright>
@@ -29,15 +29,14 @@
 
 ### CLI
 
-- WDBG: Fixed problem with invalid breakpoint info passing to client 
-- Added `-new:webapi` support 
+- CLI: Removed runtime dependency on `*.CSharp.Scripting.CSharpScript.dll` if Roslyn is not used as an engine.
 
 ### CSScriptLib
 
 - no changes</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <AssemblyVersion>4.6.3</AssemblyVersion>
-    <FileVersion>4.6.3</FileVersion>
+    <AssemblyVersion>4.6.4</AssemblyVersion>
+    <FileVersion>4.6.4</FileVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>css_logo.png</PackageIcon>
   </PropertyGroup>

diff --git a/src/cscs/Utils/Runtime.cs b/src/cscs/Utils/Runtime.cs
@@ -1,9 +1,9 @@
-using CSScripting;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Loader;
+using CSScripting;
 
 #if class_lib
 
@@ -208,10 +208,10 @@ public static void CleanUnusedTmpFiles(string dir, string pattern, bool verifyPi
 
         static internal string CustomCommandsDir
             => "CSSCRIPT_COMMANDS".GetEnvar() ??
-               Environment.SpecialFolder.CommonApplicationData.GetPath()
+                Environment.SpecialFolder.CommonApplicationData.GetPath()
 
-                                        .PathJoin("cs-script", "commands")
-                                        .EnsureDir(false);
+                                         .PathJoin("cs-script", "commands")
+                                         .EnsureDir(false);
 
         static internal string GlobalIncludsDir
         {

diff --git a/src/cscs/cscs.csproj b/src/cscs/cscs.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>cscs</AssemblyName>
     <RootNamespace>CSScripting</RootNamespace>
     <StartupObject />
-    <Version>4.6.3</Version>
+    <Version>4.6.4</Version>
     <Authors>Oleg Shilo</Authors>
     <Product>CS-Script</Product>
     <Copyright>(C) 2004-2022 Oleg Shilo</Copyright>
@@ -17,16 +17,15 @@
     <RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>C# script dynamic</PackageTags>
-    <AssemblyVersion>4.6.3</AssemblyVersion>
-    <FileVersion>4.6.3</FileVersion>
+    <AssemblyVersion>4.6.4</AssemblyVersion>
+    <FileVersion>4.6.4</FileVersion>
     <PackageReleaseNotes>---
 
 ## Changes
 
 ### CLI
 
-- WDBG: Fixed problem with invalid breakpoint info passing to client 
-- Added `-new:webapi` support 
+- CLI: Removed runtime dependency on `*.CSharp.Scripting.CSharpScript.dll` if Roslyn is not used as an engine.
 
 ### CSScriptLib
 

diff --git a/src/cscs/csscript.cs b/src/cscs/csscript.cs
@@ -314,7 +314,7 @@ public string[] PreprocessInlineCodeArgs(string[] args)
             "   using static dbg;" + NewLine +
             "   using static System.Environment;" + NewLine;
 
-            var customHeaderFile = this.GetType().Assembly.Location.GetDirName().PathJoin("-code.header");
+            var customHeaderFile = Runtime.GlobalIncludsDir.PathJoin("-code.header");
 
             if (File.Exists(customHeaderFile))
             {

diff --git a/src/css/Properties/AssemblyInfo.cs b/src/css/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.3")]
-[assembly: AssemblyFileVersion("4.6.3")]
+[assembly: AssemblyVersion("4.6.4")]
+[assembly: AssemblyFileVersion("4.6.4")]
diff --git a/src/csws/csws.csproj b/src/csws/csws.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>csws</AssemblyName>
     <RootNamespace>CSScripting</RootNamespace>
     <StartupObject />
-    <Version>4.6.3</Version>
+    <Version>4.6.4</Version>
     <Authors>Oleg Shilo</Authors>
     <Product>CS-Script</Product>
     <Copyright>(C) 2004-2022 Oleg Shilo</Copyright>
@@ -18,16 +18,15 @@
     <RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>C# script dynamic</PackageTags>
-    <AssemblyVersion>4.6.3</AssemblyVersion>
-    <FileVersion>4.6.3</FileVersion>
+    <AssemblyVersion>4.6.4</AssemblyVersion>
+    <FileVersion>4.6.4</FileVersion>
     <PackageReleaseNotes>---
 
 ## Changes
 
 ### CLI
 
-- WDBG: Fixed problem with invalid breakpoint info passing to client 
-- Added `-new:webapi` support 
+- CLI: Removed runtime dependency on `*.CSharp.Scripting.CSharpScript.dll` if Roslyn is not used as an engine.
 
 ### CSScriptLib
 

diff --git a/src/out/Windows/-code.header b/src/out/Windows/-code.header
diff --git a/src/out/Windows/cscs.deps.json b/src/out/Windows/cscs.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "cscs/4.6.3": {
+      "cscs/4.6.4": {
         "dependencies": {
           "Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
         },
@@ -468,7 +468,7 @@
     }
   },
   "libraries": {
-    "cscs/4.6.3": {
+    "cscs/4.6.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/src/out/Windows/csws.deps.json b/src/out/Windows/csws.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "csws/4.6.3": {
+      "csws/4.6.4": {
         "dependencies": {
           "Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
         },
@@ -468,7 +468,7 @@
     }
   },
   "libraries": {
-    "csws/4.6.3": {
+    "csws/4.6.4": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/src/out/ci/build.sh b/src/out/ci/build.sh
@@ -1,3 +1,3 @@
 cd /home/user/lnx-build
-sudo chmod 775 cs-script_4.6-3/DEBIAN/p*
-dpkg-deb --build cs-script_4.6-3
+sudo chmod 775 cs-script_4.6-4/DEBIAN/p*
+dpkg-deb --build cs-script_4.6-4
diff --git a/src/release_notes.md b/src/release_notes.md
@@ -1,13 +1,12 @@
-# Release v4.6.3
+# Release v4.6.4
 
 ---
 
 ## Changes
 
 ### CLI
 
-- WDBG: Fixed problem with invalid breakpoint info passing to client 
-- Added `-new:webapi` support 
+- CLI: Removed runtime dependency on `*.CSharp.Scripting.CSharpScript.dll` if Roslyn is not used as an engine.
 
 ### CSScriptLib