Browse Source

Update Silverlight and WindowPhone projects and make it compilable.
Apply new file naming convention for silverlight and windows phone project files

olegkap_cp 14 năm trước cách đây
mục cha
commit
234cd1e024

+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/Common/Extensions.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/Common/Extensions.SilverlightShared.cs


+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/ForwardedPortLocal.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/ForwardedPortLocal.SilverlightShared.cs


+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/ForwardedPortRemote.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/ForwardedPortRemote.SilverlightShared.cs


+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/PasswordConnectionInfo.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/PasswordConnectionInfo.SilverlightShared.cs


+ 8 - 7
Renci.SshClient/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj

@@ -666,14 +666,15 @@
     <Compile Include="..\Renci.SshNet\SubsystemSession.cs">
       <Link>SubsystemSession.cs</Link>
     </Compile>
-    <Compile Include="Common\Extensions.Silverlight.cs" />
-    <Compile Include="ForwardedPortLocal.Silverlight.cs" />
-    <Compile Include="ForwardedPortRemote.Silverlight.cs" />
-    <Compile Include="PasswordConnectionInfo.Silverlight.cs" />
+    <Compile Include="Common\Extensions.SilverlightShared.cs" />
+    <Compile Include="ForwardedPortLocal.SilverlightShared.cs" />
+    <Compile Include="ForwardedPortRemote.SilverlightShared.cs" />
+    <Compile Include="PasswordConnectionInfo.SilverlightShared.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Session.Silverlight.cs" />
-    <Compile Include="SftpClient.Silverlight.cs" />
-    <Compile Include="SshCommand.Silverlight.cs" />
+    <Compile Include="Session.SilverlightBrowser.cs" />
+    <Compile Include="Session.SilverlightShared.cs" />
+    <Compile Include="SftpClient.SilverlightShared.cs" />
+    <Compile Include="SshCommand.SilverlightShared.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions>

+ 22 - 0
Renci.SshClient/Renci.SshNet.Silverlight/Session.SilverlightBrowser.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Renci.SshNet.Messages;
+
+namespace Renci.SshNet
+{
+    public partial class Session
+    {
+        partial void HandleMessageCore(Message message)
+        {
+            this.HandleMessage((dynamic)message);
+        }
+    }
+}

+ 0 - 5
Renci.SshClient/Renci.SshNet.Silverlight/Session.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/Session.SilverlightShared.cs

@@ -152,11 +152,6 @@ namespace Renci.SshNet
             this.receiveEvent.Set();
         }
 
-        partial void HandleMessageCore(Message message)
-        {
-            this.HandleMessage((dynamic)message);
-        }
-
         partial void ExecuteThread(Action action)
         {
             ThreadPool.QueueUserWorkItem((o) => { action(); });

+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/SftpClient.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/SftpClient.SilverlightShared.cs


+ 0 - 0
Renci.SshClient/Renci.SshNet.Silverlight/SshCommand.Silverlight.cs → Renci.SshClient/Renci.SshNet.Silverlight/SshCommand.SilverlightShared.cs


+ 0 - 52
Renci.SshClient/Renci.SshNet.WindowsPhone/Common/Extensions.WP.cs

@@ -14,57 +14,5 @@ namespace Renci.SshNet.Common
     /// </summary>
     public static partial class Extensions
     {
-        /// <summary>
-        /// Determines whether [is null or white space] [the specified value].
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>
-        ///   <c>true</c> if [is null or white space] [the specified value]; otherwise, <c>false</c>.
-        /// </returns>
-        internal static bool IsNullOrWhiteSpace(this string value)
-        {
-            if (string.IsNullOrEmpty(value)) return true;
-
-            return value.All(char.IsWhiteSpace);
-        }
-
-        /// <summary>
-        /// Disposes the specified socket.
-        /// </summary>
-        /// <param name="socket">The socket.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this Socket socket)
-        {
-            if (socket == null)
-                throw new NullReferenceException();
-
-            socket.Close();
-        }
-
-        /// <summary>
-        /// Disposes the specified handle.
-        /// </summary>
-        /// <param name="handle">The handle.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this WaitHandle handle)
-        {
-            if (handle == null)
-                throw new NullReferenceException();
-
-            handle.Close();
-        }
-
-        /// <summary>
-        /// Disposes the specified algorithm.
-        /// </summary>
-        /// <param name="algorithm">The algorithm.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this HashAlgorithm algorithm)
-        {
-            if (algorithm == null)
-                throw new NullReferenceException();
-
-            algorithm.Clear();
-        }
     }
 }

+ 20 - 2
Renci.SshClient/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj

@@ -119,6 +119,9 @@
     <Compile Include="..\Renci.SshNet\Common\Extensions.cs">
       <Link>Common\Extensions.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Silverlight\Common\Extensions.SilverlightShared.cs">
+      <Link>Common\Extensions.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Common\ObjectIdentifier.cs">
       <Link>Common\ObjectIdentifier.cs</Link>
     </Compile>
@@ -389,6 +392,9 @@
     <Compile Include="..\Renci.SshNet\PasswordConnectionInfo.cs">
       <Link>PasswordConnectionInfo.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Silverlight\PasswordConnectionInfo.SilverlightShared.cs">
