From b6188fbf182bc8c83c275944f2f8ec38544cd93c Mon Sep 17 00:00:00 2001 From: koko Date: Tue, 15 Aug 2023 11:10:47 -0400 Subject: [PATCH] Revert "Implement macOS as a build target" This reverts commit 1620b376. After some initial testing - it was found that Rosetta stores it's application translation files in a temporary directory that PLRPC couldn't write to. While this is a problem, the underlying issue is with the updater, as it attempts to write a manifest file to the working directory of the application. Seeing as this can't be done, it was determined that changes to the updater should be made before macOS support be implemented. Reopening #36. --- .github/workflows/build.yml | 34 ++++++-------------------- PLRPC.CLI/PLRPC.CLI.csproj | 2 +- PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj | 26 -------------------- PLRPC.GUI.MacOS/Program.cs | 18 -------------- PLRPC.sln | 7 ------ 5 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj delete mode 100644 PLRPC.GUI.MacOS/Program.cs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e221287..d62e070 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,36 +48,25 @@ jobs: run: dotnet publish -c Release -r win-x64 --self-contained PLRPC.CLI - name: Publish CLI for Linux x64 run: dotnet publish -c Release -r linux-x64 --self-contained PLRPC.CLI - - name: Publish CLI for macOS x64 - run: dotnet publish -c Release -r osx-x64 --self-contained PLRPC.CLI - name: Publish GUI for Windows x64 run: dotnet publish -c Release -r win-x64 --self-contained PLRPC.GUI.Windows - name: Publish GUI for Linux x64 run: dotnet publish -c Release -r linux-x64 --self-contained PLRPC.GUI.Linux - - name: Publish GUI for macOS x64 - run: dotnet publish -c Release -r osx-x64 --self-contained PLRPC.GUI.MacOS - name: Upload Windows x64 CLI build uses: actions/upload-artifact@v3.1.1 with: - name: PLRPC CLI Windows x64 [${{ steps.hash.outputs.hash }}] - path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/win-x64/publish/" - if-no-files-found: error - retention-days: 3 + name: PLRPC CLI Windows x64 [${{ steps.hash.outputs.hash }}] + path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/win-x64/publish/" + if-no-files-found: error + retention-days: 3 - name: Upload Linux x64 CLI build uses: actions/upload-artifact@v3.1.1 with: - name: PLRPC CLI Linux x64 [${{ steps.hash.outputs.hash }}] - path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/linux-x64/publish/" - if-no-files-found: error - retention-days: 3 - - name: Upload macOS x64 CLI build - uses: actions/upload-artifact@v3.1.1 - with: - name: PLRPC CLI macOS x64 [${{ steps.hash.outputs.hash }}] - path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/osx-x64/publish/" - if-no-files-found: error - retention-days: 3 + name: PLRPC CLI Linux x64 [${{ steps.hash.outputs.hash }}] + path: "/home/runner/work/PLRPC/PLRPC/PLRPC.CLI/bin/Release/net7.0/linux-x64/publish/" + if-no-files-found: error + retention-days: 3 - name: Upload Windows x64 GUI build uses: actions/upload-artifact@v3.1.1 with: @@ -91,11 +80,4 @@ jobs: name: PLRPC GUI Linux x64 [${{ steps.hash.outputs.hash }}] path: "/home/runner/work/PLRPC/PLRPC/PLRPC.GUI.Linux/bin/Release/net7.0/linux-x64/publish/" if-no-files-found: error - retention-days: 3 - - name: Upload macOS x64 GUI build - uses: actions/upload-artifact@v3.1.1 - with: - name: PLRPC GUI macOS x64 [${{ steps.hash.outputs.hash }}] - path: "/home/runner/work/PLRPC/PLRPC/PLRPC.GUI.MacOS/bin/Release/net7.0/osx-x64/publish/" - if-no-files-found: error retention-days: 3 \ No newline at end of file diff --git a/PLRPC.CLI/PLRPC.CLI.csproj b/PLRPC.CLI/PLRPC.CLI.csproj index fd924d0..0e6c06b 100644 --- a/PLRPC.CLI/PLRPC.CLI.csproj +++ b/PLRPC.CLI/PLRPC.CLI.csproj @@ -11,7 +11,7 @@ Exe true net7.0 - win-x64;linux-x64;osx-x64 + win-x64;linux-x64 diff --git a/PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj b/PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj deleted file mode 100644 index 9708da1..0000000 --- a/PLRPC.GUI.MacOS/PLRPC.GUI.MacOS.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - LBPUnion.PLRPC.GUI - LBPUnion.PLRPC.GUI.MacOS - enable - disable - - - - Exe - true - net7.0 - osx-x64 - - - - false - - - - - - - - diff --git a/PLRPC.GUI.MacOS/Program.cs b/PLRPC.GUI.MacOS/Program.cs deleted file mode 100644 index 72de125..0000000 --- a/PLRPC.GUI.MacOS/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace LBPUnion.PLRPC.GUI; - -public static class Program -{ - [STAThread] - public static void Main() - { - /* - * Attempt to set the current directory to the directory of the app bundle as - * macOS application bundles have their default pwd set to /. - * - * We'll just fall back to "../" if this fails. - */ - Directory.SetCurrentDirectory(Path.GetDirectoryName(Environment.ProcessPath) ?? "../"); - - Gui.Initialize(); - } -} \ No newline at end of file diff --git a/PLRPC.sln b/PLRPC.sln index 36e2c06..d3bcdf6 100644 --- a/PLRPC.sln +++ b/PLRPC.sln @@ -18,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.CLI", "PLRPC.CLI\PLRP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.Tests", "PLRPC.Tests\PLRPC.Tests.csproj", "{193EDB91-1206-4261-A4F0-870DD984A5EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLRPC.GUI.MacOS", "PLRPC.GUI.MacOS\PLRPC.GUI.MacOS.csproj", "{1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -50,10 +48,6 @@ Global {193EDB91-1206-4261-A4F0-870DD984A5EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {193EDB91-1206-4261-A4F0-870DD984A5EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {193EDB91-1206-4261-A4F0-870DD984A5EF}.Release|Any CPU.Build.0 = Release|Any CPU - {1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D41AA62-0A17-4BC9-9702-28E8A2F8BA39}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {20C3CEC9-6328-43A5-AB59-FDCF9D637C40} = {112C0D49-EA43-4443-A1D5-9BCBBEC7A9DB} @@ -62,6 +56,5 @@ Global {60270A0A-A34A-40FB-BF97-F070B1325157} = {074150AA-731C-465B-8599-C41B56657C81} {93BF7C09-2B70-422B-A16B-58850F3F2169} = {81EFDCFC-CC1D-4B7E-A921-C64660B9BEF5} {193EDB91-1206-4261-A4F0-870DD984A5EF} = {074150AA-731C-465B-8599-C41B56657C81} - {1D41AA62-0A17-4BC9-9702-28E8A2F8BA39} = {112C0D49-EA43-4443-A1D5-9BCBBEC7A9DB} EndGlobalSection EndGlobal