Incorporate the changes committed in the release branch

Author: kevinchalet

src/AspNet.Security.OAuth.Introspection/OAuthIntrospectionHandler.cs

@@ -288,7 +288,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
 
                     // Add the token identifier as a property on the authentication ticket.
                     case OAuthIntrospectionConstants.Claims.JwtId: {
-                        properties.Items[OAuthIntrospectionConstants.Properties.TicketId] = property.Value<string>();
+                        properties.Items[OAuthIntrospectionConstants.Properties.TicketId] = (string) property;
 
                         continue;
                     }

src/Owin.Security.OAuth.Introspection/OAuthIntrospectionHandler.cs

@@ -278,7 +278,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
 
                     // Add the token identifier as a property on the authentication ticket.
                     case OAuthIntrospectionConstants.Claims.JwtId: {
-                        properties.Dictionary[OAuthIntrospectionConstants.Properties.TicketId] = property.Value<string>();
+                        properties.Dictionary[OAuthIntrospectionConstants.Properties.TicketId] = (string) property;
 
                         continue;
                     }

test/AspNet.Security.OAuth.Introspection.Tests/OAuthIntrospectionMiddlewareTests.cs

@@ -708,13 +708,15 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
 
                                 break;
                             }
 
                             case "valid-token-with-scopes": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Scope] =
                                     "C54A8F5E-0387-43F4-BA43-FD4B50DC190D 5C57E3BD-9EFB-4224-9AB8-C8C5E009FFD7";
@@ -724,6 +726,7 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token-with-single-audience": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Audience] = "http://www.google.com/";
 
@@ -732,6 +735,7 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token-with-multiple-audiences": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Audience] = JArray.FromObject(new[] {
                                     "http://www.google.com/", "http://www.fabrikam.com/"

test/AspNet.Security.OAuth.Validation.Tests/project.json

@@ -8,6 +8,7 @@
     "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
+    "Newtonsoft.Json": "8.0.3",
     "xunit": "2.1.0"
   },
 

test/Owin.Security.OAuth.Introspection.Tests/OAuthIntrospectionMiddlewareTests.cs

@@ -670,13 +670,15 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
 
                                 break;
                             }
 
                             case "valid-token-with-scopes": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Scope] =
                                     "C54A8F5E-0387-43F4-BA43-FD4B50DC190D 5C57E3BD-9EFB-4224-9AB8-C8C5E009FFD7";
@@ -686,6 +688,7 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token-with-single-audience": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Audience] = "http://www.google.com/";
 
@@ -694,6 +697,7 @@ private static TestServer CreateAuthorizationServer() {
 
                             case "valid-token-with-multiple-audiences": {
                                 payload[OAuthIntrospectionConstants.Claims.Active] = true;
+                                payload[OAuthIntrospectionConstants.Claims.JwtId] = "jwt-token-identifier";
                                 payload[OAuthIntrospectionConstants.Claims.Subject] = "Fabrikam";
                                 payload[OAuthIntrospectionConstants.Claims.Audience] = JArray.FromObject(new[] {
                                     "http://www.google.com/", "http://www.fabrikam.com/"