Merge pull request #242 from WildernessLabs/develop

RC2-1
WildernessLabs · Jan 2, 2023 · bad57e2 · bad57e2
2 parents 9c518f3 + 6250a08
commit bad57e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/source/Meadow.Core/MeadowOS.cs b/source/Meadow.Core/MeadowOS.cs
@@ -62,8 +62,13 @@ public async static Task Main(string[] _)
                     Resolver.Log.Trace("Running App");
                     await App.Run();
 
+                    while (!AppAbort.IsCancellationRequested)
+                    {
+                        await Task.Delay(500);
+                    }
+
                     // the user's app has exited, which is almost certainly not intended
-                    Resolver.Log.Warn("App.Run has exited normally");
+                    Resolver.Log.Warn("AppAbort cancellation has been requested");
                 }
                 catch (Exception e)
                 {

diff --git a/source/Meadow.Core/Update/UpdateService.cs b/source/Meadow.Core/Update/UpdateService.cs
@@ -408,7 +408,8 @@ public void ApplyUpdate(UpdateInfo updateInfo)
             var shutdownTimeoutTask = Task.Delay(TimeSpan.FromSeconds(5));
             var shutDownTask = Resolver.App?.OnShutdown();
 
-            // TODO: cancel the app run cancellation token
+            // cancel the app run cancellation token
+            MeadowOS.AppAbort.Cancel();
 
             // wait for the app to return, or the timeout
             Task.WaitAny(shutDownTask, shutdownTimeoutTask);

diff --git a/source/Meadow.F7/Meadow.F7.csproj b/source/Meadow.F7/Meadow.F7.csproj
@@ -25,7 +25,7 @@
    <Compile Remove="Devices\Esp32Coprocessor\Esp32Coprocessor_WiredNetworkAdapter.cs" />
  </ItemGroup>
 	<ItemGroup>
-		<None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
+	  <None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
 	</ItemGroup>
 	<ItemGroup>
 	  <PackageReference Include="Meadow" Version="0.*" />