소스 검색

Fix Silverlight and WP compile.

Gert Driesen 11 년 전
부모
커밋
c4b120e6a3

+ 10 - 1
Renci.SshClient/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

@@ -303,6 +303,9 @@
     <Compile Include="..\Renci.SshNet\IServiceFactory.cs">
       <Link>IServiceFactory.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\IServiceFactory.NET.cs">
+      <Link>IServiceFactory.NET.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\ISession.cs">
       <Link>ISession.cs</Link>
     </Compile>
@@ -534,6 +537,9 @@
     <Compile Include="..\Renci.SshNet\NetConfClient.cs">
       <Link>NetConfClient.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Netconf\INetConfSession.cs">
+      <Link>Netconf\INetConfSession.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Netconf\NetConfSession.cs">
       <Link>Netconf\NetConfSession.cs</Link>
     </Compile>
@@ -720,6 +726,9 @@
     <Compile Include="..\Renci.SshNet\ServiceFactory.cs">
       <Link>ServiceFactory.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\ServiceFactory.NET.cs">
+      <Link>ServiceFactory.NET.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Session.cs">
       <Link>Session.cs</Link>
     </Compile>
@@ -934,7 +943,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 32 - 5
Renci.SshClient/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj

@@ -73,11 +73,38 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_Closed.cs">
       <Link>Classes\Channels\ChannelSessionTest_Close_Closed.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen.cs">
-      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen.cs</Link>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived_SendChannelCloseMessageFailure.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived_SendChannelCloseMessageFailure.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived.cs">
-      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived.cs</Link>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived_SendChannelCloseMessageSuccess.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived_SendChannelCloseMessageSuccess.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived_SendChannelCloseMessageFailure.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived_SendChannelCloseMessageFailure.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived_SendChannelCloseMessageSuccess.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelCloseReceived_SendChannelCloseMessageSuccess.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelEofReceived_SendChannelCloseMessageFailure.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelEofReceived_SendChannelCloseMessageFailure.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelEofReceived_SendChannelCloseMessageSuccess.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_ChannelEofReceived_SendChannelCloseMessageSuccess.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived_SendChannelEofMessageFailure.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived_SendChannelEofMessageFailure.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_ChannelCloseAndChannelEofReceived.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_ChannelCloseReceived.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_ChannelCloseReceived.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived.cs">
+      <Link>Classes\Channels\ChannelSessionTest_Close_SessionIsNotConnectedAndChannelIsOpen_NoChannelCloseOrChannelEofReceived.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelSessionTest_Disposed_Closed.cs">
       <Link>Classes\Channels\ChannelSessionTest_Disposed_Closed.cs</Link>
@@ -1231,7 +1258,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 19 - 0
Renci.SshClient/Renci.SshNet/IServiceFactory.NET.cs

@@ -0,0 +1,19 @@
+using System;
+using Renci.SshNet.NetConf;
+
+namespace Renci.SshNet
+{
+    internal partial interface IServiceFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="INetConfSession"/> in a given <see cref="ISession"/>
+        /// and with the specified operation timeout.
+        /// </summary>
+        /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
+        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <returns>
+        /// An <see cref="INetConfSession"/>.
+        /// </returns>
+        INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout);
+    }
+}

+ 1 - 13
Renci.SshClient/Renci.SshNet/IServiceFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Text;
 using Renci.SshNet.Common;
-using Renci.SshNet.NetConf;
 using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet
@@ -9,7 +8,7 @@ namespace Renci.SshNet
     /// <summary>
     /// Factory for creating new services.
     /// </summary>
-    internal interface IServiceFactory
+    internal partial interface IServiceFactory
     {
         /// <summary>
         /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/>.
@@ -21,17 +20,6 @@ namespace Renci.SshNet
         /// <exception cref="ArgumentNullException"><paramref name="connectionInfo"/> is <c>null</c>.</exception>
         ISession CreateSession(ConnectionInfo connectionInfo);
 
-        /// <summary>
-        /// Creates a new <see cref="INetConfSession"/> in a given <see cref="ISession"/>
-        /// and with the specified operation timeout.
-        /// </summary>
-        /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
-        /// <returns>
-        /// An <see cref="INetConfSession"/>.
-        /// </returns>
-        INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout);
-
         /// <summary>
         /// Creates a new <see cref="ISftpSession"/> in a given <see cref="ISession"/> and with
         /// the specified operation timeout and encoding.

