Skip to content

Commit 35ab7a9

Browse files
driesengdrieseng
authored
Merge pull request #131 from sshnet/develop
Prepare for 2016.1.0-beta.
2 parents cddeed3 + 9511c22 commit 35ab7a9

25 files changed

+338
-455
lines changed

‎build/build.proj

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Clean;CreatePackage;GenerateHelpFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Clean;CreateNuGetPackage;CreateBinPackage;GenerateHelpFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<UsingTask TaskName="Zip" AssemblyFile="$(MSBuildThisFileDirectory)target\nuget\packages\$(MSBuildTasksPackageId).$(MSBuildTasksPackageVersion)\tools\MSBuild.Community.Tasks.dll"/>
34
<PropertyGroup>
45
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
56
<BuildRoot>$(MSBuildThisFileDirectory)</BuildRoot>
67
<NuGetExe>$(BuildRoot)target\nuget\nuget.exe</NuGetExe>
8+
<MSBuildTasksPackageId>MSBuildTasks</MSBuildTasksPackageId>
9+
<MSBuildTasksPackageVersion>1.5.0.214</MSBuildTasksPackageVersion>
710
</PropertyGroup>
811
<ItemGroup>
912
<VisualStudioVersion Include="2012">
@@ -76,7 +79,7 @@
7679
</ItemGroup>
7780
<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
7881
</Target>
79-
<Target Name="CreatePackage" DependsOnTargets="CopyBuildOutputToPackage">
82+
<Target Name="CreateNuGetPackage" DependsOnTargets="CopyBuildOutputToPackage">
8083
<Exec Command="$(NuGetExe) pack $(MSBuildThisFileDirectory)nuget\SSH.NET.nuspec -OutputDirectory &quot;$(MSBuildThisFileDirectory)target&quot; -BasePath &quot;$(MSBuildThisFileDirectory)target\package&quot; -NonInteractive"/>
8184
</Target>
8285
<Target Name="CopyBuildOutputToPackage" DependsOnTargets="Build" Outputs="%(TargetFramework.Identity)">
@@ -87,11 +90,37 @@
8790
</ItemGroup>
8891
<Copy SourceFiles="@(BuildOutput)" DestinationFolder="$(MSBuildThisFileDirectory)target\package\lib\%(TargetFramework.Moniker)"/>
8992
</Target>
90-
<Target Name="GenerateHelpFile" DependsOnTargets="Build">
93+
<Target Name="GenerateHelpFile" DependsOnTargets="Build;CheckReleaseVersion">
9194
<Error Text="Please install Sandcastle, and ensure the SHFBFolder environment variable is set." Condition="'$(SHFBFolder)'==''"/>
9295
<MSBuild Projects="$(MSBuildThisFileDirectory)sandcastle\SSH.NET.shfbproj"/>
96+
<Move SourceFiles="$(MSBuildThisFileDirectory)target\help\SshNet.Help.chm" DestinationFiles="$(MSBuildThisFileDirectory)target\SSH.NET-$(ReleaseVersion)-help.chm"/>
97+
</Target>
98+
<Target Name="CopyBuildOutputToBin" DependsOnTargets="Build" Outputs="%(TargetFramework.Identity)">
99+
<ItemGroup>
100+
<BuildOutput Remove="@(BuildOutput)"/>
101+
<BuildOutput Include="$(MSBuildThisFileDirectory)..\src\%(TargetFramework.OutputDirectory)\*.dll"/>
102+
<BuildOutput Include="$(MSBuildThisFileDirectory)..\src\%(TargetFramework.OutputDirectory)\*.xml"/>
103+
</ItemGroup>
104+
<Copy SourceFiles="@(BuildOutput)" DestinationFolder="$(MSBuildThisFileDirectory)target\bin\lib\%(TargetFramework.Moniker)"/>
105+
</Target>
106+
<Target Name="CreateBinPackage" DependsOnTargets="PrepareMSBuildTasksPackage;CopyBuildOutputToBin;CheckReleaseVersion">
107+
<ItemGroup>
108+
<Files Remove="@(Files)"/>
109+
<Files Include="$(MSBuildThisFileDirectory)..\LICENSE"/>
110+
</ItemGroup>
111+
<Copy SourceFiles="@(Files)" DestinationFolder="$(MSBuildThisFileDirectory)target\bin\%(RecursiveDir)"/>
112+
<ItemGroup>
113+
<Files Remove="@(Files)"/>
114+
<Files Include="$(MSBuildThisFileDirectory)target\bin\**"/>
115+
</ItemGroup>
116+
<Zip ZipFileName="$(MSBuildThisFileDirectory)target\SSH.NET-$(ReleaseVersion)-bin.zip" Files="@(Files)" WorkingDirectory="$(MSBuildThisFileDirectory)target\bin"/>
117+
</Target>
118+
<Target Name="PrepareMSBuildTasksPackage" DependsOnTargets="DownloadNuGet">
119+
<Exec Command="$(NuGetExe) install $(MSBuildTasksPackageId) -Version $(MSBuildTasksPackageVersion) -OutputDirectory &quot;$(MSBuildThisFileDirectory)target\nuget\packages&quot; -Verbosity quiet"/>
120+
</Target>
121+
<Target Name="CheckReleaseVersion" Condition="'$(ReleaseVersion)'==''">
122+
<Error Text= "Please specify the version number of the release (using the &quot;ReleaseVersion&quot; property)."/>
93123
</Target>
94-
95124
<UsingTask TaskName="DownloadFile" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
96125
<ParameterGroup>
97126
<Address ParameterType="System.String" Required="true"/>

