Skip to content

Commit a66b32d

Browse files
driesengdrieseng
committed
Revert "Update to SshNet.Security.Cryptography 1.0.0."
This reverts commit df992c3.
1 parent 73d218f commit a66b32d

39 files changed

+768
-1028
lines changed

‎src/Renci.SshNet.NET35/Common/Extensions.NET35.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using System.Threading;
77

8-
namespace Renci.SshNet.Common
8+
namespace Renci.SshNet
99
{
1010
/// <summary>
1111
/// Collection of different extension method specific for .NET 3.5

‎src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<DefineConstants>TRACE;DEBUG;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25+
<DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>none</DebugType>
@@ -30,7 +32,9 @@
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
3234
<DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
33-
<NoWarn>1591</NoWarn>
35+
<NoWarn>
36+
</NoWarn>
37+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3438
</PropertyGroup>
3539
<PropertyGroup>
3640
<SignAssembly>true</SignAssembly>
@@ -728,9 +732,6 @@
728732
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
729733
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
730734
</Compile>
731-
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEllipticCurveDiffieHellman.cs">
732-
<Link>Security\KeyExchangeEllipticCurveDiffieHellman.cs</Link>
733-
</Compile>
734735
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
735736
<Link>Security\KeyHostAlgorithm.cs</Link>
736737
</Compile>
@@ -936,7 +937,7 @@
936937
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
937938
<ProjectExtensions>
938939
<VisualStudio>
939-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
940+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
940941
</VisualStudio>
941942
</ProjectExtensions>
942943
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@
136136
<Compile Include="..\Renci.SshNet\CommandAsyncResult.cs">
137137
<Link>CommandAsyncResult.cs</Link>
138138
</Compile>
139-
<Compile Include="..\Renci.SshNet\Common\Array.cs">
140-
<Link>Common\Array.cs</Link>
141-
</Compile>
142139
<Compile Include="..\Renci.SshNet\Common\ASCIIEncoding.cs">
143140
<Link>Common\ASCIIEncoding.cs</Link>
144141
</Compile>
@@ -903,7 +900,7 @@
903900
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
904901
<SilverlightProjectProperties />
905902
</FlavorProperties>
906-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
903+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
907904
</VisualStudio>
908905
</ProjectExtensions>
909906
<!-- 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: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<WarningLevel>4</WarningLevel>
3737
<Prefer32Bit>false</Prefer32Bit>
3838
<DocumentationFile>Bin\Debug\Renci.SshNet.xml</DocumentationFile>
39+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3940
</PropertyGroup>
4041
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4142
<DebugType>none</DebugType>
@@ -48,7 +49,9 @@
4849
<WarningLevel>4</WarningLevel>
4950
<Prefer32Bit>false</Prefer32Bit>
5051
<DocumentationFile>Bin\Release\Renci.SshNet.xml</DocumentationFile>
51-
<NoWarn>1591</NoWarn>
52+
<NoWarn>
53+
</NoWarn>
54+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5255
</PropertyGroup>
5356
<PropertyGroup>
5457
<SignAssembly>true</SignAssembly>
@@ -59,7 +62,8 @@
5962
<ItemGroup>
6063
<Reference Include="Microsoft.CSharp, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
6164
<Reference Include="mscorlib" />
62-
<Reference Include="SshNet.Security.Cryptography">
65+
<Reference Include="SshNet.Security.Cryptography, Version=1.0.0.0, Culture=neutral, PublicKeyToken=50c6375d29e47192, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
6367
<HintPath>..\..\packages\SshNet.Security.Cryptography.1.0.0\lib\sl5\SshNet.Security.Cryptography.dll</HintPath>
6468
<Private>True</Private>
6569
</Reference>
@@ -708,9 +712,6 @@
708712
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
709713
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
710714
</Compile>
711-
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEllipticCurveDiffieHellman.cs">
712-
<Link>Security\KeyExchangeEllipticCurveDiffieHellman.cs</Link>
713-
</Compile>
714715
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
715716
<Link>Security\KeyHostAlgorithm.cs</Link>
716717
</Compile>
@@ -903,9 +904,7 @@
903904
<None Include="..\Renci.SshNet.snk">
904905
<Link>Renci.SshNet.snk</Link>
905906
</None>
906-
<None Include="packages.config">
907-
<SubType>Designer</SubType>
908-
</None>
907+
<None Include="packages.config" />
909908
</ItemGroup>
910909
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
911910
<ProjectExtensions>

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,6 @@
257257
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExceptionEventArgsTest.cs">
258258
<Link>Classes\Common\ExceptionEventArgsTest.cs</Link>
259259
</Compile>
260-
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_Concat.cs">
261-
<Link>Classes\Common\ExtensionsTest_Concat.cs</Link>
262-
</Compile>
263-
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_IsEqualTo_ByteArray.cs">
264-
<Link>Classes\Common\ExtensionsTest_IsEqualTo_ByteArray.cs</Link>
265-
</Compile>
266-
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_Take_Count.cs">
267-
<Link>Classes\Common\ExtensionsTest_Take_Count.cs</Link>
268-
</Compile>
269-
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_Take_OffsetAndCount.cs">
270-
<Link>Classes\Common\ExtensionsTest_Take_OffsetAndCount.cs</Link>
271-
</Compile>
272-
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_TrimLeadingZeros.cs">
273-
<Link>Classes\Common\ExtensionsTest_TrimLeadingZeros.cs</Link>
274-
</Compile>
275260
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\HostKeyEventArgsTest.cs">
276261
<Link>Classes\Common\HostKeyEventArgsTest.cs</Link>
277262
</Compile>
@@ -1286,7 +1271,7 @@
12861271
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
12871272
<ProjectExtensions>
12881273
<VisualStudio>
1289-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
1274+
<UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
12901275
</VisualStudio>
12911276
</ProjectExtensions>
12921277
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ private void Performance(byte[] first, byte[] second, int runs)
151151

152152
Console.WriteLine(stopWatch.ElapsedMilliseconds);
153153

154-
stopWatch.Reset();
155-
stopWatch.Start();
154+
stopWatch.Restart();
156155

157156
for (var i = 0; i < runs; i++)
158157
{

‎src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_IsEqualTo_ByteArray.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ private void Performance(byte[] left, byte[] right, int runs)
161161

162162
Console.WriteLine(stopWatch.ElapsedMilliseconds);
163163

164-
stopWatch.Reset();
165-
stopWatch.Start();
164+
stopWatch.Restart();
166165

167166
for (var i = 0; i < runs; i++)
168167
{

‎src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Take_Count.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ private void Performance(byte[] value, int count, int runs)
158158

159159
Console.WriteLine(stopWatch.ElapsedMilliseconds);
160160

161-
stopWatch.Reset();
162-
stopWatch.Start();
161+
stopWatch.Restart();
163162

164163
for (var i = 0; i < runs; i++)
165164
{

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>4</WarningLevel>
2929
<DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
30+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3233
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,6 +38,7 @@
3738
<ErrorReport>prompt</ErrorReport>
3839
<WarningLevel>4</WarningLevel>
3940
<DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
41+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4042
</PropertyGroup>
4143
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
4244
<PlatformTarget>x86</PlatformTarget>
@@ -766,9 +768,6 @@
766768
<Compile Include="..\Renci.SshNet\Security\KeyExchangeDiffieHellmanGroupSha1.cs">
767769
<Link>Security\KeyExchangeDiffieHellmanGroupSha1.cs</Link>
768770
</Compile>
769-
<Compile Include="..\Renci.SshNet\Security\KeyExchangeEllipticCurveDiffieHellman.cs">
770-
<Link>Security\KeyExchangeEllipticCurveDiffieHellman.cs</Link>
771-
</Compile>
772771
<Compile Include="..\Renci.SshNet\Security\KeyHostAlgorithm.cs">
773772
<Link>Security\KeyHostAlgorithm.cs</Link>
774773
</Compile>

‎src/Renci.SshNet.VS2015.sln.DotSettings

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">WARNING</s:String>
77
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
88
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
9-
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>
9+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
10+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HMACMD/@EntryIndexedValue">HMACMD</s:String>
11+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HMACSHA/@EntryIndexedValue">HMACSHA</s:String></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)