Remove Linux x86

It's not supported by .NET Core
(or by anything else either for that matter)
¯\_(ツ)_/¯

lib/zmq/README.md

@@ -43,15 +43,3 @@ strip lib/libzmq.so.*.*
 ```
 
 The dynamic library will be outputted in `lib/libzmq.so.*.*`.
-
-### i386
-
-```
-mkdir build_i386
-cd build_i386
-cmake -DWITH_PERF_TOOL=OFF -DZMQ_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 ..
-make -j$[$(nproc)+1]
-strip lib/libzmq.so.*.*
-```
-
-The dynamic library will be outputted in `lib/libzmq.so.*.*`.

src/Abc.Zebus/Abc.Zebus.csproj

@@ -23,12 +23,9 @@
     <None Include="..\..\lib\zmq\Abc.Zebus.libzmq.x86.dll">
       <PackagePath>runtimes\win-x86\native\Abc.Zebus.libzmq.dll</PackagePath>
     </None> 
-    <None Include="..\..\lib\zmq\Abc.Zebus.libzmq.x64.so">
+    <None Include="..\..\lib\zmq\Abc.Zebus.libzmq.so">
       <PackagePath>runtimes\linux-x64\native\Abc.Zebus.libzmq.so</PackagePath>
     </None>
-    <None Include="..\..\lib\zmq\Abc.Zebus.libzmq.x86.so">
-      <PackagePath>runtimes\linux-x86\native\Abc.Zebus.libzmq.so</PackagePath>
-    </None>
     <None Update="..\..\lib\zmq\Abc.Zebus.libzmq.*">
       <Link>%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Abc.Zebus/Transport/Zmq/ZmqNative.Generated.cs

@@ -571,243 +571,5 @@ namespace Abc.Zebus.Transport.Zmq
 
         }
 
-        [SuppressUnmanagedCodeSecurity]
-        private class Linux32Impl : LibImpl
-        {
-            public override IntPtr ctx_new()
-                => zmq_ctx_new();
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_ctx_new();
-
-            public override int ctx_term(IntPtr context)
-                => zmq_ctx_term(context);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_ctx_term(IntPtr context);
-
-            public override IntPtr socket(IntPtr context, int type)
-                => zmq_socket(context, type);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_socket(IntPtr context, int type);
-
-            public override int close(IntPtr socket)
-                => zmq_close(socket);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_close(IntPtr socket);
-
-            public override int getsockopt(IntPtr socket, int option_name, void* option_value, IntPtr* option_len)
-                => zmq_getsockopt(socket, option_name, option_value, option_len);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_getsockopt(IntPtr socket, int option_name, void* option_value, IntPtr* option_len);
-
-            public override int setsockopt(IntPtr socket, int option_name, void* option_value, IntPtr option_len)
-                => zmq_setsockopt(socket, option_name, option_value, option_len);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_setsockopt(IntPtr socket, int option_name, void* option_value, IntPtr option_len);
-
-            public override int bind(IntPtr socket, string endpoint)
-                => zmq_bind(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_bind(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int unbind(IntPtr socket, string endpoint)
-                => zmq_unbind(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_unbind(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int connect(IntPtr socket, string endpoint)
-                => zmq_connect(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_connect(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int disconnect(IntPtr socket, string endpoint)
-                => zmq_disconnect(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_disconnect(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int send(IntPtr socket, void* buf, IntPtr len, int flags)
-                => zmq_send(socket, buf, len, flags);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_send(IntPtr socket, void* buf, IntPtr len, int flags);
-
-            public override int msg_init(ZmqMessage* msg)
-                => zmq_msg_init(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_init(ZmqMessage* msg);
-
-            public override int msg_recv(ZmqMessage* msg, IntPtr socket, int flags)
-                => zmq_msg_recv(msg, socket, flags);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_recv(ZmqMessage* msg, IntPtr socket, int flags);
-
-            public override int msg_close(ZmqMessage* msg)
-                => zmq_msg_close(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_close(ZmqMessage* msg);
-
-            public override void* msg_data(ZmqMessage* msg)
-                => zmq_msg_data(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern void* zmq_msg_data(ZmqMessage* msg);
-
-            public override IntPtr msg_size(ZmqMessage* msg)
-                => zmq_msg_size(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_msg_size(ZmqMessage* msg);
-
-            public override ZmqErrorCode errno()
-                => zmq_errno();
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern ZmqErrorCode zmq_errno();
-
-            public override byte* strerror(int errnum)
-                => zmq_strerror(errnum);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern byte* zmq_strerror(int errnum);
-
-            public override void version(int* major, int* minor, int* patch)
-                => zmq_version(major, minor, patch);
-
-            [DllImport("Abc.Zebus.libzmq.x86.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern void zmq_version(int* major, int* minor, int* patch);
-
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        private class Linux64Impl : LibImpl
-        {
-            public override IntPtr ctx_new()
-                => zmq_ctx_new();
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_ctx_new();
-
-            public override int ctx_term(IntPtr context)
-                => zmq_ctx_term(context);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_ctx_term(IntPtr context);
-
-            public override IntPtr socket(IntPtr context, int type)
-                => zmq_socket(context, type);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_socket(IntPtr context, int type);
-
-            public override int close(IntPtr socket)
-                => zmq_close(socket);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_close(IntPtr socket);
-
-            public override int getsockopt(IntPtr socket, int option_name, void* option_value, IntPtr* option_len)
-                => zmq_getsockopt(socket, option_name, option_value, option_len);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_getsockopt(IntPtr socket, int option_name, void* option_value, IntPtr* option_len);
-
-            public override int setsockopt(IntPtr socket, int option_name, void* option_value, IntPtr option_len)
-                => zmq_setsockopt(socket, option_name, option_value, option_len);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_setsockopt(IntPtr socket, int option_name, void* option_value, IntPtr option_len);
-
-            public override int bind(IntPtr socket, string endpoint)
-                => zmq_bind(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_bind(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int unbind(IntPtr socket, string endpoint)
-                => zmq_unbind(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_unbind(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int connect(IntPtr socket, string endpoint)
-                => zmq_connect(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_connect(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int disconnect(IntPtr socket, string endpoint)
-                => zmq_disconnect(socket, endpoint);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_disconnect(IntPtr socket, [In, MarshalAs(UnmanagedType.LPStr)] string endpoint);
-
-            public override int send(IntPtr socket, void* buf, IntPtr len, int flags)
-                => zmq_send(socket, buf, len, flags);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_send(IntPtr socket, void* buf, IntPtr len, int flags);
-
-            public override int msg_init(ZmqMessage* msg)
-                => zmq_msg_init(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_init(ZmqMessage* msg);
-
-            public override int msg_recv(ZmqMessage* msg, IntPtr socket, int flags)
-                => zmq_msg_recv(msg, socket, flags);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_recv(ZmqMessage* msg, IntPtr socket, int flags);
-
-            public override int msg_close(ZmqMessage* msg)
-                => zmq_msg_close(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern int zmq_msg_close(ZmqMessage* msg);
-
-            public override void* msg_data(ZmqMessage* msg)
-                => zmq_msg_data(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern void* zmq_msg_data(ZmqMessage* msg);
-
-            public override IntPtr msg_size(ZmqMessage* msg)
-                => zmq_msg_size(msg);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern IntPtr zmq_msg_size(ZmqMessage* msg);
-
-            public override ZmqErrorCode errno()
-                => zmq_errno();
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern ZmqErrorCode zmq_errno();
-
-            public override byte* strerror(int errnum)
-                => zmq_strerror(errnum);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern byte* zmq_strerror(int errnum);
-
-            public override void version(int* major, int* minor, int* patch)
-                => zmq_version(major, minor, patch);
-
-            [DllImport("Abc.Zebus.libzmq.x64.so", CallingConvention = CallingConvention.Cdecl)]
-            private static extern void zmq_version(int* major, int* minor, int* patch);
-
-        }
-
     }
 }

src/Abc.Zebus/Transport/Zmq/ZmqNative.Generated.tt

@@ -39,9 +39,7 @@ var platforms = new[] {
     new PlatformDef("Win", "Abc.Zebus.libzmq.dll"),
     new PlatformDef("Win32", "Abc.Zebus.libzmq.x86.dll"),
     new PlatformDef("Win64", "Abc.Zebus.libzmq.x64.dll"),
-    new PlatformDef("Linux", "Abc.Zebus.libzmq.so"),
-    new PlatformDef("Linux32", "Abc.Zebus.libzmq.x86.so"),
-    new PlatformDef("Linux64", "Abc.Zebus.libzmq.x64.so"),
+    new PlatformDef("Linux", "Abc.Zebus.libzmq.so")
 };
 
 #>

src/Abc.Zebus/Transport/Zmq/ZmqNative.cs

@@ -28,13 +28,6 @@ namespace Abc.Zebus.Transport.Zmq
                     ? (LibImpl)new Win64Impl()
                     : new Win32Impl();
             }
-            catch (DllNotFoundException) when (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                // Used in unit tests only
-                return Environment.Is64BitProcess
-                    ? (LibImpl)new Linux64Impl()
-                    : new Linux32Impl();
-            }
         }
     }
 }