+      <Link>PasswordConnectionInfo.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\PrivateKeyConnectionInfo.cs">
       <Link>PrivateKeyConnectionInfo.cs</Link>
     </Compile>
@@ -524,9 +530,15 @@
     <Compile Include="..\Renci.SshNet\Session.cs">
       <Link>Session.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Silverlight\Session.SilverlightShared.cs">
+      <Link>Session.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\SftpClient.cs">
       <Link>SftpClient.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Silverlight\SftpClient.SilverlightShared.cs">
+      <Link>Session.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
@@ -656,17 +668,23 @@
     <Compile Include="..\Renci.SshNet\SshCommand.cs">
       <Link>SshCommand.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.Silverlight\SshCommand.SilverlightShared.cs">
+      <Link>SshCommand.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\SubsystemSession.cs">
       <Link>SubsystemSession.cs</Link>
     </Compile>
-    <Compile Include="Common\Extensions.WP.cs" />
+    <Compile Include="Common\Extensions.WP.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session.WP.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="77C294BB-1DC2-49DC-BE16-963F8F22794D" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 77 - 0
Renci.SshClient/Renci.SshNet.WindowsPhone/Session.WP.cs

@@ -0,0 +1,77 @@
+using System;
+using Renci.SshNet.Messages.Transport;
+using Renci.SshNet.Messages;
+using Renci.SshNet.Messages.Authentication;
+using Renci.SshNet.Messages.Connection;
+using System.Diagnostics;
+
+namespace Renci.SshNet
+{
+    public partial class Session
+    {
+        partial void HandleMessageCore(Message message)
+        {
+            if (message == null)
+                throw new ArgumentNullException("message");
+            else if (message is DisconnectMessage)
+                this.HandleMessage((DisconnectMessage)message);
+            else if (message is IgnoreMessage)
+                this.HandleMessage((IgnoreMessage)message);
+            else if (message is UnimplementedMessage)
+                this.HandleMessage((UnimplementedMessage)message);
+            else if (message is DebugMessage)
+                this.HandleMessage((DebugMessage)message);
+            else if (message is ServiceRequestMessage)
+                this.HandleMessage((ServiceRequestMessage)message);
+            else if (message is ServiceAcceptMessage)
+                this.HandleMessage((ServiceAcceptMessage)message);
+            else if (message is KeyExchangeInitMessage)
+                this.HandleMessage((KeyExchangeInitMessage)message);
+            else if (message is NewKeysMessage)
+                this.HandleMessage((NewKeysMessage)message);
+            else if (message is RequestMessage)
+                this.HandleMessage((RequestMessage)message);
+            else if (message is FailureMessage)
+                this.HandleMessage((FailureMessage)message);
+            else if (message is SuccessMessage)
+                this.HandleMessage((SuccessMessage)message);
+            else if (message is BannerMessage)
+                this.HandleMessage((BannerMessage)message);
+            else if (message is GlobalRequestMessage)
+                this.HandleMessage((GlobalRequestMessage)message);
+            else if (message is RequestSuccessMessage)
+                this.HandleMessage((RequestSuccessMessage)message);
+            else if (message is RequestFailureMessage)
+                this.HandleMessage((RequestFailureMessage)message);
+            else if (message is ChannelOpenMessage)
+                this.HandleMessage((ChannelOpenMessage)message);
+            else if (message is ChannelOpenConfirmationMessage)
+                this.HandleMessage((ChannelOpenConfirmationMessage)message);
+            else if (message is ChannelOpenFailureMessage)
+                this.HandleMessage((ChannelOpenFailureMessage)message);
+            else if (message is ChannelWindowAdjustMessage)
+                this.HandleMessage((ChannelWindowAdjustMessage)message);
+            else if (message is ChannelDataMessage)
+                this.HandleMessage((ChannelDataMessage)message);
+            else if (message is ChannelExtendedDataMessage)
+                this.HandleMessage((ChannelExtendedDataMessage)message);
+            else if (message is ChannelEofMessage)
+                this.HandleMessage((ChannelEofMessage)message);
+            else if (message is ChannelCloseMessage)
+                this.HandleMessage((ChannelCloseMessage)message);
+            else if (message is ChannelRequestMessage)
+                this.HandleMessage((ChannelRequestMessage)message);
+            else if (message is ChannelSuccessMessage)
+                this.HandleMessage((ChannelSuccessMessage)message);
+            else if (message is ChannelFailureMessage)
+                this.HandleMessage((ChannelFailureMessage)message);
+            else
+            {
+                Debug.WriteLine("SSH.NET WARNING: unknown message type {0} - may need to add new type to Session.WP.cs, HandleMessageCore method",
+                    message.GetType().FullName);
+
+                this.HandleMessage(message);
+            }
+        }
+    }
+}

+ 0 - 2
Renci.SshClient/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs

@@ -15,8 +15,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public string Path { get; private set; }
 
-        private HashSet<SftpResponse> _actions = new HashSet<SftpResponse>();
-
         public SftpRealPathRequest(uint requestId, string path, Action<SftpNameResponse> nameAction, Action<SftpStatusResponse> statusAction)
             : base(requestId, statusAction)
         {