Skip to content
This repository has been archived by the owner on Jan 23, 2020. It is now read-only.

Commit

Permalink
Katana GA Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstrockis
dstrockis committed Aug 20, 2014
1 parent 44ccb26 commit 8ee1a63
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 24 deletions.
9 changes: 6 additions & 3 deletions WebApp-OpenIDConnect-DotNet/Scripts/_references.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/// <reference path="modernizr-2.7.2.js" />
/// <reference path="jquery-2.1.1.js" />
/// <autosync enabled="true" />
/// <autosync enabled="true" />
/// <reference path="bootstrap.js" />
/// <reference path="jquery-1.10.2.js" />
/// <reference path="jquery-2.1.1.js" />
/// <reference path="respond.js" />
/// <reference path="respond.matchmedia.addlistener.js" />
/// <reference path="modernizr-2.6.2.js" />
/// <reference path="modernizr-2.8.3.js" />
6 changes: 3 additions & 3 deletions ...Connect-DotNet/Scripts/modernizr-2.7.2.js → ...Connect-DotNet/Scripts/modernizr-2.8.3.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Modernizr v2.7.2
* Modernizr v2.8.3
* www.modernizr.com
*
* Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
Expand All @@ -24,7 +24,7 @@

window.Modernizr = (function( window, document, undefined ) {

var version = '2.7.2',
var version = '2.8.3',

Modernizr = {},

Expand Down Expand Up @@ -156,7 +156,7 @@ window.Modernizr = (function( window, document, undefined ) {

var matchMedia = window.matchMedia || window.msMatchMedia;
if ( matchMedia ) {
return matchMedia(mq).matches;
return matchMedia(mq) && matchMedia(mq).matches || false;
}

var bool;
Expand Down
16 changes: 8 additions & 8 deletions WebApp-OpenIDConnect-DotNet/Web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
Expand All @@ -62,6 +54,14 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
20 changes: 10 additions & 10 deletions WebApp-OpenIDConnect-DotNet/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.0-RC3-10804-1105" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.0-rc3-30804-135-rel" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0-rc3-30804-135-rel" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="3.0.0-rc3-30804-135-rel" targetFramework="net45" />
<package id="Microsoft.Owin.Security.Cookies" version="3.0.0-rc3-30804-135-rel" targetFramework="net45" />
<package id="Microsoft.Owin.Security.OpenIdConnect" version="3.0.0-rc3-30804-135-rel" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.1-beta" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Security" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Security.Cookies" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Owin.Security.OpenIdConnect" version="3.0.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.7.2" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Respond" version="1.4.2" targetFramework="net45" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0-RC3-10804-1105" targetFramework="net45" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
</packages>

0 comments on commit 8ee1a63

Please # to comment.