Skip to content

Commit

Permalink
update nugets for beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
@brockallen
brockallen committed Oct 7, 2014
1 parent ed2e8c2 commit a2592b6
Show file tree
Hide file tree
Showing 22 changed files with 49 additions and 47 deletions.
13 changes: 7 additions & 6 deletions source/AspNetIdentity/SelfHost/UserService-AspNetIdentity.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand All @@ -90,22 +90,23 @@
<Reference Include="System.Web" />
<Reference Include="Thinktecture.IdentityManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityManager.1.0.0-pre-20141006-1\lib\net45\Thinktecture.IdentityManager.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityManager.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityManager.AspNetIdentity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityManager.AspNetIdentity.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityManager.AspNetIdentity.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityManager.AspNetIdentity.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.AspNetIdentity.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityModel.Core">
<Reference Include="Thinktecture.IdentityModel.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityModel.Core.1.2.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityServer.AspNetIdentity, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.AspNetIdentity.1.0.0-pre-20141002-1\lib\net45\Thinktecture.IdentityServer.AspNetIdentity.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.AspNetIdentity.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.AspNetIdentity.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions source/AspNetIdentity/SelfHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<package id="Microsoft.Owin.Security.Facebook" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Security.Google" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Security.Twitter" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityManager" version="1.0.0-pre-20141006-1" targetFramework="net45" />
<package id="Thinktecture.IdentityManager.AspNetIdentity" version="1.0.0-pre-20141006" targetFramework="net45" />
<package id="Thinktecture.IdentityManager" version="1.0.0-beta2" targetFramework="net45" />
<package id="Thinktecture.IdentityManager.AspNetIdentity" version="1.0.0-beta2" targetFramework="net45" />
<package id="Thinktecture.IdentityModel.Core" version="1.2.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20141006" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3.AspNetIdentity" version="1.0.0-pre-20141002-1" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3.AspNetIdentity" version="1.0.0-beta2" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/Config/Clients.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static List<Client> Get()
Enabled = true,
ClientId = "codeclient",
ClientSecret = "secret",
Flow = Flows.Code,
Flow = Flows.AuthorizationCode,

RequireConsent = true,
AllowRememberConsent = true,
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/CustomUserService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140929-2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/EulaAtLoginUserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Task<AuthenticateResult> AuthenticateExternalAsync(ExternalIdentity exter
return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type)));
}

public Task<bool> IsActive(ClaimsPrincipal subject)
public Task<bool> IsActiveAsync(ClaimsPrincipal subject)
{
var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId());
return Task.FromResult(user != null && user.AccpetedEula);
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/ExternalRegistrationUserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Task<AuthenticateResult> AuthenticateExternalAsync(ExternalIdentity exter
return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type)));
}

public Task<bool> IsActive(ClaimsPrincipal subject)
public Task<bool> IsActiveAsync(ClaimsPrincipal subject)
{
var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId());
return Task.FromResult(user != null && user.IsRegistered);
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/LocalRegistrationUserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public Task<AuthenticateResult> AuthenticateExternalAsync(ExternalIdentity exter
return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type)));
}

public Task<bool> IsActive(ClaimsPrincipal subject)
public Task<bool> IsActiveAsync(ClaimsPrincipal subject)
{
var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId());
return Task.FromResult(user != null);
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/RegisterFirstExternalRegistrationUserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Task<AuthenticateResult> AuthenticateExternalAsync(ExternalIdentity exter
return Task.FromResult(user.Claims.Where(x => requestedClaimTypes.Contains(x.Type)));
}

