Skip to content

Commit f4b0bb2

Browse files
driesengdrieseng
committed
Merge branch 'scp-quoting' of https://github.com/sshnet/SSH.NET into scp-quoting
2 parents 55d9109 + 9e75eef commit f4b0bb2

File tree

7 files changed

+78
-5
lines changed

7 files changed

+78
-5
lines changed

‎src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@
314314
<Compile Include="..\Renci.SshNet\IForwardedPort.cs">
315315
<Link>IForwardedPort.cs</Link>
316316
</Compile>
317+
<Compile Include="..\Renci.SshNet\IRemotePathTransformation.cs">
318+
<Link>IRemotePathTransformation.cs</Link>
319+
</Compile>
317320
<Compile Include="..\Renci.SshNet\IServiceFactory.cs">
318321
<Link>IServiceFactory.cs</Link>
319322
</Compile>
@@ -572,6 +575,18 @@
572575
<Compile Include="..\Renci.SshNet\ProxyTypes.cs">
573576
<Link>ProxyTypes.cs</Link>
574577
</Compile>
578+
<Compile Include="..\Renci.SshNet\RemotePathDoubleQuoteTransformation.cs">
579+
<Link>RemotePathDoubleQuoteTransformation.cs</Link>
580+
</Compile>
581+
<Compile Include="..\Renci.SshNet\RemotePathNoneTransformation.cs">
582+
<Link>RemotePathNoneTransformation.cs</Link>
583+
</Compile>
584+
<Compile Include="..\Renci.SshNet\RemotePathShellQuoteTransformation.cs">
585+
<Link>RemotePathShellQuoteTransformation.cs</Link>
586+
</Compile>
587+
<Compile Include="..\Renci.SshNet\RemotePathTransformation.cs">
588+
<Link>RemotePathTransformation.cs</Link>
589+
</Compile>
575590
<Compile Include="..\Renci.SshNet\ScpClient.cs">
576591
<Link>ScpClient.cs</Link>
577592
</Compile>
@@ -949,7 +964,7 @@
949964
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
950965
<SilverlightProjectProperties />
951966
</FlavorProperties>
952-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
967+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
953968
</VisualStudio>
954969
</ProjectExtensions>
955970
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,9 @@
323323
<Compile Include="..\Renci.SshNet\IForwardedPort.cs">
324324
<Link>IForwardedPort.cs</Link>
325325
</Compile>
326+
<Compile Include="..\Renci.SshNet\IRemotePathTransformation.cs">
327+
<Link>IRemotePathTransformation.cs</Link>
328+
</Compile>
326329
<Compile Include="..\Renci.SshNet\IServiceFactory.cs">
327330
<Link>IServiceFactory.cs</Link>
328331
</Compile>
@@ -581,6 +584,18 @@
581584
<Compile Include="..\Renci.SshNet\ProxyTypes.cs">
582585
<Link>ProxyTypes.cs</Link>
583586
</Compile>
587+
<Compile Include="..\Renci.SshNet\RemotePathDoubleQuoteTransformation.cs">
588+
<Link>RemotePathDoubleQuoteTransformation.cs</Link>
589+
</Compile>
590+
<Compile Include="..\Renci.SshNet\RemotePathNoneTransformation.cs">
591+
<Link>RemotePathNoneTransformation.cs</Link>
592+
</Compile>
593+
<Compile Include="..\Renci.SshNet\RemotePathShellQuoteTransformation.cs">
594+
<Link>RemotePathShellQuoteTransformation.cs</Link>
595+
</Compile>
596+
<Compile Include="..\Renci.SshNet\RemotePathTransformation.cs">
597+
<Link>RemotePathTransformation.cs</Link>
598+
</Compile>
584599
<Compile Include="..\Renci.SshNet\ScpClient.cs">
585600
<Link>ScpClient.cs</Link>
586601
</Compile>
@@ -955,7 +970,7 @@
955970
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
956971
<SilverlightProjectProperties />
957972
</FlavorProperties>
958-
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
973+
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
959974
</VisualStudio>
960975
</ProjectExtensions>
961976
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class SftpFileStreamTest_Flush_WriteMode_NoDataInBuffer : SftpFileStreamT
1919
private uint _readBufferSize;
2020
private uint _writeBufferSize;
2121
private byte[] _writeBytes;
22-
private byte[] _requestWriteBytes;
2322

