Skip to content

Commit c2e277d

Browse files
committed
Testing issue #23, seems to work fine for me, poke @ejjpi
1 parent 9ca75e9 commit c2e277d

File tree

6 files changed

+35
-11
lines changed

6 files changed

+35
-11
lines changed

DevTrends.MvcDonutCaching.Demo/Controllers/HomeController.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,11 @@ public ActionResult ExpireSimpleDonutOneCache()
5050

5151
return Content("OK", "text/plain");
5252
}
53+
54+
[DonutOutputCache(Duration = 60 * 5, VaryByParam = "*", VaryByCustom = "subdomain")]
55+
public ActionResult TestIssue23()
56+
{
57+
return View();
58+
}
5359
}
5460
}

DevTrends.MvcDonutCaching.Demo/Global.asax.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ public override string GetVaryByCustomString(HttpContext context, string custom)
5555

5656
switch (custom.ToLowerInvariant())
5757
{
58+
case "subdomain":
59+
return context.Request.Url.Host == "sub.localtest.me"
60+
? "sub"
61+
: "main";
62+
63+
5864
case "user":
5965
var principal = context.User;
6066
if (principal != null)

DevTrends.MvcDonutCaching.Demo/MvcDonutCaching.Demo.csproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{2C31E962-9616-4292-9DB6-52E40CB07E19}</ProjectGuid>
11-
<ProjectTypeGuids>{E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>DevTrends.MvcDonutCaching.Demo</RootNamespace>
@@ -42,9 +42,9 @@
4242
<Prefer32Bit>false</Prefer32Bit>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="Antlr3.Runtime">
45+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
4647
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
47-
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Artem.Web.Security, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e940721bc239f3b1, processorArchitecture=MSIL">
5050
<SpecificVersion>False</SpecificVersion>
@@ -83,9 +83,9 @@
8383
<Private>True</Private>
8484
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Newtonsoft.Json">
87-
<HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
88-
<Private>True</Private>
86+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87+
<SpecificVersion>False</SpecificVersion>
88+
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
8989
</Reference>
9090
<Reference Include="System" />
9191
<Reference Include="System.Data.DataSetExtensions" />
@@ -130,9 +130,9 @@
130130
<Reference Include="System.Configuration" />
131131
<Reference Include="System.Web.Services" />
132132
<Reference Include="System.Xml.Linq" />
133-
<Reference Include="WebGrease">
133+
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<SpecificVersion>False</SpecificVersion>
134135
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
135-
<Private>True</Private>
136136
</Reference>
137137
</ItemGroup>
138138
<ItemGroup>
@@ -179,6 +179,7 @@
179179
<Content Include="Views\LoadTest\MediumOutPutChildAction.cshtml" />
180180
<Content Include="Views\LoadTest\SmallOutPutGrandChildAction.cshtml" />
181181
<Content Include="Scripts\jquery-1.10.2.min.map" />
182+
<Content Include="Views\Home\TestIssue23.cshtml" />
182183
</ItemGroup>
183184
<ItemGroup>
184185
<Content Include="Views\Home\SimpleDonutOne.cshtml" />
@@ -218,7 +219,9 @@
218219
<Folder Include="Areas\SubArea\Views\Shared\" />
219220
</ItemGroup>
220221
<ItemGroup>
221-
<Content Include="packages.config" />
222+
<Content Include="packages.config">
223+
<SubType>Designer</SubType>
224+
</Content>
222225
</ItemGroup>
223226
<PropertyGroup>
224227
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@Request.Url.Host - @DateTime.UtcNow

DevTrends.MvcDonutCaching.Demo/Web.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</dependentAssembly>
8484
<dependentAssembly>
8585
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
86-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
86+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
8787
</dependentAssembly>
8888
<dependentAssembly>
8989
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -97,6 +97,14 @@
9797
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
9898
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
9999
</dependentAssembly>
100+
<dependentAssembly>
101+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
102+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
103+
</dependentAssembly>
104+
<dependentAssembly>
105+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
106+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
107+
</dependentAssembly>
100108
</assemblyBinding>
101109
</runtime>
102110

DevTrends.MvcDonutCaching.Demo/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
1616
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net45" />
1717
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
18-
<package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
18+
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
1919
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
2020
</packages>

0 commit comments

Comments
 (0)