Avoid cancellation exception on task completion

bonsai-rx · Feb 24, 2024 · dc078c4 · dc078c4
1 parent 6ae3248
commit dc078c4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Bonsai.Configuration/Bonsai.Configuration.csproj b/Bonsai.Configuration/Bonsai.Configuration.csproj
@@ -4,7 +4,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>2.8.1</VersionPrefix>
+    <VersionPrefix>2.8.2</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bonsai.NuGet\Bonsai.NuGet.csproj" />

diff --git a/Bonsai.Configuration/ConsoleBootstrapper.cs b/Bonsai.Configuration/ConsoleBootstrapper.cs
@@ -15,17 +15,19 @@ public ConsoleBootstrapper(string path)
 
         protected override async Task RunPackageOperationAsync(Func<Task> operationFactory)
         {
-            await operationFactory().ContinueWith(task =>
+            try { await operationFactory(); }
+            catch (Exception ex)
             {
-                if (task.Exception is AggregateException ex)
+                if (ex is AggregateException aex)
                 {
-                    foreach (var error in ex.InnerExceptions)
+                    foreach (var error in aex.InnerExceptions)
                     {
                         PackageManager.Logger.LogError(error.Message);
                     }
                 }
-                else PackageManager.Logger.LogError(task.Exception.Message);
-            }, TaskContinuationOptions.OnlyOnFaulted);
+                else PackageManager.Logger.LogError(ex.Message);
+                throw;
+            }
         }
     }
 }
diff --git a/Bonsai.Player/Bonsai.Player.csproj b/Bonsai.Player/Bonsai.Player.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl></PackageIconUrl>
-    <VersionPrefix>2.8.1</VersionPrefix>
+    <VersionPrefix>2.8.2</VersionPrefix>
     <PackAsTool>true</PackAsTool>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Bonsai/Bonsai.csproj b/Bonsai/Bonsai.csproj
@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <UseWindowsForms>true</UseWindowsForms>
     <TargetFramework>net48</TargetFramework>
-    <VersionPrefix>2.8.1</VersionPrefix>
+    <VersionPrefix>2.8.2</VersionPrefix>
     <OutputType>Exe</OutputType>
     <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
     <ApplicationIcon>..\Bonsai.Editor\Bonsai.ico</ApplicationIcon>

diff --git a/Bonsai32/Bonsai32.csproj b/Bonsai32/Bonsai32.csproj
@@ -9,7 +9,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x86</PlatformTarget>
-    <VersionPrefix>2.8.1</VersionPrefix>
+    <VersionPrefix>2.8.2</VersionPrefix>
     <OutputType>Exe</OutputType>
     <OutputPath>..\Bonsai\bin\$(Configuration)\</OutputPath>
     <ApplicationIcon>..\Bonsai.Editor\Bonsai.ico</ApplicationIcon>