Add support for UEFI

source/Cosmos.Build.Tasks/IL2CPU.cs

@@ -76,7 +76,7 @@ public IL2CPU()
 
         protected override string GenerateFullPathToTool()
         {
-            if (String.IsNullOrWhiteSpace(ToolPath))
+            if (string.IsNullOrWhiteSpace(ToolPath))
             {
                 return Path.Combine(CosmosBuildDir, IsWindows() ? @"IL2CPU\IL2CPU.exe" : "IL2CPU/IL2CPU");
             }

source/Cosmos.Build.Tasks/LimineDeploy.cs

@@ -14,18 +14,19 @@ public class LimineDeploy : ToolTask
     [Required]
     public string LimineIsoFile { get; set; }
 
-    protected override string ToolName => IsWindows() ? "limine-deploy.exe" : "limine-deploy";
+    protected override string ToolName => IsWindows() ? "limine.exe" : "limine";
 
     protected override string GenerateFullPathToTool()
     {
-        return String.IsNullOrWhiteSpace(ToolExe) ? null : Path.Combine(String.IsNullOrWhiteSpace(ToolPath) ? Directory.GetCurrentDirectory() : Path.GetFullPath(ToolPath), ToolExe);
+        return string.IsNullOrWhiteSpace(ToolExe) ? null : Path.Combine(string.IsNullOrWhiteSpace(ToolPath) ? Directory.GetCurrentDirectory() : Path.GetFullPath(ToolPath), ToolExe);
     }
 
     protected override string GenerateCommandLineCommands()
     {
-        var xBuilder = new CommandLineBuilder();
-        xBuilder.AppendSwitch($"{IsoFile}");
+        CommandLineBuilder xBuilder = new();
+        xBuilder.AppendSwitch($"bios-install");
+        xBuilder.AppendFileNameIfNotNull($"{IsoFile}");
 
         return xBuilder.ToString();
     }
-}
+}

source/Cosmos.Build.Tasks/MakeIso.cs

@@ -66,10 +66,13 @@ protected override string GenerateCommandLineCommands()
             xBuilder.AppendSwitch("-R");
             xBuilder.AppendSwitch("-l");
             xBuilder.AppendSwitchIfNotNull("-o ", OutputFile);
-            xBuilder.AppendSwitch(" -b boot/limine-cd.bin");
+            xBuilder.AppendSwitch(" -b boot/limine-bios-cd.bin");
             xBuilder.AppendSwitch("-no-emul-boot");
             xBuilder.AppendSwitch("-boot-load-size 4");
-            xBuilder.AppendSwitch("-boot-info-table");
+            xBuilder.AppendSwitch("-boot-info-table");
+            xBuilder.AppendSwitch("--efi-boot boot/limine-uefi-cd.bin");
+            xBuilder.AppendSwitch("-efi-boot-part");
+            xBuilder.AppendSwitch("--efi-boot-image");
             xBuilder.AppendFileNameIfNotNull(IsoDirectory.TrimEnd('\\', '/'));
 
             Log.LogMessage(MessageImportance.High, xBuilder.ToString());

source/Cosmos.Build.Tasks/build/Cosmos.Build.targets

@@ -350,8 +350,9 @@
         </ItemGroup>
 
         <ItemGroup>
-            <_IsoFile Include="$(LiminePath)boot\limine-cd.bin" />
-            <_IsoFile Include="$(LiminePath)boot\limine.sys" />
+            <_IsoFile Include="$(LiminePath)boot\limine-uefi-cd.bin" />
+            <_IsoFile Include="$(LiminePath)boot\limine-bios-cd.bin" />
+            <_IsoFile Include="$(LiminePath)boot\limine-bios.sys" />
             <_IsoFile Include="$(LiminePath)boot\liminewp.bmp" />
         </ItemGroup>
 
@@ -366,7 +367,12 @@
 
         <Copy SourceFiles="@(_IsoFile)"
               DestinationFolder="$(IntermediateIsoDirectory)\boot\" />
-
+
+        <Copy SourceFiles="$(LiminePath)EFI\boot\BOOTAA64.EFI" DestinationFolder="$(IntermediateIsoDirectory)\EFI\boot\" />
+        <Copy SourceFiles="$(LiminePath)EFI\boot\BOOTIA32.EFI" DestinationFolder="$(IntermediateIsoDirectory)\EFI\boot\" />
+        <Copy SourceFiles="$(LiminePath)EFI\boot\BOOTRISCV64.EFI" DestinationFolder="$(IntermediateIsoDirectory)\EFI\boot\" />
+        <Copy SourceFiles="$(LiminePath)EFI\boot\BOOTX64.EFI" DestinationFolder="$(IntermediateIsoDirectory)\EFI\boot\" />
+
         <Copy SourceFiles="@(_IsoCustomFiles)"
               DestinationFolder="$(IntermediateIsoDirectory)%(RecursiveDir)"
 			        SkipUnchangedFiles="true"