From 23c024ef4112f12ea4e107ceee7a0ee30ae4fb61 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 5 Oct 2014 12:26:17 -0700 Subject: [PATCH] Fixup references --- samples/CookieSample/project.json | 5 -- samples/CookieSessionSample/project.json | 7 -- samples/SocialSample/project.json | 34 +++++----- .../project.json | 4 -- .../project.json | 10 +-- .../project.json | 10 +-- .../project.json | 10 +-- .../project.json | 12 ++-- .../project.json | 12 ++-- src/Microsoft.AspNet.Security/project.json | 68 +++++++++---------- .../project.json | 57 ++++++++-------- 11 files changed, 104 insertions(+), 125 deletions(-) diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index 9d6c8a5348..a962cc9626 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -1,10 +1,5 @@ { "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.HttpFeature": "1.0.0-*", - "Microsoft.AspNet.PipelineCore": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.Cookies": "1.0.0-*", diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index 9e72b7aca0..660715f5f1 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -1,12 +1,5 @@ { "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.HttpFeature": "1.0.0-*", - "Microsoft.AspNet.PipelineCore": "1.0.0-*", - "Microsoft.AspNet.RequestContainer": "1.0.0-*", - "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.Cookies": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.Framework.Cache.Memory": "1.0.0-*", diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 3909b91623..b1942aa64d 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -1,22 +1,20 @@ { - "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.Security": "1.0.0-*", - "Microsoft.AspNet.Security.Cookies": "1.0.0-*", - "Microsoft.AspNet.Security.Facebook": "1.0.0-*", - "Microsoft.AspNet.Security.Google": "1.0.0-*", - "Microsoft.AspNet.Security.MicrosoftAccount": "1.0.0-*", - "Microsoft.AspNet.Security.Twitter": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*" - }, - "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" }, - "frameworks": { - "aspnet50": { + "dependencies": { + "Microsoft.AspNet.Diagnostics": "1.0.0-*", + "Microsoft.AspNet.Security": "1.0.0-*", + "Microsoft.AspNet.Security.Cookies": "1.0.0-*", + "Microsoft.AspNet.Security.Facebook": "1.0.0-*", + "Microsoft.AspNet.Security.Google": "1.0.0-*", + "Microsoft.AspNet.Security.MicrosoftAccount": "1.0.0-*", + "Microsoft.AspNet.Security.Twitter": "1.0.0-*", + "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*" }, - "aspnetcore50": { + "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" }, + "frameworks": { + "aspnet50": { + }, + "aspnetcore50": { + } } - } } diff --git a/src/Microsoft.AspNet.Security.Cookies/project.json b/src/Microsoft.AspNet.Security.Cookies/project.json index 715a02a7e9..154d018216 100644 --- a/src/Microsoft.AspNet.Security.Cookies/project.json +++ b/src/Microsoft.AspNet.Security.Cookies/project.json @@ -1,10 +1,6 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.HttpFeature": "1.0.0-*", - "Microsoft.AspNet.PipelineCore": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", diff --git a/src/Microsoft.AspNet.Security.Facebook/project.json b/src/Microsoft.AspNet.Security.Facebook/project.json index eeba5b2d22..6ad815156a 100644 --- a/src/Microsoft.AspNet.Security.Facebook/project.json +++ b/src/Microsoft.AspNet.Security.Facebook/project.json @@ -1,19 +1,18 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.AspNet.Security.OAuth": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Newtonsoft.Json": "6.0.4", - "System.Net.Http": "4.0.0.0" + "Newtonsoft.Json": "6.0.4" }, "frameworks": { "aspnet50": { - "dependencies": { + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0" } }, "aspnetcore50": { @@ -36,7 +35,8 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" + "System.Threading.Tasks": "4.0.10.0", + "System.Net.Http": "4.0.0.0" } } } diff --git a/src/Microsoft.AspNet.Security.Google/project.json b/src/Microsoft.AspNet.Security.Google/project.json index eeba5b2d22..6ad815156a 100644 --- a/src/Microsoft.AspNet.Security.Google/project.json +++ b/src/Microsoft.AspNet.Security.Google/project.json @@ -1,19 +1,18 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.AspNet.Security.OAuth": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Newtonsoft.Json": "6.0.4", - "System.Net.Http": "4.0.0.0" + "Newtonsoft.Json": "6.0.4" }, "frameworks": { "aspnet50": { - "dependencies": { + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0" } }, "aspnetcore50": { @@ -36,7 +35,8 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" + "System.Threading.Tasks": "4.0.10.0", + "System.Net.Http": "4.0.0.0" } } } diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json b/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json index cf6a2e96a8..c0c9fa2067 100644 --- a/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json +++ b/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json @@ -1,19 +1,18 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.AspNet.Security.OAuth": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Newtonsoft.Json": "6.0.4", - "System.Net.Http": "4.0.0.0" + "Newtonsoft.Json": "6.0.4" }, "frameworks": { "aspnet50": { - "dependencies": { + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0" } }, "aspnetcore50": { @@ -38,7 +37,8 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" + "System.Threading.Tasks": "4.0.10.0", + "System.Net.Http": "4.0.0.0" } } } diff --git a/src/Microsoft.AspNet.Security.OAuth/project.json b/src/Microsoft.AspNet.Security.OAuth/project.json index f81cf844e8..0d4766cadb 100644 --- a/src/Microsoft.AspNet.Security.OAuth/project.json +++ b/src/Microsoft.AspNet.Security.OAuth/project.json @@ -1,19 +1,18 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Newtonsoft.Json": "6.0.4", - "System.Net.Http": "4.0.0.0" + "Newtonsoft.Json": "6.0.4" }, "frameworks": { "aspnet50": { - "dependencies": { - "System.Net.Http.WebRequest": "" + "frameworkAssemblies": { + "System.Net.Http.WebRequest": "4.0.0.0", + "System.Net.Http": "4.0.0.0" } }, "aspnetcore50": { @@ -39,7 +38,8 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" + "System.Threading.Tasks": "4.0.10.0", + "System.Net.Http": "4.0.0.0" } } } diff --git a/src/Microsoft.AspNet.Security.Twitter/project.json b/src/Microsoft.AspNet.Security.Twitter/project.json index f8498191be..5f1c34c942 100644 --- a/src/Microsoft.AspNet.Security.Twitter/project.json +++ b/src/Microsoft.AspNet.Security.Twitter/project.json @@ -1,19 +1,18 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.Security": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", - "Newtonsoft.Json": "6.0.4", - "System.Net.Http": "4.0.0.0" + "Newtonsoft.Json": "6.0.4" }, "frameworks": { "aspnet50": { - "dependencies": { - "System.Net.Http.WebRequest": "" + "frameworkAssemblies": { + "System.Net.Http.WebRequest": "4.0.0.0", + "System.Net.Http": "4.0.0.0" } }, "aspnetcore50": { @@ -37,7 +36,8 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0.0", "System.Security.Principal": "4.0.0.0", "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" + "System.Threading.Tasks": "4.0.10.0", + "System.Net.Http": "4.0.0.0" } } } diff --git a/src/Microsoft.AspNet.Security/project.json b/src/Microsoft.AspNet.Security/project.json index d547252967..11854a0e14 100644 --- a/src/Microsoft.AspNet.Security/project.json +++ b/src/Microsoft.AspNet.Security/project.json @@ -1,38 +1,36 @@ { - "version": "1.0.0-*", - "dependencies": { - "Microsoft.AspNet.FeatureModel": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.HttpFeature": "1.0.0-*", - "Microsoft.AspNet.PipelineCore": "1.0.0-*", - "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.Logging": "1.0.0-*" - }, - "frameworks": { - "aspnet50": {}, - "aspnetcore50": { - "dependencies": { - "System.Collections": "4.0.10.0", - "System.ComponentModel": "4.0.0.0", - "System.Console": "4.0.0.0", - "System.Diagnostics.Debug": "4.0.10.0", - "System.Diagnostics.Tools": "4.0.0.0", - "System.Globalization": "4.0.10.0", - "System.IO": "4.0.10.0", - "System.IO.Compression": "4.0.0.0", - "System.Linq": "4.0.0.0", - "System.Reflection": "4.0.10.0", - "System.Resources.ResourceManager": "4.0.0.0", - "System.Runtime": "4.0.20.0", - "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.20.0", - "System.Security.Claims": "1.0.0-*", - "System.Security.Cryptography.RandomNumberGenerator" : "4.0.0.0", - "System.Security.Principal" : "4.0.0.0", - "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.10.0" - } + "version": "1.0.0-*", + "dependencies": { + "Microsoft.AspNet.HttpFeature": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.AspNet.PipelineCore": "1.0.0-*", + "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.Logging": "1.0.0-*" + }, + "frameworks": { + "aspnet50": { }, + "aspnetcore50": { + "dependencies": { + "System.Collections": "4.0.10.0", + "System.ComponentModel": "4.0.0.0", + "System.Console": "4.0.0.0", + "System.Diagnostics.Debug": "4.0.10.0", + "System.Diagnostics.Tools": "4.0.0.0", + "System.Globalization": "4.0.10.0", + "System.IO": "4.0.10.0", + "System.IO.Compression": "4.0.0.0", + "System.Linq": "4.0.0.0", + "System.Reflection": "4.0.10.0", + "System.Resources.ResourceManager": "4.0.0.0", + "System.Runtime": "4.0.20.0", + "System.Runtime.Extensions": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", + "System.Security.Claims": "1.0.0-*", + "System.Security.Cryptography.RandomNumberGenerator": "4.0.0.0", + "System.Security.Principal": "4.0.0.0", + "System.Threading": "4.0.0.0", + "System.Threading.Tasks": "4.0.10.0" + } + } } - } } diff --git a/test/Microsoft.AspNet.Security.Test/project.json b/test/Microsoft.AspNet.Security.Test/project.json index 49f7858ad5..c3b4a4b2c9 100644 --- a/test/Microsoft.AspNet.Security.Test/project.json +++ b/test/Microsoft.AspNet.Security.Test/project.json @@ -1,32 +1,31 @@ { - "compilationOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Security" : "1.0.0-*", - "Microsoft.AspNet.Security.Cookies" : "1.0.0-*", - "Microsoft.AspNet.Security.Facebook" : "1.0.0-*", - "Microsoft.AspNet.Security.Google" : "1.0.0-*", - "Microsoft.AspNet.Security.MicrosoftAccount" : "1.0.0-*", - "Microsoft.AspNet.Security.Twitter" : "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "System.Net.Http": "4.0.0.0", - "Moq": "4.2.1312.1622", - "Xunit.KRunner": "1.0.0-*" - }, - "commands": { - "test": "Xunit.KRunner" - }, - "frameworks": { - "aspnet50": { - "dependencies": { - "Shouldly": "1.1.1.1", - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "" - } + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.Http": "1.0.0-*", + "Microsoft.AspNet.Security": "1.0.0-*", + "Microsoft.AspNet.Security.Cookies": "1.0.0-*", + "Microsoft.AspNet.Security.Facebook": "1.0.0-*", + "Microsoft.AspNet.Security.Google": "1.0.0-*", + "Microsoft.AspNet.Security.MicrosoftAccount": "1.0.0-*", + "Microsoft.AspNet.Security.Twitter": "1.0.0-*", + "Microsoft.AspNet.TestHost": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Moq": "4.2.1312.1622", + "Xunit.KRunner": "1.0.0-*" + }, + "commands": { + "test": "Xunit.KRunner" + }, + "frameworks": { + "aspnet50": { + "dependencies": { + "Shouldly": "1.1.1.1" + }, + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0" + } + } } - } }