Release v4.8.21.0 - published

Author: oleg-shilo

help.txt

@@ -46,7 +46,7 @@ echo ----------------
 echo Building cscs.dll from %cd%
 echo ----------------
 
-dotnet publish -c Release -f %target_prev% -o "..\out\Windows\distros\net8" cscs.8.csproj
+dotnet publish -c Release -f %target_prev% -o "..\out\win.net8" cscs.8.csproj
 rd /s /q .\obj
 dotnet publish -c Release -f %target% -o "..\out\Windows\console" cscs.csproj
 
@@ -154,15 +154,19 @@ echo cd: %cd%
 ..\ci\7z.exe a -r "..\cs-script.linux.7z" "*.*"
 cd ..\..
 
+cd out\win.net8
+echo cd: %cd%
+..\ci\7z.exe a -r "..\cs-script.win.net8.7z" "*.*"
+cd ..\..
+
 cd out\Windows
 echo cd: %cd%
-..\ci\7z.exe a -r ".\distros\cs-script.net8.7z" ".\distros\net8\*.*"
-rd /s /q ".\distros\net8"
 
 echo ==========================================
 echo .\cscs -l:0 -c:0 -ng:csc -mkshim css.exe cscs.exe
 .\cscs -l:0 -c:0 -ng:csc -mkshim css.exe cscs.exe
 echo ==========================================
+
 ..\ci\7z.exe a -r "..\cs-script.win.zip" "*.*"
 ..\ci\7z.exe a -r "..\cs-script.win.7z" "*.*"
 cd ..\..
