Remove macOS staging directory requirement, and update to .NET 8.0 (#41)

* Code cleanup and update to .NET 8

* Fix macOS requiring staging directory to be selected.
Also places eboots on Desktop on macos, to avoid them being inside the app bundle.

* Fix keys discovery on mac

* Removed debug logging, made GetExecutablePath more robust.

* Created a script for building on mac, as creating a universal binary is somewhat involved

* Update UnionPatcher.Gui/Forms/ModeSelectionForm.cs

Co-authored-by: sudokoko <koko@sudokoko.xyz>

* Apply suggestions from code review

Co-authored-by: Josh <josh@slendy.pw>

---------

Co-authored-by: sudokoko <koko@sudokoko.xyz>
Co-authored-by: Josh <josh@slendy.pw>

.github/workflows/build.yml

@@ -14,17 +14,17 @@ jobs:
       fail-fast: false
       matrix: 
         os:
-          - { prettyName: Windows, platform: windows-latest, configurationName: Windows, extraArgs: "", buildPath: "Release/net6.0-windows/publish"}
-          - { prettyName: Linux, platform: ubuntu-latest, configurationName: Linux, extraArgs: "", buildPath: "Release/net6.0/publish"}
+          - { prettyName: Windows, platform: windows-latest, configurationName: Windows, extraArgs: "", buildPath: "Release/net8.0-windows/publish"}
+          - { prettyName: Linux, platform: ubuntu-latest, configurationName: Linux, extraArgs: "", buildPath: "Release/net8.0/publish"}
 #          - { prettyName: MacOS, platform: ubuntu-latest, configurationName: Release, platform: osx-x64 }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install .NET 6.0
+      - name: Install .NET 8.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
           
       - name: Compile for ${{ matrix.os.prettyName }}
         run: dotnet publish -c ${{ matrix.os.configurationName }} ${{ matrix.os.extraArgs }}

UnionPatcher.Cli/UnionPatcher.Cli.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>UnionPatcher</AssemblyName>

UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.Linux</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.Linux</RootNamespace>

UnionPatcher.Gui.MacOS/Info.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleIdentifier</key>
+    <string>com.lbpunion.unionpatcher</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright LBP Union 2024©</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleIconFile</key>
+    <string>Icon.icns</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>CFBundleName</key>
+    <string>UnionPatcher</string>
+    <key>CFBundleExecutable</key>
+    <string>LBPUnion.UnionPatcher.Gui.MacOS</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.14</string>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <string>False</string>
+  </dict>
+</plist>

UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj

@@ -2,11 +2,13 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.MacOS</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.MacOS</RootNamespace>
         <ApplicationIcon>Icon64.ico</ApplicationIcon>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
 
     <ItemGroup>

UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.Windows</RootNamespace>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.Windows</AssemblyName>
         <ApplicationIcon>Icon64.ico</ApplicationIcon>

UnionPatcher.Gui/Forms/FilePatchForm.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Text.RegularExpressions;
 using Eto;
 using Eto.Drawing;
 using Eto.Forms;
@@ -49,7 +50,7 @@ public class FilePatchForm : Form {
             Rows = {
                 new TableRow(
                     new TableCell(new Label { Text = "EBOOT.elf: ", VerticalAlignment = VerticalAlignment.Center }),
-                    new TableCell(this.filePicker = new FilePicker { TabIndex = 0 })
+                    new TableCell(this.filePicker = new FilePicker { TabIndex = 0 , FileAction = FileAction.OpenFile, Filters = { new FileFilter("ELF files", "*.elf", "*.ELF"), new FileFilter("All Files", "*.*") }})
                 ),
                 new TableRow(
                     new TableCell(new Label { Text = "Server URL: ", VerticalAlignment = VerticalAlignment.Center }),
@@ -57,7 +58,7 @@ public class FilePatchForm : Form {
                 ),
                 new TableRow(
                     new TableCell(new Label { Text = "Output filename: ", VerticalAlignment = VerticalAlignment.Center }),
-                    new TableCell(this.outputFileName = new FilePicker { TabIndex = 2, FileAction = FileAction.SaveFile })
+                    new TableCell(this.outputFileName = new FilePicker { TabIndex = 2, FileAction = FileAction.SaveFile,  Filters = { new FileFilter("ELF files", "*.elf", "*.ELF"), new FileFilter("All Files", "*.*") }})
                 ),
                 new TableRow(
                     new TableCell(this.CreateHelpButton(4)),
@@ -73,46 +74,54 @@ public class FilePatchForm : Form {
 
     private void Patch() {
         if(string.IsNullOrWhiteSpace(this.filePicker.FilePath)) {
-            Gui.CreateOkDialog("Form Error", "No file specified!").ShowModal();
+            Gui.CreateOkDialog("Form Error", "No file specified!");
             return;
         }
 
         if(string.IsNullOrWhiteSpace(this.serverUrl.Text)) {
-            Gui.CreateOkDialog("Form Error", "No server URL specified!").ShowModal();
+            Gui.CreateOkDialog("Form Error", "No server URL specified!");
             return;
         }
 
         if(string.IsNullOrWhiteSpace(this.outputFileName.FilePath)) {
-            Gui.CreateOkDialog("Form Error", "No output file specified!").ShowModal();
+            Gui.CreateOkDialog("Form Error", "No output file specified!");
             return;
         }
 
         if(this.filePicker.FilePath == this.outputFileName.FilePath) {
-            Gui.CreateOkDialog("Form Error", "Input and output filename are the same! Please save the patched file with a different name so you have a backup of your the original EBOOT.ELF.").ShowModal();
+            Gui.CreateOkDialog("Form Error", "Input and output filename are the same! Please save the patched file with a different name so you have a backup of your the original EBOOT.ELF.");
             return;
         }
 
         if(!Uri.TryCreate(this.serverUrl.Text, UriKind.Absolute, out _)) {
-            Gui.CreateOkDialog("Form Error", "Server URL is invalid! Please enter a valid URL.").ShowModal();
+            Gui.CreateOkDialog("Form Error", "Server URL is invalid! Please enter a valid URL.");
             return;
         }
+
+        if(!Regex.IsMatch(this.serverUrl.Text, "LITTLEBIGPLANETPS3_XML")) {
+            bool userCertain = Gui.CreateConfirmationDialog("URL Mistype", $"Server URL {this.serverUrl.Text} does not match LITTLEBIGPLANETPS3_XML, are you sure you want to use this?");
+            if (!userCertain) {
+                return;
+            }
+            // else, godspeed, captain 
+        }
             
         // Validate EBOOT after validating form; more expensive
 
         ElfFile eboot = new(this.filePicker.FilePath);
 
         if(eboot.IsValid == false) {
-            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} is not a valid ELF file (magic number mismatch)\n" + "The EBOOT must be decrypted before using this tool").ShowModal();
+            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} is not a valid ELF file (magic number mismatch)\n" + "The EBOOT must be decrypted before using this tool");
             return;
         }
 
         if(eboot.Is64Bit == null) {
-            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} does not target a valid system").ShowModal();
+            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} does not target a valid system");
             return;
         }
 
         if(string.IsNullOrWhiteSpace(eboot.Architecture)) {
-            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} does not target a valid architecture (PowerPC or ARM)").ShowModal();
+            Gui.CreateOkDialog("EBOOT Error", $"{eboot.Name} does not target a valid architecture (PowerPC or ARM)");
             return;
         }
 
@@ -120,10 +129,10 @@ public class FilePatchForm : Form {
             Patcher.PatchFile(this.filePicker.FilePath, this.serverUrl.Text, this.outputFileName.FilePath);
         }
         catch(Exception e) {
-            Gui.CreateOkDialog("Error occurred while patching", "An error occured while patching:\n" + e).ShowModal();
+            Gui.CreateOkDialog("Error occurred while patching", "An error occured while patching:\n" + e);
             return;
         }
 
-        Gui.CreateOkDialog("Success!", "The Server URL has been patched to " + this.serverUrl.Text).ShowModal();
+        Gui.CreateOkDialog("Success!", "The Server URL has been patched to " + this.serverUrl.Text);
     }
-}
+}