+ 2 - 0
Renci.SshClient/Renci.SshNet/Renci.SshNet.csproj

@@ -156,6 +156,7 @@
     <Compile Include="IConnectionInfo.cs" />
     <Compile Include="IForwardedPort.cs" />
     <Compile Include="IServiceFactory.cs" />
+    <Compile Include="IServiceFactory.NET.cs" />
     <Compile Include="ISession.cs" />
     <Compile Include="ISubsystemSession.cs" />
     <Compile Include="Messages\Transport\KeyExchangeEcdhInitMessage.cs" />
@@ -175,6 +176,7 @@
     <Compile Include="Security\KeyExchangeDiffieHellmanGroupExchangeShaBase.cs" />
     <Compile Include="Security\KeyExchangeEllipticCurveDiffieHellman.cs" />
     <Compile Include="ServiceFactory.cs" />
+    <Compile Include="ServiceFactory.NET.cs" />
     <Compile Include="Sftp\ISftpSession.cs" />
     <Compile Include="ShellStream.NET40.cs" />
     <Compile Include="ExpectAsyncResult.cs" />

+ 25 - 0
Renci.SshClient/Renci.SshNet/ServiceFactory.NET.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Renci.SshNet.NetConf;
+
+namespace Renci.SshNet
+{
+    internal partial class ServiceFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="INetConfSession"/> in a given <see cref="ISession"/>
+        /// and with the specified operation timeout.
+        /// </summary>
+        /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
+        /// <param name="operationTimeout">The operation timeout.</param>
+        /// <returns>
+        /// An <see cref="INetConfSession"/>.
+        /// </returns>
+        public INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout)
+        {
+            return new NetConfSession(session, operationTimeout);
+        }
+    }
+}

+ 1 - 16
Renci.SshClient/Renci.SshNet/ServiceFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Text;
 using Renci.SshNet.Common;
-using Renci.SshNet.NetConf;
 using Renci.SshNet.Sftp;
 
 namespace Renci.SshNet
@@ -9,7 +8,7 @@ namespace Renci.SshNet
     /// <summary>
     /// Basic factory for creating new services.
     /// </summary>
-    internal class ServiceFactory : IServiceFactory
+    internal partial class ServiceFactory : IServiceFactory
     {
         /// <summary>
         /// Creates a new <see cref="ISession"/> with the specified <see cref="ConnectionInfo"/>.
@@ -24,20 +23,6 @@ namespace Renci.SshNet
             return new Session(connectionInfo);
         }
 
-        /// <summary>
-        /// Creates a new <see cref="INetConfSession"/> in a given <see cref="ISession"/>
-        /// and with the specified operation timeout.
-        /// </summary>
-        /// <param name="session">The <see cref="ISession"/> to create the <see cref="INetConfSession"/> in.</param>
-        /// <param name="operationTimeout">The operation timeout.</param>
-        /// <returns>
-        /// An <see cref="INetConfSession"/>.
-        /// </returns>
-        public INetConfSession CreateNetConfSession(ISession session, TimeSpan operationTimeout)
-        {
-            return new NetConfSession(session, operationTimeout);
-        }
-
         /// <summary>
         /// Creates a new <see cref="ISftpSession"/> in a given <see cref="ISession"/> and with
         /// the specified operation timeout and encoding.

+ 1 - 1
Renci.SshClient/Renci.SshNet/SftpClient.NET.cs

@@ -10,7 +10,7 @@ namespace Renci.SshNet
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClient : BaseClient
+    public partial class SftpClient
     {
         #region SynchronizeDirectories
 

+ 1 - 1
Renci.SshClient/Renci.SshNet/SftpClient.cs

@@ -14,7 +14,7 @@ namespace Renci.SshNet
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClient
+    public partial class SftpClient : BaseClient
     {
         /// <summary>
         /// Holds the <see cref="ISftpSession"/> instance that is used to communicate to the