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

Commit 7a4ce6e

Browse files
dstrockisdstrockis
committed
RC3 Package Update
1 parent d9a24c3 commit 7a4ce6e

6 files changed

Lines changed: 49 additions & 91 deletions

File tree

‎TodoListClient/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
55
</startup>
66
<appSettings>
7-
<add key="ida:AADInstance" value="https://login.windows.net/{0}" />
7+
<add key="ida:AADInstance" value="https://login.windows.net/{0}" />
88
<add key="ida:Tenant" value="[Enter tenant name, e.g. contoso.onmicrosoft.com]" />
9-
<add key="ida:ClientId" value="[Enter client ID as obtained from Azure Portal, e.g. 82692da5-a86f-44c9-9d53-2f88d52b478b]" />
9+
<add key="ida:ClientId" value="[Enter client ID as obtained from Azure Portal, e.g. 82692da5-a86f-44c9-9d53-2f88d52b478b]" />
1010
<add key="todo:TodoListResourceId" value="[Enter App ID URI of TodoListService, e.g. https://contoso.onmicrosoft.com/TodoListService]" />
1111
<add key="todo:TodoListBaseAddress" value="https://localhost:44321" />
1212
</appSettings>

‎TodoListClient/TodoListClient.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3636
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.7.10707.1513-rc\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
37+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.8.10804.1442-rc\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.7.10707.1513-rc\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
41+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.8.10804.1442-rc\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>

‎TodoListClient/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
44
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
5-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.7.10707.1513-rc" targetFramework="net45" />
5+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.8.10804.1442-rc" targetFramework="net45" />
66
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
88
</packages>

‎TodoListService/TodoListService.csproj‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,35 @@
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-rc1\lib\net45\Microsoft.Owin.dll</HintPath>
49+
<HintPath>..\packages\Microsoft.Owin.3.0.0-rc3-30804-136-rel\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-rc1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
53+
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0-rc3-30804-136-rel\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
5454
</Reference>
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-rc1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
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>
5857
</Reference>
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-rc1\lib\net45\Microsoft.Owin.Security.ActiveDirectory.dll</HintPath>
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>
6260
</Reference>
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-rc1\lib\net45\Microsoft.Owin.Security.Jwt.dll</HintPath>
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>
6663
</Reference>
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-rc1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
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>
7066
</Reference>
7167
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7268
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
7470
</Reference>
7571
<Reference Include="System" />
7672
<Reference Include="System.Data" />
7773
<Reference Include="System.Data.Entity" />
7874
<Reference Include="System.Drawing" />
79-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.10701.1634, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8076
<SpecificVersion>False</SpecificVersion>
81-
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0-RC1\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
77+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0-RC3-10804-0633\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
8278
</Reference>
8379
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8480
<SpecificVersion>False</SpecificVersion>
@@ -239,7 +235,9 @@
239235
<Content Include="Scripts\respond.matchmedia.addListener.js" />
240236
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />
241237
<Content Include="Scripts\respond.min.js" />
242-
<Content Include="Web.config" />
238+
<Content Include="Web.config">
239+
<SubType>Designer</SubType>
240+
</Content>
243241
<Content Include="Web.Debug.config">
244242
<DependentUpon>Web.config</DependentUpon>
245243
</Content>

‎TodoListService/Web.config‎

Lines changed: 18 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -18,64 +18,24 @@
1818
</system.web>
1919

2020
<runtime>
21-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
22-
<dependentAssembly>
23-
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
24-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
25-
</dependentAssembly>
26-
<dependentAssembly>
27-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
28-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
29-
</dependentAssembly>
30-
<dependentAssembly>
31-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
33-
</dependentAssembly>
34-
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
36-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
37-
</dependentAssembly>
38-
<dependentAssembly>
39-
<assemblyIdentity name="System.Web.WebPages" 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.Mvc" publicKeyToken="31bf3856ad364e35" />
44-
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
45-
</dependentAssembly>
46-
<dependentAssembly>
47-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
48-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
49-
</dependentAssembly>
50-
<dependentAssembly>
51-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
52-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
53-
</dependentAssembly>
54-
<dependentAssembly>
55-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
56-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
57-
</dependentAssembly>
58-
<dependentAssembly>
59-
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
61-
</dependentAssembly>
62-
<dependentAssembly>
63-
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
64-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
65-
</dependentAssembly>
66-
<dependentAssembly>
67-
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
68-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
69-
</dependentAssembly>
70-
<dependentAssembly>
71-
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
72-
<bindingRedirect oldVersion="0.0.0.0-4.0.10701.1634" newVersion="4.0.10701.1634" />
73-
</dependentAssembly>
74-
<dependentAssembly>
75-
<assemblyIdentity name="Microsoft.Owin.Security.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
76-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
77-
</dependentAssembly>
78-
</assemblyBinding>
21+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
22+
<dependentAssembly>
23+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
25+
</dependentAssembly>
26+
<dependentAssembly>
27+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
29+
</dependentAssembly>
30+
<dependentAssembly>
31+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
32+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
33+
</dependentAssembly>
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
36+
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
37+
</dependentAssembly>
38+
</assemblyBinding>
7939
</runtime>
8040
<system.webServer>
8141
<handlers>

‎TodoListService/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
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" />
1414
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
15-
<package id="Microsoft.Owin" version="3.0.0-rc1" targetFramework="net45" />
16-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0-rc1" targetFramework="net45" />
17-
<package id="Microsoft.Owin.Security" version="3.0.0-rc1" targetFramework="net45" />
18-
<package id="Microsoft.Owin.Security.ActiveDirectory" version="3.0.0-rc1" targetFramework="net45" />
19-
<package id="Microsoft.Owin.Security.Jwt" version="3.0.0-rc1" targetFramework="net45" />
20-
<package id="Microsoft.Owin.Security.OAuth" version="3.0.0-rc1" 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" />
2121
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2222
<package id="Modernizr" version="2.7.2" targetFramework="net45" />
23-
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
23+
<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-RC1" targetFramework="net45" />
26+
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0-RC3-10804-0633" targetFramework="net45" />
2727
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
2828
</packages>

0 commit comments

Comments
 (0)