Skip to content

Commit 9ca75e9

Browse files
committed
Really update packages.
1 parent 682557a commit 9ca75e9

File tree

3 files changed

+48
-37
lines changed

3 files changed

+48
-37
lines changed

DevTrends.MvcDonutCaching.Demo/MvcDonutCaching.Demo.csproj

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
2323
<TargetFrameworkProfile />
24-
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
2524
</PropertyGroup>
2625
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2726
<DebugSymbols>true</DebugSymbols>
@@ -43,14 +42,16 @@
4342
<Prefer32Bit>false</Prefer32Bit>
4443
</PropertyGroup>
4544
<ItemGroup>
46-
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
45+
<Reference Include="Antlr3.Runtime">
46+
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
47+
<Private>True</Private>
4948
</Reference>
50-
<Reference Include="Artem.Web.Security">
49+
<Reference Include="Artem.Web.Security, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e940721bc239f3b1, processorArchitecture=MSIL">
50+
<SpecificVersion>False</SpecificVersion>
5151
<HintPath>..\packages\Artem.XmlProviders40.4.0\lib\Artem.Web.Security.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Artem.Web.Security.Xml">
53+
<Reference Include="Artem.Web.Security.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e940721bc239f3b1, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
5455
<HintPath>..\packages\Artem.XmlProviders40.4.0\lib\Artem.Web.Security.Xml.dll</HintPath>
5556
</Reference>
5657
<Reference Include="Autofac, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
@@ -61,23 +62,30 @@
6162
<SpecificVersion>False</SpecificVersion>
6263
<HintPath>..\packages\Autofac.Mvc5.3.2.1\lib\net45\Autofac.Integration.Mvc.dll</HintPath>
6364
</Reference>
64-
<Reference Include="Glimpse.AspNet">
65+
<Reference Include="Glimpse.AspNet, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
6567
<HintPath>..\packages\Glimpse.AspNet.1.9.0\lib\net45\Glimpse.AspNet.dll</HintPath>
6668
</Reference>
67-
<Reference Include="Glimpse.Autofac">
69+
<Reference Include="Glimpse.Autofac, Version=0.2.4.0, Culture=neutral, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
6871
<HintPath>..\packages\Glimpse.Autofac.0.2.4\lib\net40\Glimpse.Autofac.dll</HintPath>
6972
</Reference>
7073
<Reference Include="Glimpse.Core, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
7174
<SpecificVersion>False</SpecificVersion>
7275
<HintPath>..\packages\Glimpse.1.8.5\lib\net45\Glimpse.Core.dll</HintPath>
7376
</Reference>
74-
<Reference Include="Glimpse.Mvc5">
77+
<Reference Include="Glimpse.Mvc5, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
78+
<SpecificVersion>False</SpecificVersion>
7579
<HintPath>..\packages\Glimpse.Mvc5.1.5.3\lib\net45\Glimpse.Mvc5.dll</HintPath>
7680
</Reference>
7781
<Reference Include="Microsoft.CSharp" />
78-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
82+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<Private>True</Private>
84+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
85+
</Reference>
86+
<Reference Include="Newtonsoft.Json">
87+
<HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
88+
<Private>True</Private>
8189
</Reference>
8290
<Reference Include="System" />
8391
<Reference Include="System.Data.DataSetExtensions" />
@@ -97,9 +105,9 @@
97105
<SpecificVersion>False</SpecificVersion>
98106
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.1.2\lib\net45\System.Web.Mvc.dll</HintPath>
99107
</Reference>
100-
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<SpecificVersion>False</SpecificVersion>
102-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.2\lib\net40\System.Web.Optimization.dll</HintPath>
108+
<Reference Include="System.Web.Optimization">
109+
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
110+
<Private>True</Private>
103111
</Reference>
104112
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105113
<SpecificVersion>False</SpecificVersion>
@@ -121,14 +129,10 @@
121129
<Reference Include="System.Xml" />
122130
<Reference Include="System.Configuration" />
123131
<Reference Include="System.Web.Services" />
124-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125-
<Private>True</Private>
126-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
127-
</Reference>
128132
<Reference Include="System.Xml.Linq" />
129-
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<SpecificVersion>False</SpecificVersion>
131-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
133+
<Reference Include="WebGrease">
134+
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
135+
<Private>True</Private>
132136
</Reference>
133137
</ItemGroup>
134138
<ItemGroup>
@@ -169,21 +173,16 @@
169173
<DependentUpon>Web.config</DependentUpon>
170174
</Content>
171175
<Content Include="Views\Web.config" />
172-
<Content Include="Scripts\jquery-1.10.2.min.map" />
173176
<Content Include="Views\Home\NestedDonutOne.cshtml" />
174177
<Content Include="Views\LoadTest\ApplyLoad.cshtml" />
175178
<Content Include="Views\LoadTest\LargeOutPutRootAction.cshtml" />
176179
<Content Include="Views\LoadTest\MediumOutPutChildAction.cshtml" />
177180
<Content Include="Views\LoadTest\SmallOutPutGrandChildAction.cshtml" />
181+
<Content Include="Scripts\jquery-1.10.2.min.map" />
178182
</ItemGroup>
179183
<ItemGroup>
180184
<Content Include="Views\Home\SimpleDonutOne.cshtml" />
181185
</ItemGroup>
182-
<ItemGroup>
183-
<Content Include="packages.config">
184-
<SubType>Designer</SubType>
185-
</Content>
186-
</ItemGroup>
187186
<ItemGroup>
188187
<ProjectReference Include="..\DevTrends.MvcDonutCaching\MvcDonutCaching.csproj">
189188
<Project>{854e90c7-8320-4eb6-a286-24a8ee5ebe9b}</Project>
@@ -218,6 +217,9 @@
218217
<Folder Include="Areas\SubArea\Models\" />
219218
<Folder Include="Areas\SubArea\Views\Shared\" />
220219
</ItemGroup>
220+
<ItemGroup>
221+
<Content Include="packages.config" />
222+
</ItemGroup>
221223
<PropertyGroup>
222224
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
223225
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

