浏览代码

v1 - Fixes #2598 - Run self-contained application on Linux (#2607)

* cherry pick #2600 from v2_develop

* cherry pick #2600 from v2_develop

* fixing screwup

* in v1 #if is still needed
Tig 2 年之前
父节点
当前提交
958a0ed3eb
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs

+ 1 - 2
Terminal.Gui/ConsoleDrivers/CursesDriver/UnmanagedLibrary.cs

@@ -256,7 +256,7 @@ namespace Unix.Terminal {
 		/// to avoid the dependency on libc-dev Linux.
 		/// to avoid the dependency on libc-dev Linux.
 		/// </summary>
 		/// </summary>
 		static class CoreCLR {
 		static class CoreCLR {
-#if NET6_0
+#if NET7_0
 			// Custom resolver to support true single-file apps
 			// Custom resolver to support true single-file apps
 			// (those which run directly from bundle; in-memory).
 			// (those which run directly from bundle; in-memory).
 			//	 -1 on Unix means self-referencing binary (libcoreclr.so)
 			//	 -1 on Unix means self-referencing binary (libcoreclr.so)
@@ -266,7 +266,6 @@ namespace Unix.Terminal {
 				(string libraryName, Assembly assembly, DllImportSearchPath? searchPath) =>
 				(string libraryName, Assembly assembly, DllImportSearchPath? searchPath) =>
 					libraryName == "libcoreclr.so" ? (IntPtr)(-1) : IntPtr.Zero);
 					libraryName == "libcoreclr.so" ? (IntPtr)(-1) : IntPtr.Zero);
 #endif
 #endif
-
 			[DllImport ("libcoreclr.so")]
 			[DllImport ("libcoreclr.so")]
 			internal static extern IntPtr dlopen (string filename, int flags);
 			internal static extern IntPtr dlopen (string filename, int flags);