We now use System.Security.Cryptography.Primitives on our UAP 10.0 assembly as well.

drieseng · drieseng · commit 7107f70fbd42 · 2016-07-12T22:25:44.000+02:00
ifdef out tests that verify TransformBlock/TransformFinalBlock on UAP
10.0.
diff --git a/build/nuget/SshNet.Security.Cryptography.nuspec b/build/nuget/SshNet.Security.Cryptography.nuspec
@@ -40,11 +40,12 @@ For all other target frameworks, these methods/properties were already public.
         <dependency id="System.IO" version="4.1.0" />
         <dependency id="System.Security.Cryptography.Primitives" version="4.0.0" />
       </group>
-      <group targetFramework=".NETPortable0.0-Profile111" />
+      <group targetFramework=".NETPortable,Version=v4.5,Profile=Profile111" />
       <group targetFramework="Silverlight4.0" />
       <group targetFramework="Silverlight5.0" />
       <group targetFramework="UAP10.0">
         <dependency id="System.IO" version="4.1.0" />
+        <dependency id="System.Security.Cryptography.Primitives" version="4.0.0" />
       </group>
       <group targetFramework="WindowsPhone7.1" />
       <group targetFramework="WindowsPhone8.0" />
diff --git a/src/SshNet.Security.Cryptography.UAP10/SshNet.Security.Cryptography.UAP10.csproj b/src/SshNet.Security.Cryptography.UAP10/SshNet.Security.Cryptography.UAP10.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_CRYPTO_HASHALGORITHM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\SshNet.Security.Cryptography.xml</DocumentationFile>
@@ -34,7 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_CRYPTO_HASHALGORITHM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/SshNet.Security.Cryptography.UAP10/project.json b/src/SshNet.Security.Cryptography.UAP10/project.json
@@ -1,6 +1,7 @@
 ﻿{
   "dependencies": {
-    "System.IO": "4.1.0"
+    "System.IO": "4.1.0",
+    "System.Security.Cryptography.Primitives": "4.0.0"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/test/SshNet.Security.Cryptography.NET20.Tests/SshNet.Security.Cryptography.NET20.Tests.csproj b/test/SshNet.Security.Cryptography.NET20.Tests/SshNet.Security.Cryptography.NET20.Tests.csproj
@@ -18,15 +18,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/SshNet.Security.Cryptography.NET40.Tests/SshNet.Security.Cryptography.NET40.Tests.csproj b/test/SshNet.Security.Cryptography.NET40.Tests/SshNet.Security.Cryptography.NET40.Tests.csproj
@@ -18,15 +18,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/SshNet.Security.Cryptography.NET45+Win8+WPA81.Tests/SshNet.Security.Cryptography.NET45+Win8+WPA81.Tests.csproj b/test/SshNet.Security.Cryptography.NET45+Win8+WPA81.Tests/SshNet.Security.Cryptography.NET45+Win8+WPA81.Tests.csproj
@@ -24,15 +24,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_HASHALGORITHM_TRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/SshNet.Security.Cryptography.Shared.Tests/SHA1Test.cs b/test/SshNet.Security.Cryptography.Shared.Tests/SHA1Test.cs
@@ -60,6 +60,7 @@ public void Rfc3174_4()
             Assert.Equal(expectedHash, actualHash);
         }
 
+#if FEATURE_HASHALGORITHM_TRANSFORM
         [Fact]
         public void TransformFinalBlock_InputCountLessThanBlockSize()
         {
@@ -165,5 +166,6 @@ public void TransformFinalBlockShouldAddBlockWhenThereIsNoRoomForMessageLength()
             Assert.Equal(data, actual);
             Assert.Equal(expectedHash, _hashAlgorithm.Hash);
         }
+#endif // FEATURE_HASHALGORITHM_TRANSFORM
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "System.IO": "4.1.0"`
	`3`	`+ "System.IO": "4.1.0",`
	`4`	`+ "System.Security.Cryptography.Primitives": "4.0.0"`
`4`	`5`	`},`
`5`	`6`	`"frameworks": {`
`6`	`7`	`"uap10.0": {}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public void Rfc3174_4()`
`60`	`60`	`Assert.Equal(expectedHash, actualHash);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+#if FEATURE_HASHALGORITHM_TRANSFORM`
`63`	`64`	`[Fact]`
`64`	`65`	`public void TransformFinalBlock_InputCountLessThanBlockSize()`
`65`	`66`	`{`
`@@ -165,5 +166,6 @@ public void TransformFinalBlockShouldAddBlockWhenThereIsNoRoomForMessageLength()`
`165`	`166`	`Assert.Equal(data, actual);`
`166`	`167`	`Assert.Equal(expectedHash, _hashAlgorithm.Hash);`
`167`	`168`	`}`
	`169`	`+#endif // FEATURE_HASHALGORITHM_TRANSFORM`
`168`	`170`	`}`
`169`	`171`	`}`