DevTrends.MvcDonutCaching.Demo/Web.config

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<section name="glimpse" type="Glimpse.Core.Configuration.Section, Glimpse.Core" />
99
</configSections>
1010

11+
1112
<appSettings>
1213
<add key="webpages:Version" value="2.0.0.0" />
1314
<add key="webpages:Enabled" value="false" />
@@ -40,20 +41,26 @@
4041
<!-- Glimpse: This can be commented in to add additional data to the Trace tab when using WebForms
4142
<trace writeToDiagnosticsTrace="true" enabled="true" pageOutput="false"/> -->
4243
<membership defaultProvider="XmlMembershipProvider">
44+
4345
<providers>
4446
<add name="XmlMembershipProvider" type="Artem.Web.Security.XmlMembershipProvider, Artem.Web.Security.Xml" applicationName="Test" enablePasswordReset="true" enablePasswordRetrieval="false" maxInvalidPasswordAttempts="5" minRequiredNonAlphanumericCharacters="0" minRequiredPasswordLength="4" passwordAttemptWindow="10" passwordFormat="Clear" passwordStrengthRegularExpression="" requiresQuestionAndAnswer="false" requiresUniqueEmail="true" caseSensitive="false" useUniversalTime="false" fileName="Users.xml" folder="~/App_Data/" />
4547
</providers>
4648
</membership>
4749
<profile defaultProvider="XmlProfileProvider" enabled="false">
50+
4851
<providers>
4952
<add name="XmlProfileProvider" type="Artem.Web.Security.XmlProfileProvider, Artem.Web.Security.Xml" applicationName="Test" fileName="Profiles.xml" folder="~/App_Data/" />
5053
</providers>
5154
</profile>
5255
<roleManager enabled="true" defaultProvider="XmlRoleProvider">
56+
5357
<providers>
54-
<add applicationName="Test" caseSensitive="false" fileName="Roles.xml" folder="~/App_Data/" name="XmlRoleProvider" type="Artem.Web.Security.XmlRoleProvider, Artem.Web.Security.Xml" />
58+
<add name="XmlRoleProvider" type="Artem.Web.Security.XmlRoleProvider, Artem.Web.Security.Xml" applicationName="Test" caseSensitive="false" fileName="Roles.xml" folder="~/App_Data/" />
5559
</providers>
5660
</roleManager>
61+
62+
63+
5764
<!-- Glimpse: This can be commented in to add additional data to the Trace tab when using WebForms
5865
<trace writeToDiagnosticsTrace="true" enabled="true" pageOutput="false"/> -->
5966
<httpModules>
@@ -92,6 +99,8 @@
9299
</dependentAssembly>
93100
</assemblyBinding>
94101
</runtime>
102+
103+
95104
<glimpse defaultRuntimePolicy="On" endpointBaseUri="~/Glimpse.axd">
96105
<!--
97106
For more information on how to configure Glimpse, please visit http://getglimpse.com/Help/Configuration
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
4-
<package id="Artem.XmlProviders40" version="4.0" targetFramework="net40" />
3+
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
4+
<package id="Artem.XmlProviders40" version="4.0" targetFramework="net45" />
55
<package id="Autofac" version="3.3.1" targetFramework="net45" />
66
<package id="Autofac.Mvc5" version="3.2.1" targetFramework="net45" />
77
<package id="Glimpse" version="1.8.5" targetFramework="net45" />
88
<package id="Glimpse.AspNet" version="1.9.0" targetFramework="net45" />
9-
<package id="Glimpse.Autofac" version="0.2.4" targetFramework="net40" />
9+
<package id="Glimpse.Autofac" version="0.2.4" targetFramework="net45" />
1010
<package id="Glimpse.Mvc5" version="1.5.3" targetFramework="net45" />
11-
<package id="jQuery" version="1.10.2" targetFramework="net40" />
11+
<package id="jQuery" version="1.10.2" targetFramework="net45" />
1212
<package id="Microsoft.AspNet.Mvc" version="5.1.2" targetFramework="net45" />
1313
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net45" />
1414
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net45" />
15-
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.2" targetFramework="net40" />
15+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
1616
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net45" />
17-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
18-
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
19-
<package id="WebGrease" version="1.5.2" targetFramework="net40" />
17+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
18+
<package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
19+
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
2020
</packages>

0 commit comments

Comments
 (0)