imp - Enter contextual reflection upon booting

--- We need to actually make the load contexts useful. --- Type: imp Breaking: False Doc Required: False Part: 1/1
Aptivi-Archives · Mar 10, 2024 · 1d0c50a · 1d0c50a
1 parent 84de368
commit 1d0c50a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/GRILO.Bootloader/Boot/Apps/BootAppInfo.cs b/GRILO.Bootloader/Boot/Apps/BootAppInfo.cs
@@ -18,6 +18,7 @@
 //
 
 using GRILO.Boot;
+using GRILO.Bootloader.Boot.Apps.Marshaling;
 using GRILO.Bootloader.Boot.Diagnostics;
 
 namespace GRILO.Bootloader.Boot.Apps
@@ -27,6 +28,9 @@ namespace GRILO.Bootloader.Boot.Apps
     /// </summary>
     public class BootAppInfo
     {
+#if NET6_0_OR_GREATER
+        internal BootLoadContext context;
+#endif
 
         /// <summary>
         /// Bootable file path

diff --git a/GRILO.Bootloader/Boot/Apps/BootManager.cs b/GRILO.Bootloader/Boot/Apps/BootManager.cs
@@ -160,6 +160,7 @@ public static void PopulateBootApps()
                                         bootOverrideTitle = metadata["OverrideTitle"]?.ToString() ?? bootable.Title ?? asm.GetName().Name;
                                         bootArgs = metadata["Arguments"]?.ToObject<string[]>() ?? Array.Empty<string>();
                                         bootApp = new(bootFile, bootOverrideTitle, bootArgs, bootable);
+                                        bootApp.context = bootContext;
                                         bootApps.Add(bootOverrideTitle, bootApp);
                                     }
                                 }

diff --git a/GRILO.Bootloader/Common/BootloaderMain.cs b/GRILO.Bootloader/Common/BootloaderMain.cs
@@ -192,7 +192,14 @@ Controls defined by custom boot style
                     ScreenTools.Render();
                     bootloaderScreen.RequireRefresh();
                     bootloaderScreen.RemoveBufferedPart("Post-Bootloader Screen");
+#if NET6_0_OR_GREATER
+                    using (chosenBootApp.context.EnterContextualReflection())
+                    {
+                        chosenBootApp.Bootable.Boot(chosenBootApp.Arguments);
+                    }
+#else
                     chosenBootApp.Bootable.Boot(chosenBootApp.Arguments);
+#endif
 
                     shutdownRequested = chosenBootApp.Bootable.ShutdownRequested;
                     DiagnosticsWriter.WriteDiag(DiagnosticsLevel.Info, "Boot app done and shutdown requested is {0}", shutdownRequested);