From a2592b68718651737248288cc20c815483d7e68b Mon Sep 17 00:00:00 2001 From: Brock Allen Date: Tue, 7 Oct 2014 15:19:22 -0400 Subject: [PATCH] update nugets for beta2 --- .../SelfHost/UserService-AspNetIdentity.csproj | 13 +++++++------ source/AspNetIdentity/SelfHost/packages.config | 10 +++++----- .../CustomUserService/Config/Clients.cs | 2 +- .../CustomUserService/CustomUserService.csproj | 2 +- .../CustomUserService/EulaAtLoginUserService.cs | 2 +- .../ExternalRegistrationUserService.cs | 2 +- .../LocalRegistrationUserService.cs | 2 +- ...isterFirstExternalRegistrationUserService.cs | 2 +- .../CustomUserService/packages.config | 2 +- .../CustomViewService/CustomViewService.csproj | 2 +- .../CustomViewService/packages.config | 2 +- .../SelfHost/Config/Clients.cs | 2 +- .../SelfHost/DependencyInjection.csproj | 2 +- .../SelfHost/packages.config | 2 +- .../EmbeddedAssetsViewService/Config/Clients.cs | 2 +- .../EmbeddedAssetsViewService.csproj | 2 +- .../EmbeddedAssetsViewService/packages.config | 2 +- .../EntityFramework/SelfHost/Config/Clients.cs | 2 +- .../SelfHost/EntityFramework.csproj | 6 +++--- source/EntityFramework/SelfHost/packages.config | 6 +++--- .../UserService-MembershipReboot.csproj | 17 +++++++++-------- .../MembershipReboot/SelfHost/packages.config | 12 ++++++------ 22 files changed, 49 insertions(+), 47 deletions(-) diff --git a/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj b/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj index eb0465ed5..946210fdc 100644 --- a/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj +++ b/source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj @@ -75,7 +75,7 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -90,22 +90,23 @@ False - ..\packages\Thinktecture.IdentityManager.1.0.0-pre-20141006-1\lib\net45\Thinktecture.IdentityManager.dll + ..\packages\Thinktecture.IdentityManager.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.dll False - ..\packages\Thinktecture.IdentityManager.AspNetIdentity.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityManager.AspNetIdentity.dll + ..\packages\Thinktecture.IdentityManager.AspNetIdentity.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.AspNetIdentity.dll - + + False ..\packages\Thinktecture.IdentityModel.Core.1.2.0\lib\net45\Thinktecture.IdentityModel.Core.dll False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll False - ..\packages\Thinktecture.IdentityServer.v3.AspNetIdentity.1.0.0-pre-20141002-1\lib\net45\Thinktecture.IdentityServer.AspNetIdentity.dll + ..\packages\Thinktecture.IdentityServer.v3.AspNetIdentity.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.AspNetIdentity.dll diff --git a/source/AspNetIdentity/SelfHost/packages.config b/source/AspNetIdentity/SelfHost/packages.config index 828cacec2..bc5a39a2c 100644 --- a/source/AspNetIdentity/SelfHost/packages.config +++ b/source/AspNetIdentity/SelfHost/packages.config @@ -11,11 +11,11 @@ - + - - + + - - + + \ No newline at end of file diff --git a/source/CustomUserService/CustomUserService/Config/Clients.cs b/source/CustomUserService/CustomUserService/Config/Clients.cs index 3815946ee..75a229d07 100644 --- a/source/CustomUserService/CustomUserService/Config/Clients.cs +++ b/source/CustomUserService/CustomUserService/Config/Clients.cs @@ -17,7 +17,7 @@ public static List Get() Enabled = true, ClientId = "codeclient", ClientSecret = "secret", - Flow = Flows.Code, + Flow = Flows.AuthorizationCode, RequireConsent = true, AllowRememberConsent = true, diff --git a/source/CustomUserService/CustomUserService/CustomUserService.csproj b/source/CustomUserService/CustomUserService/CustomUserService.csproj index 6250977e9..b6adb0adf 100644 --- a/source/CustomUserService/CustomUserService/CustomUserService.csproj +++ b/source/CustomUserService/CustomUserService/CustomUserService.csproj @@ -125,7 +125,7 @@ False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140929-2\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll False diff --git a/source/CustomUserService/CustomUserService/EulaAtLoginUserService.cs b/source/CustomUserService/CustomUserService/EulaAtLoginUserService.cs index 5c3211830..b3773b990 100644 --- a/source/CustomUserService/CustomUserService/EulaAtLoginUserService.cs +++ b/source/CustomUserService/CustomUserService/EulaAtLoginUserService.cs @@ -87,7 +87,7 @@ public Task AuthenticateExternalAsync(ExternalIdentity exter return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type))); } - public Task IsActive(ClaimsPrincipal subject) + public Task IsActiveAsync(ClaimsPrincipal subject) { var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId()); return Task.FromResult(user != null && user.AccpetedEula); diff --git a/source/CustomUserService/CustomUserService/ExternalRegistrationUserService.cs b/source/CustomUserService/CustomUserService/ExternalRegistrationUserService.cs index 28d610496..d2f886cf8 100644 --- a/source/CustomUserService/CustomUserService/ExternalRegistrationUserService.cs +++ b/source/CustomUserService/CustomUserService/ExternalRegistrationUserService.cs @@ -87,7 +87,7 @@ public Task AuthenticateExternalAsync(ExternalIdentity exter return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type))); } - public Task IsActive(ClaimsPrincipal subject) + public Task IsActiveAsync(ClaimsPrincipal subject) { var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId()); return Task.FromResult(user != null && user.IsRegistered); diff --git a/source/CustomUserService/CustomUserService/LocalRegistrationUserService.cs b/source/CustomUserService/CustomUserService/LocalRegistrationUserService.cs index a0c99e384..078131b58 100644 --- a/source/CustomUserService/CustomUserService/LocalRegistrationUserService.cs +++ b/source/CustomUserService/CustomUserService/LocalRegistrationUserService.cs @@ -54,7 +54,7 @@ public Task AuthenticateExternalAsync(ExternalIdentity exter return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type))); } - public Task IsActive(ClaimsPrincipal subject) + public Task IsActiveAsync(ClaimsPrincipal subject) { var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId()); return Task.FromResult(user != null); diff --git a/source/CustomUserService/CustomUserService/RegisterFirstExternalRegistrationUserService.cs b/source/CustomUserService/CustomUserService/RegisterFirstExternalRegistrationUserService.cs index c979dc846..14ca53307 100644 --- a/source/CustomUserService/CustomUserService/RegisterFirstExternalRegistrationUserService.cs +++ b/source/CustomUserService/CustomUserService/RegisterFirstExternalRegistrationUserService.cs @@ -62,7 +62,7 @@ public Task AuthenticateExternalAsync(ExternalIdentity exter return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type))); } - public Task IsActive(ClaimsPrincipal subject) + public Task IsActiveAsync(ClaimsPrincipal subject) { var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId()); return Task.FromResult(user != null); diff --git a/source/CustomUserService/CustomUserService/packages.config b/source/CustomUserService/CustomUserService/packages.config index 2d49ab2e0..5a19397a8 100644 --- a/source/CustomUserService/CustomUserService/packages.config +++ b/source/CustomUserService/CustomUserService/packages.config @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/source/CustomViewService/CustomViewService/CustomViewService.csproj b/source/CustomViewService/CustomViewService/CustomViewService.csproj index 7161daa50..f579f430c 100644 --- a/source/CustomViewService/CustomViewService/CustomViewService.csproj +++ b/source/CustomViewService/CustomViewService/CustomViewService.csproj @@ -90,7 +90,7 @@ False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll diff --git a/source/CustomViewService/CustomViewService/packages.config b/source/CustomViewService/CustomViewService/packages.config index 98a7f443b..9e8884329 100644 --- a/source/CustomViewService/CustomViewService/packages.config +++ b/source/CustomViewService/CustomViewService/packages.config @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/source/DependencyInjection/SelfHost/Config/Clients.cs b/source/DependencyInjection/SelfHost/Config/Clients.cs index 60cf61ea0..bb676f5ee 100644 --- a/source/DependencyInjection/SelfHost/Config/Clients.cs +++ b/source/DependencyInjection/SelfHost/Config/Clients.cs @@ -17,7 +17,7 @@ public static List Get() Enabled = true, ClientId = "codeclient", ClientSecret = "secret", - Flow = Flows.Code, + Flow = Flows.AuthorizationCode, RequireConsent = true, AllowRememberConsent = true, diff --git a/source/DependencyInjection/SelfHost/DependencyInjection.csproj b/source/DependencyInjection/SelfHost/DependencyInjection.csproj index 4355d1e60..34cfa5edf 100644 --- a/source/DependencyInjection/SelfHost/DependencyInjection.csproj +++ b/source/DependencyInjection/SelfHost/DependencyInjection.csproj @@ -54,7 +54,7 @@ False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll diff --git a/source/DependencyInjection/SelfHost/packages.config b/source/DependencyInjection/SelfHost/packages.config index 969608559..7d75216d4 100644 --- a/source/DependencyInjection/SelfHost/packages.config +++ b/source/DependencyInjection/SelfHost/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/Config/Clients.cs b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/Config/Clients.cs index 3815946ee..75a229d07 100644 --- a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/Config/Clients.cs +++ b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/Config/Clients.cs @@ -17,7 +17,7 @@ public static List Get() Enabled = true, ClientId = "codeclient", ClientSecret = "secret", - Flow = Flows.Code, + Flow = Flows.AuthorizationCode, RequireConsent = true, AllowRememberConsent = true, diff --git a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj index 63c747414..09be227f2 100644 --- a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj +++ b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj @@ -90,7 +90,7 @@ False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll diff --git a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/packages.config b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/packages.config index 2c7abd856..9e8884329 100644 --- a/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/packages.config +++ b/source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/packages.config @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/source/EntityFramework/SelfHost/Config/Clients.cs b/source/EntityFramework/SelfHost/Config/Clients.cs index f976dddc8..5ee65e7b4 100644 --- a/source/EntityFramework/SelfHost/Config/Clients.cs +++ b/source/EntityFramework/SelfHost/Config/Clients.cs @@ -17,7 +17,7 @@ public static List Get() Enabled = true, ClientId = "codeclient", ClientSecret = "secret", - Flow = Flows.Code, + Flow = Flows.AuthorizationCode, RequireConsent = true, AllowRememberConsent = true, diff --git a/source/EntityFramework/SelfHost/EntityFramework.csproj b/source/EntityFramework/SelfHost/EntityFramework.csproj index 193289519..91f336d69 100644 --- a/source/EntityFramework/SelfHost/EntityFramework.csproj +++ b/source/EntityFramework/SelfHost/EntityFramework.csproj @@ -62,7 +62,7 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -75,11 +75,11 @@ False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927-1\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll False - ..\packages\Thinktecture.IdentityServer.v3.EntityFramework.1.0.0-beta1-2\lib\net45\Thinktecture.IdentityServer.Core.EntityFramework.dll + ..\packages\Thinktecture.IdentityServer.v3.EntityFramework.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.Core.EntityFramework.dll diff --git a/source/EntityFramework/SelfHost/packages.config b/source/EntityFramework/SelfHost/packages.config index 23061ecc9..efa7140c3 100644 --- a/source/EntityFramework/SelfHost/packages.config +++ b/source/EntityFramework/SelfHost/packages.config @@ -5,8 +5,8 @@ - + - - + + \ No newline at end of file diff --git a/source/MembershipReboot/SelfHost/UserService-MembershipReboot.csproj b/source/MembershipReboot/SelfHost/UserService-MembershipReboot.csproj index ce5f295a7..5b47fb323 100644 --- a/source/MembershipReboot/SelfHost/UserService-MembershipReboot.csproj +++ b/source/MembershipReboot/SelfHost/UserService-MembershipReboot.csproj @@ -32,9 +32,9 @@ 4 - + False - ..\packages\BrockAllen.MembershipReboot.7.4.1\lib\net45\BrockAllen.MembershipReboot.dll + ..\packages\BrockAllen.MembershipReboot.7.5.0\lib\net45\BrockAllen.MembershipReboot.dll False @@ -77,7 +77,7 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -92,22 +92,23 @@ False - ..\packages\Thinktecture.IdentityManager.1.0.0-pre-20141006-1\lib\net45\Thinktecture.IdentityManager.dll + ..\packages\Thinktecture.IdentityManager.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.dll False - ..\packages\Thinktecture.IdentityManager.MembershipReboot.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityManager.MembershipReboot.dll + ..\packages\Thinktecture.IdentityManager.MembershipReboot.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.MembershipReboot.dll - + + False ..\packages\Thinktecture.IdentityModel.Core.1.2.0\lib\net45\Thinktecture.IdentityModel.Core.dll False - ..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll + ..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll False - ..\packages\Thinktecture.IdentityServer.v3.MembershipReboot.1.0.0-pre-20141002-1\lib\net45\Thinktecture.IdentityServer.MembershipReboot.dll + ..\packages\Thinktecture.IdentityServer.v3.MembershipReboot.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.MembershipReboot.dll diff --git a/source/MembershipReboot/SelfHost/packages.config b/source/MembershipReboot/SelfHost/packages.config index 77678c68b..b5d037381 100644 --- a/source/MembershipReboot/SelfHost/packages.config +++ b/source/MembershipReboot/SelfHost/packages.config @@ -1,6 +1,6 @@  - + @@ -11,11 +11,11 @@ - + - - + + - - + + \ No newline at end of file