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

Commit af7edf6

Browse files
dstrockisdstrockis
committed
Katana GA Update
1 parent 7a4ce6e commit af7edf6

5 files changed

Lines changed: 44 additions & 32 deletions

File tree

‎TodoListService/Scripts/_references.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// <reference path="bootstrap.js" />
33
/// <reference path="jquery-1.10.2.js" />
44
/// <reference path="jquery-2.1.1.js" />
5-
/// <reference path="modernizr-2.6.2.js" />
6-
/// <reference path="modernizr-2.7.2.js" />
75
/// <reference path="respond.js" />
86
/// <reference path="respond.matchmedia.addlistener.js" />
7+
/// <reference path="modernizr-2.6.2.js" />
8+
/// <reference path="modernizr-2.8.3.js" />

TodoListService/Scripts/modernizr-2.7.2.js renamed to TodoListService/Scripts/modernizr-2.8.3.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Modernizr v2.7.2
2+
* Modernizr v2.8.3
33
* www.modernizr.com
44
*
55
* Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
@@ -24,7 +24,7 @@
2424

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

27-
var version = '2.7.2',
27+
var version = '2.8.3',
2828

2929
Modernizr = {},
3030

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

157157
var matchMedia = window.matchMedia || window.msMatchMedia;
158158
if ( matchMedia ) {
159-
return matchMedia(mq).matches;
159+
return matchMedia(mq) && matchMedia(mq).matches || false;
160160
}
161161

162162
var bool;

‎TodoListService/TodoListService.csproj‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,27 @@
4646
<Reference Include="Microsoft.CSharp" />
4747
<Reference Include="Microsoft.Owin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Microsoft.Owin.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.dll</HintPath>
49+
<HintPath>..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
53+
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.Owin.Security">
56-
<HintPath>..\packages\Microsoft.Owin.Security.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Security.dll</HintPath>
55+
<Reference Include="Microsoft.Owin.Security, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\packages\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
5758
</Reference>
58-
<Reference Include="Microsoft.Owin.Security.ActiveDirectory">
59-
<HintPath>..\packages\Microsoft.Owin.Security.ActiveDirectory.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Security.ActiveDirectory.dll</HintPath>
59+
<Reference Include="Microsoft.Owin.Security.ActiveDirectory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\packages\Microsoft.Owin.Security.ActiveDirectory.3.0.0\lib\net45\Microsoft.Owin.Security.ActiveDirectory.dll</HintPath>
6062
</Reference>
61-
<Reference Include="Microsoft.Owin.Security.Jwt">
62-
<HintPath>..\packages\Microsoft.Owin.Security.Jwt.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Security.Jwt.dll</HintPath>
63+
<Reference Include="Microsoft.Owin.Security.Jwt, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\packages\Microsoft.Owin.Security.Jwt.3.0.0\lib\net45\Microsoft.Owin.Security.Jwt.dll</HintPath>
6366
</Reference>
64-
<Reference Include="Microsoft.Owin.Security.OAuth">
65-
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
67+
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
6670
</Reference>
6771
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6872
<SpecificVersion>False</SpecificVersion>
@@ -74,7 +78,7 @@
7478
<Reference Include="System.Drawing" />
7579
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7680
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0-RC3-10804-0633\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
81+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
7882
</Reference>
7983
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8084
<SpecificVersion>False</SpecificVersion>
@@ -88,7 +92,7 @@
8892
<Reference Include="System.Data.DataSetExtensions" />
8993
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9094
<SpecificVersion>False</SpecificVersion>
91-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
95+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.1-beta\lib\net45\System.Web.Helpers.dll</HintPath>
9296
</Reference>
9397
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9498
<SpecificVersion>False</SpecificVersion>
@@ -112,15 +116,15 @@
112116
</Reference>
113117
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114118
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
119+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.1-beta\lib\net45\System.Web.WebPages.dll</HintPath>
116120
</Reference>
117121
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118122
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
123+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.1-beta\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
120124
</Reference>
121125
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122126
<SpecificVersion>False</SpecificVersion>
123-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
127+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.1-beta\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
124128
</Reference>
125129
<Reference Include="System.Xml.Linq" />
126130
<Reference Include="System.Web" />
@@ -230,7 +234,7 @@
230234
<Content Include="Scripts\jquery-2.1.1.js" />
231235
<Content Include="Scripts\jquery-2.1.1.min.js" />
232236
<Content Include="Scripts\modernizr-2.6.2.js" />
233-
<Content Include="Scripts\modernizr-2.7.2.js" />
237+
<Content Include="Scripts\modernizr-2.8.3.js" />
234238
<Content Include="Scripts\respond.js" />
235239
<Content Include="Scripts\respond.matchmedia.addListener.js" />
236240
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />

‎TodoListService/Web.config‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<add key="webpages:Enabled" value="false" />
1010
<add key="ClientValidationEnabled" value="true" />
1111
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
12-
<add key="ida:Tenant" value="[Enter tenant name, e.g. contoso.onmicrosoft.com]" />
13-
<add key="ida:Audience" value="[Enter App ID URI of TodoListService, e.g. https://contoso.onmicrosoft.com/TodoListService]" />
12+
<add key="ida:Tenant" value="[Enter tenant name, e.g. contoso.onmicrosoft.com]" />
13+
<add key="ida:Audience" value="[Enter App ID URI of TodoListService, e.g. https://contoso.onmicrosoft.com/TodoListService]" />
1414
</appSettings>
1515
<system.web>
1616
<compilation debug="true" targetFramework="4.5" />
@@ -35,6 +35,14 @@
3535
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
3636
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
3737
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
40+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
44+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
45+
</dependentAssembly>
3846
</assemblyBinding>
3947
</runtime>
4048
<system.webServer>

‎TodoListService/packages.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
1212
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.0" targetFramework="net45" />
1313
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.0" targetFramework="net45" />
14-
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
15-
<package id="Microsoft.Owin" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
16-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
17-
<package id="Microsoft.Owin.Security" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
18-
<package id="Microsoft.Owin.Security.ActiveDirectory" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
19-
<package id="Microsoft.Owin.Security.Jwt" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
20-
<package id="Microsoft.Owin.Security.OAuth" version="3.0.0-rc3-30804-136-rel" targetFramework="net45" />
14+
<package id="Microsoft.AspNet.WebPages" version="3.2.1-beta" targetFramework="net45" />
15+
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
16+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" targetFramework="net45" />
17+
<package id="Microsoft.Owin.Security" version="3.0.0" targetFramework="net45" />
18+
<package id="Microsoft.Owin.Security.ActiveDirectory" version="3.0.0" targetFramework="net45" />
19+
<package id="Microsoft.Owin.Security.Jwt" version="3.0.0" targetFramework="net45" />
20+
<package id="Microsoft.Owin.Security.OAuth" version="3.0.0" targetFramework="net45" />
2121
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
22-
<package id="Modernizr" version="2.7.2" targetFramework="net45" />
22+
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2424
<package id="Owin" version="1.0" targetFramework="net45" />
2525
<package id="Respond" version="1.4.2" targetFramework="net45" />
26-
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0-RC3-10804-0633" targetFramework="net45" />
26+
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
2727
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
2828
</packages>

0 commit comments

Comments
 (0)