From c5f3ce8764f09af91f74eb0aacb72e2c6fadf2d0 Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Sun, 7 May 2023 21:06:11 +0200 Subject: [PATCH 1/4] cherry pick #2600 from v2_develop --- Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs index df53595428..d3ab5d1d7c 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs @@ -191,7 +191,7 @@ bool CheckTimers (bool wait, out int pollTimeout) return ic > 0; } - void IMainLoopDriver.MainIteration () + void IMainLoopDriver.Iteration () { if (winChanged) { winChanged = false; From b9b0e4e6edf6e0064742f3b37145c2489d21b43e Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Sun, 7 May 2023 21:12:53 +0200 Subject: [PATCH 2/4] cherry pick #2600 from v2_develop --- Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs index cde4337447..67dbe236fd 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs @@ -256,7 +256,6 @@ static class Mono { /// to avoid the dependency on libc-dev Linux. /// static class CoreCLR { -#if NET6_0 // Custom resolver to support true single-file apps // (those which run directly from bundle; in-memory). // -1 on Unix means self-referencing binary (libcoreclr.so) @@ -265,7 +264,6 @@ static class CoreCLR { static CoreCLR() => NativeLibrary.SetDllImportResolver(typeof(CoreCLR).Assembly, (string libraryName, Assembly assembly, DllImportSearchPath? searchPath) => libraryName == "libcoreclr.so" ? (IntPtr)(-1) : IntPtr.Zero); -#endif [DllImport ("libcoreclr.so")] internal static extern IntPtr dlopen (string filename, int flags); From 9e7d7ffdf6a74f3c391241d9732eaeb955f0b307 Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Sun, 7 May 2023 21:16:00 +0200 Subject: [PATCH 3/4] fixing screwup --- Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs index d3ab5d1d7c..df53595428 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs @@ -191,7 +191,7 @@ bool CheckTimers (bool wait, out int pollTimeout) return ic > 0; } - void IMainLoopDriver.Iteration () + void IMainLoopDriver.MainIteration () { if (winChanged) { winChanged = false; From 436f05b8d6d36fd9a74256077aacc9c0394779e9 Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Sun, 7 May 2023 21:19:25 +0200 Subject: [PATCH 4/4] in v1 #if is still needed --- Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs index 67dbe236fd..40d51be4f3 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs @@ -256,6 +256,7 @@ static class Mono { /// to avoid the dependency on libc-dev Linux. /// static class CoreCLR { +#if NET7_0 // Custom resolver to support true single-file apps // (those which run directly from bundle; in-memory). // -1 on Unix means self-referencing binary (libcoreclr.so) @@ -264,7 +265,7 @@ static class CoreCLR { static CoreCLR() => NativeLibrary.SetDllImportResolver(typeof(CoreCLR).Assembly, (string libraryName, Assembly assembly, DllImportSearchPath? searchPath) => libraryName == "libcoreclr.so" ? (IntPtr)(-1) : IntPtr.Zero); - +#endif [DllImport ("libcoreclr.so")] internal static extern IntPtr dlopen (string filename, int flags);