prepare v2.3.3 (#176)

* update packages * update changelog
fszlin · Dec 17, 2018 · 58dc3fc · 58dc3fc
1 parent b23b475
commit 58dc3fc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 42 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -3,12 +3,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.3.3] - 2018-12-16
+### Changed
+- Fix EC account key encoding [#173](https://github.com/fszlin/certes/issues/173)
+
 ## [2.3.2] - 2018-10-20
 ### Changed
 - Implement `POST-as-GET` for loading ACME resources
 
 ### Changed
-- Fix account key roll-over missing old key field ([#154](https://github.com/fszlin/certes/issues/154))
+- Fix account key roll-over missing old key field [#154](https://github.com/fszlin/certes/issues/154)
 - Update TLS-ALPN OID as [draft-03](https://tools.ietf.org/html/draft-ietf-acme-tls-alpn-03)
 
 ## [2.3.1] - 2018-10-16
@@ -103,7 +107,8 @@ All notable changes to this project will be documented in this file.
 [2.3.0]: https://github.com/fszlin/certes/compare/v2.2.2...v2.3.0
 [2.3.1]: https://github.com/fszlin/certes/compare/v2.3.0...v2.3.1
 [2.3.2]: https://github.com/fszlin/certes/compare/v2.3.1...v2.3.2
-[Unreleased]: https://github.com/fszlin/certes/compare/v2.3.2...HEAD
+[2.3.2]: https://github.com/fszlin/certes/compare/v2.3.2...v2.3.3
+[Unreleased]: https://github.com/fszlin/certes/compare/v2.3.3...HEAD
 
 [i5]: https://github.com/fszlin/certes/issues/5
 [i22]: https://github.com/fszlin/certes/issues/22

diff --git a/src/Certes.Cli/Certes.Cli.csproj b/src/Certes.Cli/Certes.Cli.csproj
@@ -32,10 +32,10 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.8.1" />
-    <PackageReference Include="NLog" Version="4.5.10" PrivateAssets="all" />
+    <PackageReference Include="NLog" Version="4.5.11" PrivateAssets="all" />
     <PackageReference Include="System.CommandLine" Version="0.1.0-*" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Azure.Management.Dns.Fluent" Version="1.16.1" />
-    <PackageReference Include="Microsoft.Azure.Management.AppService.Fluent" Version="1.16.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Dns.Fluent" Version="1.18.0" />
+    <PackageReference Include="Microsoft.Azure.Management.AppService.Fluent" Version="1.18.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Certes/Json/JsonUtil.cs b/src/Certes/Json/JsonUtil.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Certes.Jws;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Certes.Json
@@ -31,29 +26,4 @@ public static JsonSerializerSettings CreateSettings()
             return jsonSettings;
         }
     }
-
-    /// <summary>
-    /// JSON contract resolver supports ordering JWK properties.
-    /// </summary>
-    /// <seealso cref="Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver" />
-    internal sealed class ContractResolver : CamelCasePropertyNamesContractResolver
-    {
-        /// <summary>
-        /// Creates properties for the given <see cref="T:Newtonsoft.Json.Serialization.JsonContract" />.
-        /// </summary>
-        /// <param name="type">The type to create properties for.</param>
-        /// <param name="memberSerialization">The member serialization mode for the type.</param>
-        /// <returns>
-        /// Properties for the given <see cref="T:Newtonsoft.Json.Serialization.JsonContract" />.
-        /// </returns>
-        protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
-        {
-            if (typeof(JsonWebKey).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()))
-            {
-                return base.CreateProperties(type, memberSerialization).OrderBy(p => p.PropertyName).ToArray();
-            }
-
-            return base.CreateProperties(type, memberSerialization);
-        }
-    }
 }
diff --git a/test/Certes.Tests.Integration/Certes.Tests.Integration.csproj b/test/Certes.Tests.Integration/Certes.Tests.Integration.csproj
@@ -26,8 +26,8 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="15.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
-    <PackageReference Include="NLog" Version="4.5.10" />
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="NLog" Version="4.5.11" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="System.CommandLine" Version="0.1.0-*" Condition="'$(IncludeCli)' == 'True'" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/test/Certes.Tests.Web/Certes.Tests.Web.csproj b/test/Certes.Tests.Web/Certes.Tests.Web.csproj
@@ -7,8 +7,8 @@
     <Compile Include="..\Certes.Tests\Keys.cs" Link="Keys.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Dns.Fluent" Version="1.16.1" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
+    <PackageReference Include="Microsoft.Azure.Management.Dns.Fluent" Version="1.18.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Certes\Certes.csproj" />

diff --git a/test/Certes.Tests/Certes.Tests.csproj b/test/Certes.Tests/Certes.Tests.csproj
@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="15.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
-    <PackageReference Include="NLog" Version="4.5.10" />
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="NLog" Version="4.5.11" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="System.CommandLine" Version="0.1.0-*" Condition="'$(IncludeCli)' == 'True'" />
     <PackageReference Include="xunit" Version="2.4.1" />