Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@brockallen
brockallen committed Feb 22, 2016
1 parent f75ccc4 commit 50710c3
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion source/AspNetIdentity/WebHost/WebHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Private>True</Private>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions source/AspNetIdentity/WebHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<package id="IdentityManager" version="1.0.0-beta5-5" targetFramework="net45" />
<package id="IdentityManager.AspNetIdentity" version="1.0.0-beta5-1" targetFramework="net45" />
<package id="IdentityModel" version="1.0.0" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00037" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="IdentityServer3.AspNetIdentity" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/AspNetIdentity_2fa/WebHost/WebHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Private>True</Private>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions source/AspNetIdentity_2fa/WebHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<package id="IdentityManager" version="1.0.0-beta5-5" targetFramework="net45" />
<package id="IdentityManager.AspNetIdentity" version="1.0.0-beta5-1" targetFramework="net45" />
<package id="IdentityModel" version="1.0.0" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00037" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="IdentityServer3.AspNetIdentity" version="2.0.0" targetFramework="net45" />
<package id="jQuery" version="2.1.4" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/CustomHrd/CustomHrd/CustomHrd.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion source/CustomHrd/CustomHrd/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="bootstrap" version="3.3.5" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="jQuery" version="2.1.4" targetFramework="net45" />
<package id="jQuery.Validation" version="1.14.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/CustomLoginPage/CustomLoginPage/CustomLoginPage.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion source/CustomLoginPage/CustomLoginPage/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net452" />
<package id="bootstrap" version="3.0.0" targetFramework="net452" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net452" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net452" />
<package id="jQuery" version="1.10.2" targetFramework="net452" />
<package id="jQuery.Validation" version="1.11.1" targetFramework="net452" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
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 @@ -44,7 +44,7 @@
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
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 @@ -2,7 +2,7 @@
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="bootstrap" version="3.3.5" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="jQuery" version="2.1.4" targetFramework="net45" />
<package id="jQuery.Validation" version="1.14.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
Expand Down
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 @@ -46,7 +46,7 @@
<HintPath>..\packages\AntiXSS.4.3.0\lib\net40\HtmlSanitizationLibrary.dll</HintPath>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AntiXSS" version="4.3.0" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/DefaultViewService/EmbeddedAssetsViewService/EmbeddedAssetsViewService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion source/DefaultViewService/EmbeddedAssetsViewService/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
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 @@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/EntityFramework/SelfHost/EntityFramework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<Private>True</Private>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdentityServer3.EntityFramework, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion source/EntityFramework/SelfHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="AutoMapper" version="4.2.0" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="IdentityServer3.EntityFramework" version="2.4.1-build00068" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion source/MembershipReboot/WebHost/WebHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Private>True</Private>
</Reference>
<Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
<HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions source/MembershipReboot/WebHost/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<package id="IdentityManager" version="1.0.0-beta5-5" targetFramework="net45" />
<package id="IdentityManager.MembershipReboot" version="1.0.0-beta5-1" targetFramework="net45" />
<package id="IdentityModel" version="1.0.0" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
<package id="IdentityServer3.MembershipReboot" version="2.0.0-build00032" targetFramework="net45" />
<package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
<package id="IdentityServer3.MembershipReboot" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
Expand Down

0 comments on commit 50710c3

Please sign in to comment.