Skip to content

Commit 6dbff12

Browse files
jmprieurjmprieur
committed
- Updating the NuGet packages to the latest compatible version (including ADAL.NET)
- Excluding the .vs folder
1 parent 946603a commit 6dbff12

File tree

7 files changed

+51
-52
lines changed

7 files changed

+51
-52
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ Generated_Code #added for RIA/Silverlight projects
106106
_UpgradeReport_Files/
107107
Backup*/
108108
UpgradeLog*.XML
109+
/.vs

‎TodoListClient/TodoListClient.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.9.304210845\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
39-
<Private>True</Private>
37+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.2.6005, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.2\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
4039
</Reference>
41-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.9.304210845\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
43-
<Private>True</Private>
40+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.2.6005, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.2\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
4442
</Reference>
4543
<Reference Include="System" />
4644
<Reference Include="System.Configuration" />
@@ -98,7 +96,9 @@
9896
<Generator>ResXFileCodeGenerator</Generator>
9997
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10098
</EmbeddedResource>
101-
<None Include="packages.config" />
99+
<None Include="packages.config">
100+
<SubType>Designer</SubType>
101+
</None>
102102
<None Include="Properties\Settings.settings">
103103
<Generator>SettingsSingleFileGenerator</Generator>
104104
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎TodoListClient/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.9.304210845" targetFramework="net45" />
3+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.19.2" targetFramework="net45" />
44
</packages>

‎TodoListService-ManualJwt/Areas/HelpPage/Views/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />

‎TodoListService-ManualJwt/TodoListService-ManualJwt.csproj‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<IISExpressAnonymousAuthentication />
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
23+
<Use64BitIISExpress />
24+
<UseGlobalApplicationHostFile />
2325
</PropertyGroup>
2426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2527
<DebugSymbols>true</DebugSymbols>
@@ -44,9 +46,8 @@
4446
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
4547
</Reference>
4648
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="Microsoft.IdentityModel.Protocol.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.0\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll</HintPath>
49+
<Reference Include="Microsoft.IdentityModel.Protocol.Extensions, Version=1.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll</HintPath>
5051
</Reference>
5152
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5253
<SpecificVersion>False</SpecificVersion>
@@ -57,13 +58,11 @@
5758
<Reference Include="System.Data.Entity" />
5859
<Reference Include="System.Drawing" />
5960
<Reference Include="System.IdentityModel" />
60-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
61+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
6363
</Reference>
64-
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
64+
<Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6766
</Reference>
6867
<Reference Include="System.Runtime.Serialization" />
6968
<Reference Include="System.Web.Entity" />
@@ -72,40 +71,32 @@
7271
<Reference Include="System.Core" />
7372
<Reference Include="System.Data.DataSetExtensions" />
7473
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
74+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.Helpers.dll</HintPath>
7775
</Reference>
78-
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
76+
<Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
8178
</Reference>
82-
<Reference Include="System.Web.Http.WebHost, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll</HintPath>
79+
<Reference Include="System.Web.Http.WebHost, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll</HintPath>
8581
</Reference>
86-
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
82+
<Reference Include="System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.4\lib\net45\System.Web.Mvc.dll</HintPath>
8984
</Reference>
9085
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9186
<SpecificVersion>False</SpecificVersion>
9287
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
9388
</Reference>
9489
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
90+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.4\lib\net45\System.Web.Razor.dll</HintPath>
9791
</Reference>
9892
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99-
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.dll</HintPath>
10194
</Reference>
10295
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103-
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
96+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
10597
</Reference>
10698
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<SpecificVersion>False</SpecificVersion>
108-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
99+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
109100
</Reference>
110101
<Reference Include="System.Xml.Linq" />
111102
<Reference Include="System.Web" />
@@ -187,7 +178,10 @@
187178
<Content Include="fonts\glyphicons-halflings-regular.eot" />
188179
<Content Include="Content\bootstrap-theme.css.map" />
189180
<Content Include="Content\bootstrap.css.map" />
190-
<Content Include="Areas\HelpPage\Views\Web.config" />
181+
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
182+
<Content Include="Areas\HelpPage\Views\Web.config">
183+
<SubType>Designer</SubType>
184+
</Content>
191185
<Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
192186
<Content Include="Areas\HelpPage\Views\Help\ResourceModel.cshtml" />
193187
<Content Include="Areas\HelpPage\Views\Help\Index.cshtml" />
@@ -206,7 +200,6 @@
206200
<Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\CollectionModelDescription.cshtml" />
207201
<Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" />
208202
<Content Include="Areas\HelpPage\Views\Help\Api.cshtml" />
209-
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
210203
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
211204
<None Include="Scripts\jquery-2.1.1.intellisense.js" />
212205
<Content Include="Scripts\jquery-2.1.1.js" />
@@ -217,7 +210,9 @@
217210
<Content Include="Scripts\respond.matchmedia.addListener.js" />
218211
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />
219212
<Content Include="Scripts\respond.min.js" />
220-
<Content Include="Web.config" />
213+
<Content Include="Web.config">
214+
<SubType>Designer</SubType>
215+
</Content>
221216
<Content Include="Web.Debug.config">
222217
<DependentUpon>Web.config</DependentUpon>
223218
</Content>

‎TodoListService-ManualJwt/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
44
<package id="bootstrap" version="3.2.0" targetFramework="net45" />
55
<package id="jQuery" version="2.1.1" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net45" />
88
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
9-
<package id="Microsoft.AspNet.WebApi" version="5.2.2" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
12-
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.2" targetFramework="net45" />
13-
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.2" targetFramework="net45" />
14-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
15-
<package id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.0" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.WebApi" version="5.2.4" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net45" />
12+
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.4" targetFramework="net45" />
13+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.4" targetFramework="net45" />
14+
<package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net45" />
15+
<package id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.4.403061554" targetFramework="net45" />
1616
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1717
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
1919
<package id="Respond" version="1.4.2" targetFramework="net45" />
20-
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
20+
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.4.403061554" targetFramework="net45" />
2121
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
2222
</packages>

‎WebAPI-ManuallyValidateJwt-DotNet.sln‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27130.2036
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoListClient", "TodoListClient\TodoListClient.csproj", "{005E6BB1-F422-4366-B548-1BDE150F0073}"
77
EndProject
@@ -25,4 +25,7 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {C3C901B4-3322-466D-805F-ADAC6C6FAB84}
30+
EndGlobalSection
2831
EndGlobal

0 commit comments

Comments
 (0)