From 6072e3b1b80befa6472b0134399d5d21ae9d1178 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Tue, 21 Apr 2015 16:21:50 -0700 Subject: [PATCH] #221 Remove unneeded dependencies around DataProtection. --- samples/CookieSample/project.json | 1 + samples/CookieSessionSample/project.json | 1 + samples/OpenIdConnectSample/project.json | 1 + samples/SocialSample/project.json | 1 + .../project.json | 6 +++++- .../project.json | 1 - .../project.json | 3 ++- src/Microsoft.AspNet.Authentication/project.json | 12 ++++++++---- .../project.json | 1 + 9 files changed, 20 insertions(+), 7 deletions(-) diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index 1c559aeba3..e69eed0e2c 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.Framework.Logging.Console": "1.0.0-*", diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index 0e8c9a350e..0f481e6110 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.Framework.Caching.Memory": "1.0.0-*", diff --git a/samples/OpenIdConnectSample/project.json b/samples/OpenIdConnectSample/project.json index 13d492ed37..815ad8a333 100644 --- a/samples/OpenIdConnectSample/project.json +++ b/samples/OpenIdConnectSample/project.json @@ -2,6 +2,7 @@ "dependencies": { "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.Framework.Logging.Console": "1.0.0-*", diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 7c52600f35..ccaf0a439b 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -5,6 +5,7 @@ "Microsoft.AspNet.Authentication.Google": "1.0.0-*", "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*", "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/src/Microsoft.AspNet.Authentication.Facebook/project.json b/src/Microsoft.AspNet.Authentication.Facebook/project.json index 7bce6f458e..a14ab52da3 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/project.json +++ b/src/Microsoft.AspNet.Authentication.Facebook/project.json @@ -8,6 +8,10 @@ }, "frameworks": { "dnx451": { }, - "dnxcore50": { } + "dnxcore50": { + "dependencies": { + "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*" + } + } } } diff --git a/src/Microsoft.AspNet.Authentication.OAuth/project.json b/src/Microsoft.AspNet.Authentication.OAuth/project.json index 215b5155d0..a3409abf81 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/project.json +++ b/src/Microsoft.AspNet.Authentication.OAuth/project.json @@ -2,7 +2,6 @@ "version": "1.0.0-*", "description": "ASP.NET 5 middleware that enables an application to support any standard OAuth 2.0 authentication workflow.", "dependencies": { - "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Authentication": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Newtonsoft.Json": "6.0.6" diff --git a/src/Microsoft.AspNet.Authentication.Twitter/project.json b/src/Microsoft.AspNet.Authentication.Twitter/project.json index 33d73fd1c2..a9d804bc2e 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/project.json +++ b/src/Microsoft.AspNet.Authentication.Twitter/project.json @@ -14,7 +14,8 @@ }, "dnxcore50": { "dependencies": { - "System.Net.Http.WinHttpHandler": "4.0.0-beta-*" + "System.Net.Http.WinHttpHandler": "4.0.0-beta-*", + "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*" } } } diff --git a/src/Microsoft.AspNet.Authentication/project.json b/src/Microsoft.AspNet.Authentication/project.json index 8367af5f0d..a28d27e07a 100644 --- a/src/Microsoft.AspNet.Authentication/project.json +++ b/src/Microsoft.AspNet.Authentication/project.json @@ -2,15 +2,19 @@ "version": "1.0.0-*", "description": "ASP.NET 5 common types used by the various authentication middleware.", "dependencies": { - "Microsoft.AspNet.DataProtection": "1.0.0-*", + "Microsoft.AspNet.DataProtection.Interfaces": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.Framework.Logging.Interfaces": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, + "Microsoft.Framework.OptionsModel": "1.0.0-*" }, "frameworks": { "dnx451": { }, - "dnxcore50": { } + "dnxcore50": { + "dependencies": { + "System.Security.Cryptography.RandomNumberGenerator": "4.0.0-beta-*" + } + } } } diff --git a/test/Microsoft.AspNet.Authentication.Test/project.json b/test/Microsoft.AspNet.Authentication.Test/project.json index 2d88d7988c..c7f594c4fe 100644 --- a/test/Microsoft.AspNet.Authentication.Test/project.json +++ b/test/Microsoft.AspNet.Authentication.Test/project.json @@ -10,6 +10,7 @@ "Microsoft.AspNet.Authentication.OAuthBearer": "1.0.0-*", "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*", "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*", "Moq": "4.2.1312.1622", "xunit.runner.aspnet": "2.0.0-aspnet-*"