‎build/sandcastle/new.shfbproj

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- The configuration and platform will be used to determine which assemblies to include from solution and
5+
project documentation sources -->
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<ProjectGuid>{6c35cd41-3f6e-47c1-a805-1aab0ac88b36}</ProjectGuid>
10+
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
11+
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
12+
<AssemblyName>Documentation</AssemblyName>
13+
<RootNamespace>Documentation</RootNamespace>
14+
<Name>Documentation</Name>
15+
<!-- SHFB properties -->
16+
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
17+
<OutputPath>D:\development\SSH.NET\build\target\help\</OutputPath>
18+
<HtmlHelpName>Documentation</HtmlHelpName>
19+
<Language>en-US</Language>
20+
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
21+
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
22+
<HelpFileFormat>Markdown</HelpFileFormat>
23+
<IndentHtml>False</IndentHtml>
24+
<KeepLogFile>False</KeepLogFile>
25+
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
26+
<CleanIntermediates>True</CleanIntermediates>
27+
<DocumentationSources>
28+
<DocumentationSource sourceFile="D:\development\SSH.NET\src\Renci.SshNet\bin\Debug\Renci.SshNet.dll" />
29+
<DocumentationSource sourceFile="D:\development\SSH.NET\src\Renci.SshNet\bin\Debug\Renci.SshNet.xml" /></DocumentationSources>
30+
<HelpFileVersion>1.0.0.0</HelpFileVersion>
31+
<MaximumGroupParts>2</MaximumGroupParts>
32+
<NamespaceGrouping>False</NamespaceGrouping>
33+
<SyntaxFilters>Standard</SyntaxFilters>
34+
<SdkLinkTarget>Blank</SdkLinkTarget>
35+
<RootNamespaceContainer>False</RootNamespaceContainer>
36+
<PresentationStyle>Markdown</PresentationStyle>
37+
<Preliminary>False</Preliminary>
38+
<NamingMethod>Guid</NamingMethod>
39+
<HelpTitle>A Sandcastle Documented Class Library</HelpTitle>
40+
<ContentPlacement>AboveNamespaces</ContentPlacement>
41+
</PropertyGroup>
42+
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
43+
the build. The others are optional common platform types that may appear. -->
44+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
45+
</PropertyGroup>
46+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47+
</PropertyGroup>
48+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
49+
</PropertyGroup>
50+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
51+
</PropertyGroup>
52+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
53+
</PropertyGroup>
54+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
55+
</PropertyGroup>
56+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
57+
</PropertyGroup>
58+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
59+
</PropertyGroup>
60+
<!-- Import the SHFB build targets -->
61+
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
62+
<!-- The pre-build and post-build event properties must appear *after* the targets file import in order to be
63+
evaluated correctly. -->
64+
<PropertyGroup>
65+
<PreBuildEvent>
66+
</PreBuildEvent>
67+
<PostBuildEvent>
68+
</PostBuildEvent>
69+
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
70+
</PropertyGroup>
71+
</Project>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<AssemblyOriginatorKeyFile>..\Renci.SshNet.snk</AssemblyOriginatorKeyFile>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Microsoft.CSharp, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
5958
<Reference Include="mscorlib" />
6059
<Reference Include="SshNet.Security.Cryptography">
6160
<HintPath>..\..\packages\SshNet.Security.Cryptography.1.2.0\lib\sl4\SshNet.Security.Cryptography.dll</HintPath>
@@ -366,6 +365,9 @@
366365
<Compile Include="..\Renci.SshNet\Messages\Authentication\SuccessMessage.cs">
367366
<Link>Messages\Authentication\SuccessMessage.cs</Link>
368367
</Compile>
368+
<Compile Include="..\Renci.SshNet\Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs">
369+
<Link>Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs</Link>
370+
</Compile>
369371
<Compile Include="..\Renci.SshNet\Messages\Connection\ChannelCloseMessage.cs">
370372
<Link>Messages\Connection\ChannelCloseMessage.cs</Link>
371373
</Compile>
@@ -477,6 +479,9 @@
477479
<Compile Include="..\Renci.SshNet\Messages\Connection\RequestSuccessMessage.cs">
478480
<Link>Messages\Connection\RequestSuccessMessage.cs</Link>
479481
</Compile>
482+
<Compile Include="..\Renci.SshNet\Messages\Connection\TcpIpForwardGlobalRequestMessage.cs">
483+
<Link>Messages\Connection\TcpIpForwardGlobalRequestMessage.cs</Link>
484+
</Compile>
480485
<Compile Include="..\Renci.SshNet\Messages\Message.cs">
481486
<Link>Messages\Message.cs</Link>
482487
</Compile>
@@ -896,8 +901,6 @@
896901
<Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
897902
<Link>Properties\CommonAssemblyInfo.cs</Link>
898903
</Compile>
899-
<Compile Include="Session.SilverlightBrowser.cs" />
900-
<Compile Include="Session.SilverlightShared.cs" />
901904
</ItemGroup>
902905
<ItemGroup>
903906
<None Include="..\Renci.SshNet.snk">

