Further working of #244

I need to think about this further

Author: darkl

src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs

@@ -54,11 +54,12 @@ public TServer Create(TRawClient client, IWampConnection<TMessage> connection)
                 };
 
             proxyOptions.AddMixinInstance(new DisposableForwarder(connection));
-            
+
             TServer result =
-                mProxyGenerator.CreateInterfaceProxyWithoutTarget<TServer>
-                    (proxyOptions,
-                     interceptor);
+                (TServer)mProxyGenerator.CreateInterfaceProxyWithoutTarget
+                (typeof(TServer),
+                    new Type[] {typeof(IDisposable)},
+                    proxyOptions, interceptor);
 
             return result;
         }

src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs

@@ -105,7 +105,7 @@ public void Welcome(long session, WelcomeDetails details)
         public void Abort(AbortDetails details, string reason)
         {
             TrySetCloseEventArgs(SessionCloseType.Abort, details, reason);
-            mServerProxy.Dispose();
+            ((IDisposable)mServerProxy).Dispose();
         }
 
         public void Goodbye(GoodbyeDetails details, string reason)
@@ -115,7 +115,7 @@ public void Goodbye(GoodbyeDetails details, string reason)
                 mServerProxy.Goodbye(new GoodbyeDetails(), WampErrors.GoodbyeAndOut);
             }
 
-            mServerProxy.Dispose();
+            ((IDisposable)mServerProxy).Dispose();
 
             TrySetCloseEventArgs(SessionCloseType.Goodbye, details, reason);
         }

src/net45/WampSharp/WAMP2/V2/Core/Contracts/Proxy/IWampServerProxy.cs

@@ -16,8 +16,7 @@ public interface IWampServerProxy<TMessage> :
         IWampBrokerProxy<TMessage>, 
         IWampDealerProxy<TMessage>, 
         IWampSessionProxy,
-        IWampError<TMessage>,
-        IDisposable
+        IWampError<TMessage>
     {
     }
 }

src/net45/WampSharp/WAMP2/V2/PCL/ManualWampServerProxyBuilder.cs

@@ -34,7 +34,7 @@ public IWampServerProxy Create(IWampClient<TMessage> client, IWampConnection<TMe
             return result;
         }
 
-        private class WampServerProxy : ProxyBase, IWampServerProxy
+        private class WampServerProxy : ProxyBase, IWampServerProxy, IDisposable
         {
             private static readonly MethodInfo mPublish3 = Method.Get((IWampServerProxy proxy) => proxy.Publish(default(long), default(PublishOptions), default(string)));
             private static readonly MethodInfo mPublish4 = Method.Get((IWampServerProxy proxy) => proxy.Publish(default(long), default(PublishOptions), default(string), default(object[])));