@@ -175,6 +179,7 @@ cd out\Windows
 .\cscs -c:0 ..\..\CSScriptLib\src\CSScriptLib\output\aggregate.cs
 .\cscs -engine:dotnet -code Console.WriteLine(Assembly.LoadFrom(#''cscs.dll#'').GetName().Version)
 .\cscs -engine:dotnet -code var version = Assembly.LoadFrom(#''cscs.dll#'').GetName().Version.ToString();#nFile.Copy(#''..\\cs-script.win.7z#'', $#''..\\cs-script.win.v{version}.7z#'', true);
+.\cscs -engine:dotnet -code var version = Assembly.LoadFrom(#''cscs.dll#'').GetName().Version.ToString();#nFile.Copy(#''..\\cs-script.win.net8.7z#'', $#''..\\cs-script.win.net8.v{version}.7z#'', true);
 .\cscs -engine:dotnet -code var version = Assembly.LoadFrom(#''cscs.dll#'').GetName().Version.ToString();#nFile.Copy(#''..\\cs-script.win.zip#'', $#''..\\cs-script.win.v{version}.zip#'', true);
 .\cscs -engine:dotnet -code var version = Assembly.LoadFrom(#''cscs.dll#'').GetName().Version.ToString();#nFile.Copy(#''..\\cs-script.linux.7z#'', $#''..\\cs-script.linux.v{version}.7z#'', true);
 @REM md ..\..\..\cs-script.wiki
@@ -187,6 +192,7 @@ move "CSScriptLib\src\CSScriptLib\output\*.nupkg" ".\out"
 move "CSScriptLib\src\CSScriptLib\output\*.snupkg" ".\out"
 
 del out\cs-script.win.7z
+del out\cs-script.win.net8.7z
 del out\cs-script.linux.7z
 
 echo Updating help.txt

src/1.build-binaries.cmd

@@ -1,5 +1,7 @@
 echo off
 
-.\out\Windows\css.exe -servers:stop
+rem VS xUnit test runner fails to exit (even though executed all tests) if it 
+rem has a child process running (e.g. css build server). So starting the server before the tests
+.\out\Windows\css.exe -server:start
 dotnet test ".\Tests.CSScriptLib\Tests.CSScriptLib.csproj"
 rem dotnet test ".\Tests.cscs\Tests.CLI.csproj" -e CI="true"

src/2.run-tests-ci.cmd

@@ -1,5 +1,7 @@
 echo off
 
-.\out\Windows\css.exe -servers:stop
+rem VS xUnit test runner fails to exit (even though executed all tests) if it 
+rem has a child process running (e.g. css build server). So starting the server before the tests
+.\out\Windows\css.exe -server:start
 dotnet test ".\Tests.CSScriptLib\Tests.CSScriptLib.csproj"
 dotnet test ".\Tests.cscs\Tests.CLI.csproj" -e CI="true"

src/2.run-tests.cmd

@@ -10,6 +10,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib", "CSScriptLib\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cscs", "cscs\cscs.csproj", "{847D3D48-443D-42F6-BB42-9467EC22994B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{856DEA01-07B4-472D-9B82-73B37BBD1A25} = {856DEA01-07B4-472D-9B82-73B37BBD1A25}
 		{E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619}
 	EndProjectSection
 EndProject

src/CS-Script.sln

@@ -30,6 +30,9 @@
 
 ### CLI
 - Rebuild for .NET 9.0
+- Secondary "start build server" commands are made asynchronous to match the primary `css -server:start` behaver. The impacted commands are:
+  - `css -servers:start`
+  - `css -server_r:start`
 
 ### CSScriptLib
 - Rebuild for .NET 9.0</PackageReleaseNotes>

src/CSScriptLib/src/CSScriptLib/CSScriptLib.csproj

@@ -26,7 +26,7 @@ namespace EvaluatorTests
     [Collection("Sequential")]
     public class Generic_Roslyn
     {
-        [Fact(Skip = "xUnit runtime is incompatible. But test is valid")]
+        [Fact(Skip = "xUnit runtime is incompatible. But the test is valid")]
         public void call_UnloadAssembly()
         {
             // There is something strange happening under xUnit runtime. This very test runs fine
@@ -49,7 +49,7 @@ public void call_UnloadAssembly()
             }
         }
 
-        [Fact(Skip = "xUnit runtime is incompatible. But test is valid")]
+        [Fact(Skip = "xUnit runtime is incompatible. But the test is valid")]
         public void call_SuccessfulUnloadAssembly()
         {
             ICalc script = CSScript.RoslynEvaluator

src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs

@@ -30,6 +30,9 @@
 
 ### CLI
 - Rebuild for .NET 9.0
+- Secondary "start build server" commands are made asynchronous to match the primary `css -server:start` behaver. The impacted commands are:
+  - `css -servers:start`
+  - `css -server_r:start`
 
 ### CSScriptLib
 - Rebuild for .NET 9.0</releaseNotes>

src/chocolatey/cs-script.nuspec

@@ -1259,9 +1259,11 @@ public static string ShowHelp(string helpType, params object[] context)
 #if DEBUG
                             Environment.GetEnvironmentVariable("CSSCRIPT_INSTALLED"),
 #endif
-                            Assembly.GetExecutingAssembly().Location.GetDirName() };
+                            Assembly.GetExecutingAssembly().Location.GetDirName()
+                        };
 
                         var customCommands = commandDirs
+                                                 .Where(dir => dir.DirExists())
                                                  .SelectMany(dir =>
                                                  {
                                                      var commands = Directory.GetFiles(dir, "-run.cs", SearchOption.AllDirectories)

src/cscs/HelpProvider.cs

@@ -44,11 +44,12 @@ static int Main(string[] args)
                     else if (serverCommand == "-server:reset") Globals.ResetBuildServer();
                     else if (serverCommand == "-server:add") Globals.DeployBuildServer();
                     else if (serverCommand == "-server:remove") Globals.RemoveBuildServer();
-                    else if (serverCommand == "-servers:start") { CSScripting.Roslyn.BuildServer.Start(); Globals.StartBuildServer(); }
+                    else if (serverCommand == "-servers:start") { Globals.StartRoslynBuildServer(); Globals.StartBuildServer(); }
                     else if (serverCommand == "-servers:stop") { CSScripting.Roslyn.BuildServer.Stop(); Globals.StopBuildServer(); }
                     else if (serverCommand == "-kill") { CSScripting.Roslyn.BuildServer.Stop(); Globals.StopBuildServer(); }
-                    else if (serverCommand == "-server_r:start") CSScripting.Roslyn.BuildServer.Start();
+                    else if (serverCommand == "-server_r:start") Globals.StartRoslynBuildServer();
                     else if (serverCommand == "-server_r:stop") CSScripting.Roslyn.BuildServer.Stop();
+                    else if (serverCommand == "-server_r:start_inproc") CSScripting.Roslyn.BuildServer.Start(); // this command is invisible for users and only used to allow async start of teh server
                     else Globals.PrintBuildServerInfo();
                 }
                 else if (OSVersion.Platform == PlatformID.Win32NT && installCommand.HasText() && !args.Any(x => x == "?"))