‎src/Renci.SshNet.Silverlight/Session.SilverlightBrowser.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Renci.SshNet.Silverlight/Session.SilverlightShared.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<AssemblyOriginatorKeyFile>..\Renci.SshNet.snk</AssemblyOriginatorKeyFile>
6161
</PropertyGroup>
6262
<ItemGroup>
63-
<Reference Include="Microsoft.CSharp, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
6463
<Reference Include="mscorlib" />
6564
<Reference Include="SshNet.Security.Cryptography, Version=1.2.0.0, Culture=neutral, PublicKeyToken=2fa9220ff3eadda4, processorArchitecture=MSIL">
6665
<HintPath>..\..\packages\SshNet.Security.Cryptography.1.2.0\lib\sl5\SshNet.Security.Cryptography.dll</HintPath>
@@ -923,7 +922,7 @@
923922
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
924923
<SilverlightProjectProperties />
925924
</FlavorProperties>
926-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
925+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
927926
</VisualStudio>
928927
</ProjectExtensions>
929928
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class ForwardedPortDynamicTest_Stop_PortDisposed
1313
private ForwardedPortDynamic _forwardedPort;
1414
private IList<EventArgs> _closingRegister;
1515
private IList<ExceptionEventArgs> _exceptionRegister;
16-
private ObjectDisposedException _actualException;
1716
private IPEndPoint _endpoint;
1817

1918
[TestInitialize]
@@ -47,22 +46,7 @@ protected void Arrange()
4746

4847
protected void Act()
4948
{
50-
try
51-
{
52-
_forwardedPort.Stop();
53-
Assert.Fail();
54-
}
55-
catch (ObjectDisposedException ex)
56-
{
57-
_actualException = ex;
58-
}
59-
}
60-
61-
[TestMethod]
62-
public void StopShouldThrowObjectDisposedException()
63-
{
64-
Assert.IsNotNull(_actualException);
65-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
49+
_forwardedPort.Stop();
6650
}
6751

