Improved build

.run/Build.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Build/bin/Debug/net8.0/Build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="-p:integrationTests=false -p:version=1.1.0-beta1" />
+    <option name="PROGRAM_PARAMETERS" value="-p:integrationTests=false -p:version=1.1.0-beta2" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

Build/Build.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CSharpInteractive" Version="1.0.9-beta6" />
+        <PackageReference Include="CSharpInteractive" Version="1.1.0-beta2" />
     </ItemGroup>
 
 </Project>

Build/Program.cs

@@ -55,7 +55,7 @@
         false)
 };
 
-Run(new DotNetToolRestore().WithShortName("Restoring tools"));
+new DotNetToolRestore().WithShortName("Restoring tools").Run().EnsureSuccess();
 
 new DotNetClean()
     .WithProject(solutionFile)
@@ -134,7 +134,7 @@
         .EnsureSuccess();
 
     var dotCoverReportXml = Path.Combine(reportDir, "dotCover.xml");
-    Run(new DotNetCustom("dotCover", "report", $"--source={dotCoverSnapshot}", $"--output={dotCoverReportXml}", "--reportType=TeamCityXml").WithShortName("Generating the code coverage reports"));
+    new DotNetCustom("dotCover", "report", $"--source={dotCoverSnapshot}", $"--output={dotCoverReportXml}", "--reportType=TeamCityXml").WithShortName("Generating the code coverage reports").Run().EnsureSuccess();
 
     if (TryGetCoverage(dotCoverReportXml, out coveragePercentage))
     {
@@ -158,7 +158,7 @@
 var uninstallTool = new DotNetCustom("tool", "uninstall", toolPackageId, "-g")
     .WithShortName("Uninstalling tool");
 
-if (uninstallTool.Run(_ => { } ) != 0)
+if (uninstallTool.Run(_ => { } ).ExitCode != 0)
 {
     Warning($"{uninstallTool} failed.");
 }
@@ -176,25 +176,25 @@
 var installTool = new DotNetCustom("tool", "install", toolPackageId, "-g", "--version", packageVersion.ToString(), "--add-source", Path.Combine(outputDir, "CSharpInteractive.Tool"))
     .WithShortName("Installing tool");
 
-if (installTool.Run(output => WriteLine(output.Line)) != 0)
+if (installTool.Run(output => WriteLine(output.Line)).ExitCode != 0)
 {
     Warning($"{installTool} failed.");
 }
 
-Run(new DotNetCustom("csi", "/?").WithShortName("Checking tool"));
+new DotNetCustom("csi", "/?").WithShortName("Checking tool").Run().EnsureSuccess();
 
 var uninstallTemplates = new DotNetCustom("new", "uninstall", templatesPackageId)
     .WithShortName("Uninstalling template");
 
-if (uninstallTemplates.Run(output => WriteLine(output.Line)) != 0)
+if (uninstallTemplates.Run(output => WriteLine(output.Line)).ExitCode != 0)
 {
     Warning($"{uninstallTemplates} failed.");
 }
 
 var installTemplates = new DotNetCustom("new", "install", $"{templatesPackageId}::{packageVersion.ToString()}", "--nuget-source", templateOutputDir)
     .WithShortName("Installing template");
 
-Run(installTemplates.WithShortName(installTemplates.ShortName));
+installTemplates.WithShortName(installTemplates.ShortName).Run().EnsureSuccess();
 
 foreach (var framework in frameworks)
 {
@@ -204,10 +204,10 @@
     try
     {
         var sampleProjectDir = Path.Combine("Samples", "MySampleLib", "MySampleLib.Tests");
-        Run(new DotNetNew("build", $"--package-version={packageVersion}", "-T", framework, "--no-restore").WithWorkingDirectory(buildProjectDir).WithShortName($"Creating a new {sampleProjectName}"));
+        new DotNetNew("build", $"--package-version={packageVersion}", "-T", framework, "--no-restore").WithWorkingDirectory(buildProjectDir).WithShortName($"Creating a new {sampleProjectName}").Run().EnsureSuccess();
         new DotNetBuild().WithProject(buildProjectDir).WithSources(defaultNuGetSource, Path.Combine(outputDir, "CSharpInteractive")).WithShortName($"Building the {sampleProjectName}").Build().EnsureSuccess();
-        Run(new DotNetRun().WithProject(buildProjectDir).WithNoBuild(true).WithWorkingDirectory(sampleProjectDir).WithShortName($"Running a build for the {sampleProjectName}"));
-        Run(new DotNetCustom("csi", Path.Combine(buildProjectDir, "Program.csx")).WithWorkingDirectory(sampleProjectDir).WithShortName($"Running a build as a C# script for the {sampleProjectName}"));
+        new DotNetRun().WithProject(buildProjectDir).WithNoBuild(true).WithWorkingDirectory(sampleProjectDir).WithShortName($"Running a build for the {sampleProjectName}").Run().EnsureSuccess();
+        new DotNetCustom("csi", Path.Combine(buildProjectDir, "Program.csx")).WithWorkingDirectory(sampleProjectDir).WithShortName($"Running a build as a C# script for the {sampleProjectName}").Run().EnsureSuccess();
     }
     finally
     {

Build/Tools.cs

@@ -62,19 +62,6 @@ public static string GetProperty(string name, string defaultProp, bool showWarni
         return defaultProp;
     }
 
-    public static void Run(ICommandLine commandLine)
-    {
-        var exitCode = commandLine.Run();
-        if (exitCode == 0)
-        {
-            return;
-        }
-
-        var startInfo = commandLine.GetStartInfo(GetService<IHost>());
-        Error($"{startInfo.ShortName} failed");
-        throw new OperationCanceledException();
-    }
-
     public static bool TryGetCoverage(string dotCoverReportXml, out int coveragePercentage)
     {
         var dotCoverReportDoc = new XmlDocument();

CSharpInteractive/Core/LogExtensions.cs

@@ -15,6 +15,11 @@ public static ILog<T> Error<T>(this ILog<T> log, ErrorId id, params string[] err
 
     public static ILog<T> Error<T>(this ILog<T> log, ErrorId id, Exception error)
     {
+        if (error is ProcessTerminationException)
+        {
+            return log;
+        }
+
         log.Error(id, error.ToText());
         return log;
     }

CSharpInteractive/Core/ProcessTerminationException.cs

@@ -0,0 +1,7 @@
+namespace CSharpInteractive.Core;
+
+[Serializable]
+internal class ProcessTerminationException(int exitCode): OperationCanceledException
+{
+    public int ExitCode { get; } = exitCode;
+}

CSharpInteractive/Host.cs

@@ -67,15 +67,22 @@ private static void CurrentDomainOnUnhandledException(object sender, UnhandledEx
         {
             if (e.ExceptionObject is Exception error)
             {
-                Root.Log.Error(ErrorId.Exception, error);    
+                Root.Log.Error(ErrorId.Exception, error);
             }
             else
             {
                 Root.Log.Error(ErrorId.Exception, [new Text(e.ExceptionObject.ToString() ?? "Unhandled exception.", Color.Error)]);
             }
 
             Finish();
-            System.Environment.Exit(1);
+
+            var exitCode = 1;
+            if (e.ExceptionObject is ProcessTerminationException processTermination)
+            {
+                exitCode = processTermination.ExitCode;
+            }
+
+            System.Environment.Exit(exitCode);
         }
         catch
         {
@@ -136,7 +143,7 @@ public static T EnsureSuccess<T>(
                 Root.Log.Error(ErrorId.Build, $"{result}.");
                 if (failureExitCode.HasValue)
                 {
-                    System.Environment.Exit(failureExitCode.Value);
+                    throw new ProcessTerminationException(failureExitCode.Value);
                 }
 
                 return result;

Samples/MySampleLib/Build/Program.cs

@@ -10,9 +10,18 @@
     .RunAsync()
     .EnsureSuccess();
 
-new DotNetTest()
-    .WithShortName("Tests")
-    .WithNoBuild(true)
-    .WithConfiguration(configuration)
-    .Build()
-    .EnsureSuccess();
+await EunTestsAsync();
+
+async Task EunTestsAsync()
+{
+    await Task.Delay(100);
+
+    await new DotNetTest()
+        .WithShortName("Tests")
+        .WithNoBuild(true)
+        .WithConfiguration(configuration)
+        .BuildAsync()
+        .EnsureSuccess();
+
+    await Task.Delay(100);
+}