2423
protected override void SetupData()
2524
{

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAndOffsetPositive.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class SftpFileStreamTest_Seek_PositionedAtBeginningOfStream_OriginBeginAn
1919
private byte[] _handle;
2020
private SftpFileStream _target;
2121
private int _offset;
22-
private EndOfStreamException _actualException;
2322
private long _actual;
2423

2524
protected override void SetupData()

‎src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,9 @@
369369
<Compile Include="..\Renci.SshNet\IForwardedPort.cs">
370370
<Link>IForwardedPort.cs</Link>
371371
</Compile>
372+
<Compile Include="..\Renci.SshNet\IRemotePathTransformation.cs">
373+
<Link>IRemotePathTransformation.cs</Link>
374+
</Compile>
372375
<Compile Include="..\Renci.SshNet\IServiceFactory.cs">
373376
<Link>IServiceFactory.cs</Link>
374377
</Compile>
@@ -642,6 +645,18 @@
642645
<Compile Include="..\Renci.SshNet\ProxyTypes.cs">
643646
<Link>ProxyTypes.cs</Link>
644647
</Compile>
648+
<Compile Include="..\Renci.SshNet\RemotePathDoubleQuoteTransformation.cs">
649+
<Link>RemotePathDoubleQuoteTransformation.cs</Link>
650+
</Compile>
651+
<Compile Include="..\Renci.SshNet\RemotePathNoneTransformation.cs">
652+
<Link>RemotePathNoneTransformation.cs</Link>
653+
</Compile>
654+
<Compile Include="..\Renci.SshNet\RemotePathShellQuoteTransformation.cs">
655+
<Link>RemotePathShellQuoteTransformation.cs</Link>
656+
</Compile>
657+
<Compile Include="..\Renci.SshNet\RemotePathTransformation.cs">
658+
<Link>RemotePathTransformation.cs</Link>
659+
</Compile>
645660
<Compile Include="..\Renci.SshNet\ScpClient.cs">
646661
<Link>ScpClient.cs</Link>
647662
</Compile>

‎src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@
305305
<Compile Include="..\Renci.SshNet\IForwardedPort.cs">
306306
<Link>IForwardedPort.cs</Link>
307307
</Compile>
308+
<Compile Include="..\Renci.SshNet\IRemotePathTransformation.cs">
309+
<Link>IRemotePathTransformation.cs</Link>
310+
</Compile>
308311
<Compile Include="..\Renci.SshNet\IServiceFactory.cs">
309312
<Link>IServiceFactory.cs</Link>
310313
</Compile>
@@ -563,6 +566,18 @@
563566
<Compile Include="..\Renci.SshNet\ProxyTypes.cs">
564567
<Link>ProxyTypes.cs</Link>
565568
</Compile>
569+
<Compile Include="..\Renci.SshNet\RemotePathDoubleQuoteTransformation.cs">
570+
<Link>RemotePathDoubleQuoteTransformation.cs</Link>
571+
</Compile>
572+
<Compile Include="..\Renci.SshNet\RemotePathNoneTransformation.cs">
573+
<Link>RemotePathNoneTransformation.cs</Link>
574+
</Compile>
575+
<Compile Include="..\Renci.SshNet\RemotePathShellQuoteTransformation.cs">
576+
<Link>RemotePathShellQuoteTransformation.cs</Link>
577+
</Compile>
578+
<Compile Include="..\Renci.SshNet\RemotePathTransformation.cs">
579+
<Link>RemotePathTransformation.cs</Link>
580+
</Compile>
566581
<Compile Include="..\Renci.SshNet\ScpClient.cs">
567582
<Link>ScpClient.cs</Link>
568583
</Compile>

‎src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,9 @@
352352
<Compile Include="..\Renci.SshNet\IForwardedPort.cs">
353353
<Link>IForwardedPort.cs</Link>
354354
</Compile>
355+
<Compile Include="..\Renci.SshNet\IRemotePathTransformation.cs">
356+
<Link>IRemotePathTransformation.cs</Link>
357+
</Compile>
355358
<Compile Include="..\Renci.SshNet\IServiceFactory.cs">
356359
<Link>IServiceFactory.cs</Link>
357360
</Compile>
@@ -610,6 +613,18 @@
610613
<Compile Include="..\Renci.SshNet\ProxyTypes.cs">
611614
<Link>ProxyTypes.cs</Link>
612615
</Compile>
616+
<Compile Include="..\Renci.SshNet\RemotePathDoubleQuoteTransformation.cs">
617+
<Link>RemotePathDoubleQuoteTransformation.cs</Link>
618+
</Compile>
619+
<Compile Include="..\Renci.SshNet\RemotePathNoneTransformation.cs">
620+
<Link>RemotePathNoneTransformation.cs</Link>
621+
</Compile>
622+
<Compile Include="..\Renci.SshNet\RemotePathShellQuoteTransformation.cs">
623+
<Link>RemotePathShellQuoteTransformation.cs</Link>
624+
</Compile>
625+
<Compile Include="..\Renci.SshNet\RemotePathTransformation.cs">
626+
<Link>RemotePathTransformation.cs</Link>
627+
</Compile>
613628
<Compile Include="..\Renci.SshNet\ScpClient.cs">
614629
<Link>ScpClient.cs</Link>
615630
</Compile>
@@ -982,7 +997,7 @@
982997
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
983998
<ProjectExtensions>
984999
<VisualStudio>
985-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
1000+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
9861001
</VisualStudio>
9871002
</ProjectExtensions>
9881003
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

0 commit comments

Comments
 (0)