6852
[TestMethod]

‎src/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class ForwardedPortLocalTest_Stop_PortDisposed
1111
private ForwardedPortLocal _forwardedPort;
1212
private IList<EventArgs> _closingRegister;
1313
private IList<ExceptionEventArgs> _exceptionRegister;
14-
private ObjectDisposedException _actualException;
1514

1615
[TestInitialize]
1716
public void Setup()
@@ -43,22 +42,7 @@ protected void Arrange()
4342

4443
protected void Act()
4544
{
46-
try
47-
{
48-
_forwardedPort.Stop();
49-
Assert.Fail();
50-
}
51-
catch (ObjectDisposedException ex)
52-
{
53-
_actualException = ex;
54-
}
55-
}
56-
57-
[TestMethod]
58-
public void StopShouldThrowObjectDisposedException()
59-
{
60-
Assert.IsNotNull(_actualException);
61-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
45+
_forwardedPort.Stop();
6246
}
6347

6448
[TestMethod]

‎src/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class ForwardedPortRemoteTest_Stop_PortDisposed
1414
private IPEndPoint _remoteEndpoint;
1515
private IList<EventArgs> _closingRegister;
1616
private IList<ExceptionEventArgs> _exceptionRegister;
17-
private ObjectDisposedException _actualException;
1817

1918
[TestInitialize]
2019
public void Setup()
@@ -49,22 +48,7 @@ protected void Arrange()
4948

5049
protected void Act()
5150
{
52-
try
53-
{
54-
_forwardedPort.Stop();
55-
Assert.Fail();
56-
}
57-
catch (ObjectDisposedException ex)
58-
{
59-
_actualException = ex;
60-
}
61-
}
62-
63-
[TestMethod]
64-
public void StopShouldThrowObjectDisposedException()
65-
{
66-
Assert.IsNotNull(_actualException);
67-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
51+
_forwardedPort.Stop();
6852
}
6953

7054
[TestMethod]

‎src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<AssemblyOriginatorKeyFile>..\Renci.SshNet.snk</AssemblyOriginatorKeyFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="Microsoft.CSharp" />
4544
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4645
<Reference Include="Moq">
4746
<HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,9 @@
356356
<Compile Include="..\Renci.SshNet\Messages\Authentication\SuccessMessage.cs">
357357
<Link>Messages\Authentication\SuccessMessage.cs</Link>
358358
</Compile>
359+
<Compile Include="..\Renci.SshNet\Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs">
360+
<Link>Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs</Link>
361+
</Compile>
359362
<Compile Include="..\Renci.SshNet\Messages\Connection\ChannelCloseMessage.cs">
360363
<Link>Messages\Connection\ChannelCloseMessage.cs</Link>
361364
</Compile>
@@ -467,6 +470,9 @@
467470
<Compile Include="..\Renci.SshNet\Messages\Connection\RequestSuccessMessage.cs">
468471
<Link>Messages\Connection\RequestSuccessMessage.cs</Link>
469472
</Compile>
473+
<Compile Include="..\Renci.SshNet\Messages\Connection\TcpIpForwardGlobalRequestMessage.cs">
474+
<Link>Messages\Connection\TcpIpForwardGlobalRequestMessage.cs</Link>
475+
</Compile>
470476
<Compile Include="..\Renci.SshNet\Messages\Message.cs">
471477
<Link>Messages\Message.cs</Link>
472478
</Compile>
@@ -701,9 +707,6 @@
701707
<Compile Include="..\Renci.SshNet\Session.cs">
702708
<Link>Session.cs</Link>
703709
</Compile>
704-
<Compile Include="..\Renci.SshNet.Silverlight\Session.SilverlightShared.cs">
705-
<Link>Session.cs</Link>
706-
</Compile>
707710
<Compile Include="..\Renci.SshNet\SftpClient.cs">
708711
<Link>SftpClient.cs</Link>
709712
</Compile>
@@ -885,7 +888,6 @@
885888
<Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
886889
<Link>Properties\CommonAssemblyInfo.cs</Link>
887890
</Compile>
888-
<Compile Include="Session.WP.cs" />
889891
</ItemGroup>
890892
<ItemGroup>
891893
<None Include="packages.config">

0 commit comments

Comments
 (0)