Merge branch 'dev'

fszlin · Jul 13, 2016 · a020a43 · a020a43
2 parents 19dc1b1 + 3f90d40
commit a020a43
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/src/Certes.Cli/project.json b/src/Certes.Cli/project.json
@@ -14,7 +14,7 @@
       "version": "1.0.0"
     },
     "NLog": "4.4.0-beta13",
-    "System.CommandLine": "0.1.0-e160707-1"
+    "System.CommandLine": "0.1.0-e160709-1"
   },
 
   "frameworks": {

diff --git a/src/Certes/Pkcs/CertificationRequestBuilder.cs b/src/Certes/Pkcs/CertificationRequestBuilder.cs
@@ -40,7 +40,9 @@ public CertificationRequestBuilder(KeyInfo keyInfo)
         /// <summary>
         /// Initializes a new instance of the <see cref="CertificationRequestBuilder"/> class.
         /// </summary>
-        /// <exception cref="System.NotSupportedException"></exception>
+        /// <exception cref="System.NotSupportedException">
+        /// If the provided key is not one of the supported <seealso cref="SignatureAlgorithm"/>.
+        /// </exception>
         public CertificationRequestBuilder()
         {
             if (keyInfo == null)

diff --git a/src/Certes/project.json b/src/Certes/project.json
@@ -3,19 +3,13 @@
   "title": "Certes ACME Client",
   "description": "A client implantation for the Automated Certificate Management Environment (ACME) protocol",
   "dependencies": {
-    "NETStandard.Library": "1.6.0",
     "Newtonsoft.Json": "9.0.1",
-    "Portable.BouncyCastle": "1.8.1.1"
+    "Portable.BouncyCastle": "1.8.1.1",
+    "System.Net.Http": "4.1.0",
+    "System.Runtime.InteropServices": "4.1.0"
   },
   "frameworks": {
-    "netstandard1.5": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "System.Runtime.Serialization.Primitives": "4.1.1",
-        "System.Security.Cryptography.Csp": "4.0.0"
-      }
-    },
-    "net45": {}
+    "netstandard1.3": {}
   },
   "buildOptions": {
     "embed": [

diff --git a/test/Certes.Tests/Certes.Tests.xproj b/test/Certes.Tests/Certes.Tests.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>9fdd9052-506d-460d-bf4a-142dab517524</ProjectGuid>
-    <RootNamespace>AutoCert</RootNamespace>
+    <RootNamespace>Certes</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

diff --git a/test/Certes.Tests/Pkcs/KeyInfoTests.cs b/test/Certes.Tests/Pkcs/KeyInfoTests.cs
@@ -1,9 +1,8 @@
 using Certes;
-using Certes.Pkcs;
 using System;
 using Xunit;
 
-namespace AutoCert.Pkcs
+namespace Certes.Pkcs
 {
     public class KeyInfoTests
     {