UnionPatcher.Gui/Forms/ModeSelectionForm.cs

@@ -1,8 +1,12 @@
 using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using Eto;
 using Eto.Drawing;
 using Eto.Forms;
 
-namespace LBPUnion.UnionPatcher.Gui.Forms; 
+namespace LBPUnion.UnionPatcher.Gui.Forms;
 
 public class ModeSelectionForm : Form {
     #region UI
@@ -23,10 +27,32 @@ public class ModeSelectionForm : Form {
                     new TableCell(new Button(openFilePatcher) { Text = "File Patch (PS3/RPCS3)" })
                 ),
             },
-        }; 
+        };
     }
-    
-    private void openRemotePatcher(object sender, EventArgs e) {
+
+    private void openRemotePatcher(object sender, EventArgs e)
+    {
+        // If we're on macOS then set the CWD to the app bundle MacOS folder, so that SCETool can be found.
+        if (OSUtil.GetPlatform() == OSPlatform.OSX) Directory.SetCurrentDirectory(OSUtil.GetExecutablePath());
+        
+        if (!Directory.Exists($"{OSUtil.GetExecutablePath()}/scetool"))
+        {
+            // This will always occur on macOS, so don't show this message for macOS users.
+            if (OSUtil.GetPlatform() != OSPlatform.OSX) Gui.CreateOkDialog("Workaround Triggered", ".NET could not locate the required files, triggering workaround.");
+            Gui.CreateOkDialog("Workaround", "UnionPatcher RemotePatcher requires a staging folder on macOS or in special circumstances on Windows, please set this to the directory of the UnionPatcher app or executable!");
+            SelectFolderDialog dialog = new SelectFolderDialog();
+            if (dialog.ShowDialog(this) != DialogResult.Ok)
+            {
+                Gui.CreateOkDialog("Workaround", "User did not specify a staging folder, aborting!");
+                return;
+            }
+            Directory.SetCurrentDirectory(dialog.Directory);
+            if (!Directory.Exists("scetool"))
+            {
+                Gui.CreateOkDialog("Workaround", "Invalid folder, remember to set the folder to the directory of the UnionPatcher app or executable!");
+                return;
+            } 
+        }
         RemotePatchForm rpForm = new RemotePatchForm();
         rpForm.Show();
         rpForm.Closed += OnSubFormClose;

UnionPatcher.Gui/Forms/RemotePatchForm.cs

@@ -34,25 +34,25 @@ public class RemotePatchForm : Form
         control.Click += delegate {
             if (string.IsNullOrEmpty(this.ps3LocalIP.Text))
             {
-                Gui.CreateOkDialog("Error", "No PS3 IP address specified!").ShowModal();
+                Gui.CreateOkDialog("Error", "No PS3 IP address specified!");
                 return;
             }
 
             if (string.IsNullOrEmpty(this.lbpGameID.Text))
             {
-                Gui.CreateOkDialog("Error", "No title ID specified!").ShowModal();
+                Gui.CreateOkDialog("Error", "No title ID specified!");
                 return;
             }
 
             if (string.IsNullOrEmpty(this.serverUrl.Text))
             {
-                Gui.CreateOkDialog("Error", "No server URL specified!").ShowModal();
+                Gui.CreateOkDialog("Error", "No server URL specified!");
                 return;
             }
                 
             if (!Uri.TryCreate(this.serverUrl.Text, UriKind.Absolute, out _))
             {
-                Gui.CreateOkDialog("Error", "Server URL is invalid! Please enter a valid URL.").ShowModal();
+                Gui.CreateOkDialog("Error", "Server URL is invalid! Please enter a valid URL.");
                 return;
             }
 
@@ -69,11 +69,11 @@ public class RemotePatchForm : Form
             }
             catch (Exception e)
             {
-                Gui.CreateOkDialog("Error occurred while patching", "An error occured while patching:\n" + e).ShowModal();
+                Gui.CreateOkDialog("Error occurred while patching", "An error occured while patching:\n" + e);
                 return;
             }
 
-            Gui.CreateOkDialog("Success!", $"The Server URL for {this.lbpGameID.Text} on the PS3 at {this.ps3LocalIP.Text} has been patched to {this.serverUrl.Text}").ShowModal();
+            Gui.CreateOkDialog("Success!", $"The Server URL for {this.lbpGameID.Text} on the PS3 at {this.ps3LocalIP.Text} has been patched to {this.serverUrl.Text}");
         };
 
         return control;
@@ -91,13 +91,13 @@ public class RemotePatchForm : Form
         control.Click += delegate {
             if (string.IsNullOrEmpty(this.ps3LocalIP.Text))
             {
-                Gui.CreateOkDialog("Form Error", "No PS3 IP address specified!").ShowModal();
+                Gui.CreateOkDialog("Form Error", "No PS3 IP address specified!");
                 return;
             }
 
             if (string.IsNullOrEmpty(this.lbpGameID.Text))
             {
-                Gui.CreateOkDialog("Form Error", "No game ID specified!").ShowModal();
+                Gui.CreateOkDialog("Form Error", "No game ID specified!");
                 return;
             }
                 
@@ -107,11 +107,11 @@ public class RemotePatchForm : Form
             }
             catch (Exception e)
             {
-                Gui.CreateOkDialog("Error occurred while reverting EBOOT", "An error occured while patching:\n" + e).ShowModal();
+                Gui.CreateOkDialog("Error occurred while reverting EBOOT", "An error occured while patching:\n" + e);
                 return;
             }
 
-            Gui.CreateOkDialog("Success!", $"UnionRemotePatcher reverted your the EBOOT for {this.lbpGameID.Text} to stock. You're ready to patch your EBOOT again.").ShowModal();
+            Gui.CreateOkDialog("Success!", $"UnionRemotePatcher reverted your the EBOOT for {this.lbpGameID.Text} to stock. You're ready to patch your EBOOT again.");
         };
 
         return control;