public Task<bool> IsActive(ClaimsPrincipal subject)
public Task<bool> IsActiveAsync(ClaimsPrincipal subject)
{
var user = Users.SingleOrDefault(x => x.Subject == subject.GetSubjectId());
return Task.FromResult(user != null);
Expand Down
2 changes: 1 addition & 1 deletion source/CustomUserService/CustomUserService/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20140929-2" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/CustomViewService/CustomViewService/CustomViewService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/CustomViewService/CustomViewService/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
<package id="Microsoft.Owin.Security.Twitter" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20141006" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/DependencyInjection/SelfHost/Config/Clients.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static List<Client> Get()
Enabled = true,
ClientId = "codeclient",
ClientSecret = "secret",
Flow = Flows.Code,
Flow = Flows.AuthorizationCode,

RequireConsent = true,
AllowRememberConsent = true,
Expand Down
2 changes: 1 addition & 1 deletion source/DependencyInjection/SelfHost/DependencyInjection.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Reference Include="System.Web" />
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/DependencyInjection/SelfHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="3.0.0" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20140927" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/Config/Clients.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static List<Client> Get()
Enabled = true,
ClientId = "codeclient",
ClientSecret = "secret",
Flow = Flows.Code,
Flow = Flows.AuthorizationCode,

RequireConsent = true,
AllowRememberConsent = true,
Expand Down
2 changes: 1 addition & 1 deletion source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/EmbeddedAssetsViewService/EmbeddedAssetsViewService/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
<package id="Microsoft.Owin.Security.Twitter" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20140927" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/EntityFramework/SelfHost/Config/Clients.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static List<Client> Get()
Enabled = true,
ClientId = "codeclient",
ClientSecret = "secret",
Flow = Flows.Code,
Flow = Flows.AuthorizationCode,

RequireConsent = true,
AllowRememberConsent = true,
Expand Down
6 changes: 3 additions & 3 deletions source/EntityFramework/SelfHost/EntityFramework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand All @@ -75,11 +75,11 @@
<Reference Include="System.Web" />
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20140927-1\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityServer.Core.EntityFramework, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.EntityFramework.1.0.0-beta1-2\lib\net45\Thinktecture.IdentityServer.Core.EntityFramework.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.EntityFramework.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.Core.EntityFramework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions source/EntityFramework/SelfHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-pre-20140927-1" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3.EntityFramework" version="1.0.0-beta1-2" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3" version="1.0.0-beta2" targetFramework="net45" />
<package id="Thinktecture.IdentityServer.v3.EntityFramework" version="1.0.0-beta2" targetFramework="net45" />
</packages>
17 changes: 9 additions & 8 deletions source/MembershipReboot/SelfHost/UserService-MembershipReboot.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="BrockAllen.MembershipReboot, Version=7.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="BrockAllen.MembershipReboot, Version=7.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\BrockAllen.MembershipReboot.7.4.1\lib\net45\BrockAllen.MembershipReboot.dll</HintPath>
<HintPath>..\packages\BrockAllen.MembershipReboot.7.5.0\lib\net45\BrockAllen.MembershipReboot.dll</HintPath>
</Reference>
<Reference Include="BrockAllen.MembershipReboot.Ef, Version=7.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -77,7 +77,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand All @@ -92,22 +92,23 @@
<Reference Include="System.Web" />
<Reference Include="Thinktecture.IdentityManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityManager.1.0.0-pre-20141006-1\lib\net45\Thinktecture.IdentityManager.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityManager.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityManager.MembershipReboot, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityManager.MembershipReboot.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityManager.MembershipReboot.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityManager.MembershipReboot.1.0.0-beta2\lib\net45\Thinktecture.IdentityManager.MembershipReboot.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityModel.Core">
<Reference Include="Thinktecture.IdentityModel.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityModel.Core.1.2.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-pre-20141006\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.dll</HintPath>
</Reference>
<Reference Include="Thinktecture.IdentityServer.MembershipReboot, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.MembershipReboot.1.0.0-pre-20141002-1\lib\net45\Thinktecture.IdentityServer.MembershipReboot.dll</HintPath>
<HintPath>..\packages\Thinktecture.IdentityServer.v3.MembershipReboot.1.0.0-beta2\lib\net45\Thinktecture.IdentityServer.MembershipReboot.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit a2592b6

Please sign in to comment.