From 0c281d08fdf1bdb9b79989dcb19509de0c3bf491 Mon Sep 17 00:00:00 2001 From: Izakbar Date: Sun, 9 Feb 2025 16:17:01 +0000 Subject: [PATCH] remove fody and update project/build to generate single exe Linux version rely upon PATH for location of bash instead of hardcoded /bin/bash --- .github/workflows/release.yml | 4 +- README.md | 4 +- src/Eve-O-Preview/Eve-O-Preview.csproj | 13 +- src/Eve-O-Preview/FodyWeavers.xml | 4 - src/Eve-O-Preview/FodyWeavers.xsd | 176 ------------------ .../Services/Implementation/WindowManager.cs | 2 +- 6 files changed, 7 insertions(+), 196 deletions(-) delete mode 100644 src/Eve-O-Preview/FodyWeavers.xml delete mode 100644 src/Eve-O-Preview/FodyWeavers.xsd diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e147ed..d8769cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Build run: | echo "${{matrix.platform.name}} ${{ github.event.release.tag_name }}" - dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release --no-restore -p:EVEOTARGET="${{matrix.platform.name}}" -p:AssemblyVersion="${{ github.event.release.tag_name }}" + dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release -p:EVEOTARGET="${{matrix.platform.name}}" -p:AssemblyVersion="${{ github.event.release.tag_name }}" - name: BuildPackage run: | git log --pretty=format:'%d %s' ${GITHUB_REF} | perl -pe 's| \(.*tag: v(\d+.\d+.\d+(-preview\d{3})?)(, .*?)*\)|\n## \1\n|g' @@ -45,5 +45,3 @@ jobs: asset_path: "Release-${{ github.event.release.tag_name }}-${{ matrix.platform.name }}.zip" asset_name: "Release-${{ github.event.release.tag_name }}-${{ matrix.platform.name }}.zip" asset_content_type: application/zip - - diff --git a/README.md b/README.md index 6de687f..c647e50 100644 --- a/README.md +++ b/README.md @@ -319,8 +319,8 @@ Release builds are generated using github actions when a release is created from You can build using : -* dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release --no-restore -p:EVEOTARGET="Linux" -p:AssemblyVersion="8.0.2.0" -* dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release --no-restore -p:EVEOTARGET="Windows" -p:AssemblyVersion="8.0.2.0" +* dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release -p:EVEOTARGET="Linux" -p:AssemblyVersion="8.0.2.0" +* dotnet build src\\Eve-O-Preview\\Eve-O-Preview.csproj --configuration Release -p:EVEOTARGET="Windows" -p:AssemblyVersion="8.0.2.0"
diff --git a/src/Eve-O-Preview/Eve-O-Preview.csproj b/src/Eve-O-Preview/Eve-O-Preview.csproj index 04b4c71..05b57d7 100644 --- a/src/Eve-O-Preview/Eve-O-Preview.csproj +++ b/src/Eve-O-Preview/Eve-O-Preview.csproj @@ -3,7 +3,9 @@ LINUX net8.0-windows8.0 WinExe - EveOPreview + true + true + EveOPreview EVE-O-Preview publish\ true @@ -83,15 +85,6 @@ - - 6.0.0 - all - - - 6.9.1 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - 7.0.1 diff --git a/src/Eve-O-Preview/FodyWeavers.xml b/src/Eve-O-Preview/FodyWeavers.xml deleted file mode 100644 index 0b38d9c..0000000 --- a/src/Eve-O-Preview/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Eve-O-Preview/FodyWeavers.xsd b/src/Eve-O-Preview/FodyWeavers.xsd deleted file mode 100644 index d9875cf..0000000 --- a/src/Eve-O-Preview/FodyWeavers.xsd +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - Obsolete, use UnmanagedWinX86Assemblies instead - - - - - A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks. - - - - - Obsolete, use UnmanagedWinX64Assemblies instead. - - - - - A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks. - - - - - A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - Obsolete, use UnmanagedWinX86Assemblies instead - - - - - A list of unmanaged X86 (32 bit) assembly names to include, delimited with |. - - - - - Obsolete, use UnmanagedWinX64Assemblies instead - - - - - A list of unmanaged X64 (64 bit) assembly names to include, delimited with |. - - - - - A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/src/Eve-O-Preview/Services/Implementation/WindowManager.cs b/src/Eve-O-Preview/Services/Implementation/WindowManager.cs index a37df74..95b5f4f 100644 --- a/src/Eve-O-Preview/Services/Implementation/WindowManager.cs +++ b/src/Eve-O-Preview/Services/Implementation/WindowManager.cs @@ -105,7 +105,7 @@ namespace EveOPreview.Services.Implementation { cmd = "-c \"wmctrl -a \"\"" + windowName + "\"\"\""; } - System.Diagnostics.Process.Start("/bin/bash", cmd); + System.Diagnostics.Process.Start("bash", cmd); } public void ActivateWindow(IntPtr handle, string windowName)