UnionPatcher.Gui/Gui.cs

@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
+using Eto.Forms;
 using LBPUnion.UnionPatcher.Gui.Forms;
 
 namespace LBPUnion.UnionPatcher.Gui; 
@@ -9,39 +8,11 @@ public static class Gui {
         new Application().Run(new ModeSelectionForm());
     }
 
-    public static Dialog CreateOkDialog(string title, string errorMessage) {
-        DynamicLayout layout = new();
-        Button button;
-
-        layout.Spacing = new Size(5, 5);
-        layout.MinimumSize = new Size(350, 100);
-
-        layout.BeginHorizontal();
-        layout.Add(new Label {
-            Text = errorMessage,
-        });
-
-        layout.BeginHorizontal();
-        layout.BeginVertical();
-        layout.Add(null);
-        layout.Add(button = new Button {
-            Text = "OK",
-        });
-
-        layout.EndVertical();
-        layout.EndHorizontal();
-        layout.EndHorizontal();
-
-        Dialog dialog = new() {
-            Content = layout,
-            Padding = new Padding(10, 10, 10, 10),
-            Title = title,
-        };
-
-        button.Click += delegate {
-            dialog.Close();
-        };
-
-        return dialog;
+    public static void CreateOkDialog(string title, string errorMessage) {
+        MessageBox.Show(errorMessage, title, MessageBoxButtons.OK);
+    }
+    public static bool CreateConfirmationDialog(string title, string errorMessage) {
+        DialogResult result = MessageBox.Show(errorMessage, title, MessageBoxButtons.YesNo, MessageBoxType.Question);
+        return result == DialogResult.Yes;
     }
 }

