gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-10 17:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop'

Browse Source 
# Conflicts:
#	build/sandcastle/SSH.NET.shfbproj
This commit is contained in:
drieseng
2020-06-07 15:25:33 +02:00
parent d8fbae3c51 b5dcca911a
commit e9979a6adc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/sandcastle/SSH.NET.shfbproj
+1 -1
View File
@@ -36,7 +36,7 @@
<outputPaths>{@HelpFormatOutputPaths}</outputPaths>
<allowMissingSource value="false" />
<removeRegionMarkers value="false" />
<colorizer syntaxFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBROOT}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
<colorizer syntaxFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
</component>
</ComponentConfig>
</ComponentConfigurations>
src/Renci.SshNet/SshClient.cs
+1 -1
View File
@@ -261,7 +261,7 @@ namespace Renci.SshNet
/// <remarks>This method internally uses asynchronous calls.</remarks>
/// <example>
/// <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest.cs" region="Example SshCommand RunCommand Result" language="C#" title="Running simple command" />
/// <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest.NET40.cs" region="Example SshCommand RunCommand Parallel" language="C#" title="Run many commands in parallel" />
/// <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest..cs" region="Example SshCommand RunCommand Parallel" language="C#" title="Run many commands in parallel" />
/// </example>
/// <exception cref="ArgumentException">CommandText property is empty.</exception>
/// <exception cref="T:Renci.SshNet.Common.SshException">Invalid Operation - An existing channel was used to execute this command.</exception>