Merge pull request #4 from SiroccoHub/develop

Merge pull request #3 from SiroccoHub/master
SiroccoHub · May 24, 2016 · 4a36b00 · 4a36b00
2 parents fa3b913 + 4a6b233
commit 4a36b00
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/samples/SampleWebApp.NetCore/project.json b/samples/SampleWebApp.NetCore/project.json
@@ -19,7 +19,7 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
-    "JwtCore": "1.0.0-*"
+    "JwtCore": "1.0.2-*"
   },
 
   "tools": {

diff --git a/samples/SampleWebApp.NetFramework/project.json b/samples/SampleWebApp.NetFramework/project.json
@@ -2,7 +2,7 @@
   "userSecretsId": "aspnet-AspNetCoreWebAppNetFramework-95211b09-bb53-48ae-9f0e-62bb09ee18d5",
 
   "dependencies": {
-    "JwtCore": "1.0.1.0",
+    "JwtCore": "1.0.2-*",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-rc2-final",
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
     "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-rc2-final",

diff --git a/src/JwtCore/Properties/AssemblyInfo.cs b/src/JwtCore/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/src/JwtCore/project.json b/src/JwtCore/project.json
@@ -1,8 +1,7 @@
 {
   "title": "JwtCore",
   "copyright": "Public Domain",
-  "version": "1.0.1.0",
-
+  "version": "1.0.2.0",
   "description": "JwtCore is a JWT / JWS Implementation for .NET Core",
   "authors": [ "@arichika (arichika.taniguchi)" ],
   "packOptions": {
@@ -14,22 +13,24 @@
       "url": "https://github.com/SiroccoHub/JwtCore.git"
     }
   },
-
-  "dependencies": {
-    "Microsoft.CSharp": "4.0.0",
-    "NETStandard.Library": "1.5.0-rc2-*",
-    "Newtonsoft.Json": "8.0.*",
-    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-*"
-  },
-
   "frameworks": {
     "netstandard1.3": {
       "imports": [
         "dnxcore50",
         "dnx451",
         "dnxcore50"
-      ]
+      ],
+      "dependencies": {
+        "Microsoft.CSharp": "4.0.1-rc2-24027",
+        "Newtonsoft.Json": "8.0.4-beta1",
+        "NETStandard.Library": "1.5.0-rc2-*",
+        "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027"
+      }
     },
-    "net4.6": {} 
+    "net4.6": {
+      "dependencies": {
+        "Newtonsoft.Json": "8.0.4-beta1"
+      }
+    }
   }
 }
diff --git a/tests/JwtCore.Tests/project.json b/tests/JwtCore.Tests/project.json
@@ -6,7 +6,7 @@
   "testRunner": "xunit",
 
   "dependencies": {
-    "JwtCore": "1.0.0-*",
+    "JwtCore": "1.0.2-*",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-*",
     "FluentAssertions": "4.6.1"