UnionPatcher.Gui/UnionPatcher.Gui.csproj

@@ -7,11 +7,11 @@
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

UnionPatcher/OSUtil.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 namespace LBPUnion.UnionPatcher
@@ -29,6 +32,17 @@ namespace LBPUnion.UnionPatcher
             return EnumeratePlatforms().FirstOrDefault(p
                => RuntimeInformation.IsOSPlatform(p.Value.RuntimePlatform))?.Platform ?? default;
         }
+
+        public static string GetExecutablePath()
+        {
+            var path = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+            if (string.IsNullOrEmpty(path))
+                path = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName);
+            if (string.IsNullOrEmpty(path))
+                path = AppContext.BaseDirectory;
+            
+            return path;
+        }
     }
 }
 

UnionPatcher/Patcher.cs

@@ -1,37 +1,11 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace LBPUnion.UnionPatcher; 
 
 public static class Patcher {
-    private static readonly string[] toBePatched = {
-        // Normal LittleBigPlanet gameserver URLs
-        "https://littlebigplanetps3.online.scee.com:10061/LITTLEBIGPLANETPS3_XML",
-        "http://littlebigplanetps3.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        // LittleBigPlanet 3 Presence URLs
-        "http://live.littlebigplanetps3.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        "http://presence.littlebigplanetps3.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        #region Spinoff URLs
-        // LittleBigPlanet PSP URLs
-        "http://lbppsp.online.scee.com:10060/LITTLEBIGPLANETPSP_XML",
-        "https://lbppsp.online.scee.com:10061/LITTLEBIGPLANETPSP_XML",
-        // LittleBigPlanet Vita URLs
-        "http://lbpvita.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        "https://lbpvita.online.scee.com:10061/LITTLEBIGPLANETPS3_XML",
-        #endregion
-        #region Beta URLS
-        // LittleBigPlanet 2 Beta URLs
-        "http://lbp2ps3-beta.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        "https://lbp2ps3-beta.online.scee.com:10061/LITTLEBIGPLANETPS3_XML",
-        // LittleBigPlanet (3?) Beta URLs
-        "http://littlebigplanetps3-beta.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        "https://littlebigplanetps3-beta.online.scee.com:10061/LITTLEBIGPLANETPS3_XML",
-        // LittleBigPlanet Vita Beta URLs
-        "http://lbpvita-beta.online.scee.com:10060/LITTLEBIGPLANETPS3_XML",
-        "https://lbpvita-beta.online.scee.com:10061/LITTLEBIGPLANETPS3_XML",
-        #endregion
-    };
 
     public static void PatchFile(string fileName, Uri serverUrl, string outputFileName) {
         PatchFile(fileName, serverUrl.ToString(), outputFileName);
@@ -72,13 +46,18 @@ public static class Patcher {
         byte[] serverUrlAsBytes = Encoding.ASCII.GetBytes(serverUrl);
 
         bool wroteUrl = false;
-        foreach(string url in toBePatched) {
-            if(serverUrl.Length > url.Length) {
-                throw new ArgumentOutOfRangeException(nameof(serverUrl), $"Server URL ({serverUrl.Length} characters long) is above maximum length {url.Length}");
+
+        // Find a string including http or https and LITTLEBIGPLANETPS3_XML or LITTLEBIGPLANETPSP_XML, 
+        // then match any additional NULL characters to dynamically gague the maximum length on a per-title basis 
+        // without a hardcoded array of known server URLs
+        MatchCollection urls = Regex.Matches(dataAsString, "http?[^\x00]*?LITTLEBIGPLANETPS(3|P)_XML\x00*");
+        foreach(Match urlMatch in urls) {
+            string url = urlMatch.Value;
+
+            if(serverUrl.Length > url.Length - 1) {
+                throw new ArgumentOutOfRangeException(nameof(serverUrl), $"Server URL ({serverUrl.Length} characters long) is above maximum length {url.Length - 1}");
             }
-                
-            int offset = dataAsString.IndexOf(url, StringComparison.Ordinal);
-            if(offset < 1) continue;
+            int offset = urlMatch.Index;
 
             writer.BaseStream.Position = offset;
             for(int i = 0; i < url.Length; i++) {

UnionPatcher/RemotePatch.cs

@@ -91,16 +91,23 @@ public class RemotePatch
     {
         Console.WriteLine("Restoring original EBOOT.BIN from EBOOT.BIN.BAK");
         
+        string workingDir = ".";
+        if (OSUtil.GetPlatform() == OSPlatform.OSX)
+        {
+            workingDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)}/UnionPatcher";
+            Directory.CreateDirectory(workingDir);
+        }
+        
         // Create a simple directory structure
-        Directory.CreateDirectory(@"eboot");
-        Directory.CreateDirectory($@"eboot/{gameID}");
-        Directory.CreateDirectory($@"eboot/{gameID}/original");
+        Directory.CreateDirectory($@"{workingDir}/eboot");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original");
         
         // Now we'll check and see if a backup exists on the server, if so download it and then upload it back as EBOOT.BIN
         if (FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass))
         {
-            FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", @$"eboot/{gameID}/original/EBOOT.BIN.BAK", user, pass);
-            FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN.BAK", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass);
+            FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN.BAK", user, pass);
+            FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN.BAK", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass);
         }
         else
         {
@@ -111,6 +118,13 @@ public class RemotePatch
     public void PSNEBOOTRemotePatch(string ps3ip, string gameID, string serverURL, string user, string pass)
     {
         Console.WriteLine("Detected Digital Copy - Running in Full Mode");
+
+        string workingDir = ".";
+        if (OSUtil.GetPlatform() == OSPlatform.OSX)
+        {
+            workingDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)}/UnionPatcher";
+            Directory.CreateDirectory(workingDir);
+        }
         
         string idps = "";
         string contentID = "";
@@ -121,25 +135,25 @@ public class RemotePatch
         this._ps3Mapi.PS3.Notify("UnionRemotePatcher Connected! Patching...");
 
         // Create simple directory structure
-        Directory.CreateDirectory(@"rifs");
-        Directory.CreateDirectory(@"eboot");
-        Directory.CreateDirectory($@"eboot/{gameID}");
-        Directory.CreateDirectory($@"eboot/{gameID}/original");
-        Directory.CreateDirectory($@"eboot/{gameID}/patched");
+        Directory.CreateDirectory($@"{workingDir}/rifs");
+        Directory.CreateDirectory($@"{workingDir}/eboot");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/patched");
 
         // Let's grab and backup our EBOOT
         FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN",
-            @$"eboot/{gameID}/original/EBOOT.BIN", user, pass);
+            @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", user, pass);
 
         // Now we'll check and see if a backup exists on the server or not, if we don't have one on the server, then upload one
         if (!FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass))
-            FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN",
+            FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN",
                 $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass);
 
         // Start getting idps and act.dat - these will help us decrypt a PSN eboot
         idps = PS3MAPI.PS3MAPIClientServer.PS3_GetIDPS();
 
-        File.WriteAllBytes(@"data/idps", IDPSHelper.StringToByteArray(idps));
+        File.WriteAllBytes($@"data/idps", IDPSHelper.StringToByteArray(idps));
 
         // Scan the users on the system
         users = GetUsers(ps3ip, user, pass);
@@ -153,12 +167,12 @@ public class RemotePatch
                              $"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/", user, pass))
                     if (fileName.Contains(gameID))
                     {
-                        FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/act.dat", @"data/act.dat",
+                        FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/act.dat", $@"{workingDir}/data/act.dat",
                             user,
                             pass);
                         
                         FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/{fileName}",
-                            @$"rifs/{fileName}", user, pass);
+                            @$"{workingDir}/rifs/{fileName}", user, pass);
                         
                         contentID = fileName.Substring(0, fileName.Length - 4);
                         
@@ -168,10 +182,10 @@ public class RemotePatch
         }
 
         // Finally, let's decrypt the EBOOT.BIN
-        LaunchSCETool($" -v -d \"{Path.GetFullPath(@$"eboot/{gameID}/original/EBOOT.BIN")}\" \"{Path.GetFullPath(@$"eboot/{gameID}/original/EBOOT.ELF")}\"");
+        LaunchSCETool($" -v -d \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN")}\" \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/original/EBOOT.ELF")}\"");
 
         // Now, patch the EBOOT;
-        Patcher.PatchFile($"eboot/{gameID}/original/EBOOT.ELF", serverURL, $"eboot/{gameID}/patched/EBOOT.ELF");
+        Patcher.PatchFile($"{workingDir}/eboot/{gameID}/original/EBOOT.ELF", serverURL, $"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF");
 
         // Encrypt the EBOOT (PSN)
         LaunchSCETool($"--verbose " +
@@ -191,10 +205,10 @@ public class RemotePatch
                       $" --np-app-type=SPRX" +
                       $" --np-content-id={contentID}" +
                       $" --np-real-fname=EBOOT.BIN" +
-                      $" --encrypt eboot/{gameID}/patched/EBOOT.ELF eboot/{gameID}/patched/EBOOT.BIN");
+                      $" --encrypt {workingDir}/eboot/{gameID}/patched/EBOOT.ELF {workingDir}/eboot/{gameID}/patched/EBOOT.BIN");
 
         // And upload the encrypted, patched EBOOT to the system.
-        FTP.UploadFile(@$"eboot/{gameID}/patched/EBOOT.BIN",
+        FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN",
             $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass);
     }
 
@@ -203,38 +217,45 @@ public class RemotePatch
     {
         Console.WriteLine("Detected Disc Copy - Running in Simplified Mode");
         
+        string workingDir = ".";
+        if (OSUtil.GetPlatform() == OSPlatform.OSX)
+        {
+            workingDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)}/UnionPatcher";
+            Directory.CreateDirectory(workingDir);
+        }
+        
         // Create a simple directory structure
-        Directory.CreateDirectory(@"eboot");
-        Directory.CreateDirectory($@"eboot/{gameID}");
-        Directory.CreateDirectory($@"eboot/{gameID}/original");
-        Directory.CreateDirectory($@"eboot/{gameID}/patched");
+        Directory.CreateDirectory($@"{workingDir}/eboot");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original");
+        Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/patched");
 
         // Let's grab and backup our EBOOT
         FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN",
-            @$"eboot/{gameID}/original/EBOOT.BIN", user, pass);
+            @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", user, pass);
 
         // Now we'll check and see if a backup exists on the server or not, if we don't have one on the server, then upload one
         if (!FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass))
-            FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN",
+            FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN",
                 $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass);
 
         // Check for keys in the data directory
-        if (!File.Exists("data/keys"))
+        if (!File.Exists($"./data/keys"))
             throw new FileNotFoundException(
                 "UnionRemotePatcher cannot find the keys, ldr_curves, or vsh_curves files required to continue. Please make sure you have copies of these files placed in the data directory where you found the executable to run UnionRemotePatcher. Without them, we can't patch your game.");
 
         // Decrypt the EBOOT
-        LaunchSCETool($"-v -d eboot/{gameID}/original/EBOOT.BIN eboot/{gameID}/original/EBOOT.ELF");
+        LaunchSCETool($"-v -d {workingDir}/eboot/{gameID}/original/EBOOT.BIN {workingDir}/eboot/{gameID}/original/EBOOT.ELF");
 
         // Now, patch the EBOOT;
-        Patcher.PatchFile($"eboot/{gameID}/original/EBOOT.ELF", serverURL, $"eboot/{gameID}/patched/EBOOT.ELF");
+        Patcher.PatchFile($"{workingDir}/eboot/{gameID}/original/EBOOT.ELF", serverURL, $"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF");
 
         // Encrypt the EBOOT (Disc)
         LaunchSCETool(
-            $" -v --sce-type=SELF --skip-sections=FALSE --key-revision=0A --self-app-version=0001000000000000 --self-auth-id=1010000001000003 --self-vendor-id=01000002 --self-ctrl-flags=0000000000000000000000000000000000000000000000000000000000000000 --self-cap-flags=00000000000000000000000000000000000000000000003B0000000100040000 --self-type=APP --self-fw-version=0003005500000000 --compress-data true --encrypt \"{Path.GetFullPath(@$"eboot/{gameID}/patched/EBOOT.ELF")}\" \"{Path.GetFullPath(@$"eboot/{gameID}/patched/EBOOT.BIN")}\"");
+            $" -v --sce-type=SELF --skip-sections=FALSE --key-revision=0A --self-app-version=0001000000000000 --self-auth-id=1010000001000003 --self-vendor-id=01000002 --self-ctrl-flags=0000000000000000000000000000000000000000000000000000000000000000 --self-cap-flags=00000000000000000000000000000000000000000000003B0000000100040000 --self-type=APP --self-fw-version=0003005500000000 --compress-data true --encrypt \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF")}\" \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN")}\"");
 
         // And upload the encrypted, patched EBOOT to the system.
-        FTP.UploadFile(@$"eboot/{gameID}/patched/EBOOT.BIN",
+        FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN",
             $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass);
     }
 }

UnionPatcher/UnionPatcher.csproj

@@ -3,7 +3,7 @@
         <AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
         <Configurations>Debug;Release;Windows</Configurations>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Platforms>AnyCPU</Platforms>
         <ApplicationIcon>Icon64.ico</ApplicationIcon>
     </PropertyGroup>

build-all.sh

@@ -1,4 +1,4 @@
-mkdir -p builds;
+mkdir -p builds
 #dotnet clean;
 
 dotnet publish -c Windows -r win-x64 --self-contained
@@ -12,20 +12,20 @@ dotnet publish -c MacOS -r osx-arm64 --self-contained
 
 # $1: Name.zip
 # $2: Path to zip
-function zipPath() {
-    currentDirectory=$(pwd)
-    cd $2 || return 1;
-    
-    zip "$1" *;
-    cd $currentDirectory || return 1;
-    mv "$2/$1" builds/
+function createBuild() {
+	currentDirectory=$(pwd)
+	cd $2 || return 1
+
+	zip -r "$1" *
+	cd $currentDirectory || return 1
+	mv "$2/$1" builds/
 }
 
-zipPath "UnionPatcher-Windows-x64.zip" "UnionPatcher.Gui.Windows/bin/Release/net6.0-windows/win-x64/publish/"
+createBuild "UnionPatcher-Windows-x64.zip" "UnionPatcher.Gui.Windows/bin/Release/net8.0-windows/win-x64/publish/"
 
-zipPath "UnionPatcher-Linux-x64.zip" "UnionPatcher.Gui.Linux/bin/Release/net6.0/linux-x64/publish/"
-zipPath "UnionPatcher-Linux-arm.zip" "UnionPatcher.Gui.Linux/bin/Release/net6.0/linux-arm/publish/"
-zipPath "UnionPatcher-Linux-arm64.zip" "UnionPatcher.Gui.Linux/bin/Release/net6.0/linux-arm64/publish/"
+createBuild "UnionPatcher-Linux-x64.zip" "UnionPatcher.Gui.Linux/bin/Release/net8.0/linux-x64/publish/"
+createBuild "UnionPatcher-Linux-arm.zip" "UnionPatcher.Gui.Linux/bin/Release/net8.0/linux-arm/publish/"
+createBuild "UnionPatcher-Linux-arm64.zip" "UnionPatcher.Gui.Linux/bin/Release/net8.0/linux-arm64/publish/"
 
-zipPath "UnionPatcher-macOS-x64.zip" "UnionPatcher.Gui.MacOS/bin/Release/net6.0/osx-x64/publish/"
-zipPath "UnionPatcher-macOS-arm64.zip" "UnionPatcher.Gui.MacOS/bin/Release/net6.0/osx-arm64/publish/"
+# CODESIGN_IDENTITY is the certificate that you want to use for codesigning for mac, if not present then will not be signed
+./build-mac.sh $CODESIGN_IDENTITY

build-mac.sh

@@ -0,0 +1,21 @@
+# Script to build UnionPatcher for mac, builds a universal binary, and zips it up. also codesigns if $1 is specified
+
+dotnet clean
+dotnet publish UnionPatcher.Gui.MacOS --configuration Release /p:Platform="Any CPU" --self-contained -o macbuild
+dotnet publish UnionPatcher.Gui.MacOS --configuration Release /p:Platform="Any CPU" --arch x64 --self-contained -o macbuildx86
+
+rm -rf macbuilduniversal
+mkdir macbuilduniversal
+cp -r macbuild/UnionPatcher.Gui.MacOS.app macbuilduniversal/UnionPatcher.app
+cp UnionPatcher.Gui.MacOS/Info.plist macbuilduniversal/UnionPatcher.app/Contents/Info.plist
+rm -rf macbuilduniversal/UnionPatcher.app/Contents/MacOS/scetool/linux*
+rm -rf macbuilduniversal/UnionPatcher.app/Contents/MacOS/scetool/win*
+
+lipo -create -output macbuilduniversal/UnionPatcher.app/Contents/MacOS/LBPUnion.UnionPatcher.Gui.MacOS macbuildx86/LBPUnion.UnionPatcher.Gui.MacOS macbuild/LBPUnion.UnionPatcher.Gui.MacOS
+touch macbuilduniversal/UnionPatcher.app
+
+if [ -z ${1+x} ]; then
+	codesign -f --deep -s "$1" macbuilduniversal/UnionPatcher.app
+fi
+cd macbuilduniversal
+zip -r UnionPatcher-macOS-universal.zip UnionPatcher.app