Skip to content

Commit 11ed173

Browse files
committed
PostSharp.Samples.MiniProfiler and PostSharp.Samples.Caching fixed.
1 parent 6c99c1b commit 11ed173

File tree

6 files changed

+39
-31
lines changed

6 files changed

+39
-31
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
using System.Web;
2-
using System.Web.Mvc;
3-
using System.Web.Optimization;
4-
using System.Web.Routing;
5-
6-
namespace PostSharp.Samples.MiniProfiler
7-
{
8-
public class MvcApplication : HttpApplication
1+
using StackExchange.Profiling;
2+
using System.Web;
3+
using System.Web.Mvc;
4+
using System.Web.Optimization;
5+
using System.Web.Routing;
6+
7+
namespace PostSharp.Samples.MiniProfiler
8+
{
9+
public class MvcApplication : HttpApplication
910
{
1011
StackExchange.Profiling.MiniProfiler profiler;
11-
12-
protected void Application_Start()
13-
{
14-
AreaRegistration.RegisterAllAreas();
15-
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
16-
RouteConfig.RegisterRoutes(RouteTable.Routes);
17-
BundleConfig.RegisterBundles(BundleTable.Bundles);
18-
}
19-
20-
protected void Application_BeginRequest()
21-
{
22-
this.profiler = StackExchange.Profiling.MiniProfiler.StartNew();
23-
}
24-
25-
protected void Application_EndRequest()
26-
{
27-
this.profiler.Stop();
28-
}
29-
}
12+
13+
protected void Application_Start()
14+
{
15+
AreaRegistration.RegisterAllAreas();
16+
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
17+
RouteConfig.RegisterRoutes(RouteTable.Routes);
18+
BundleConfig.RegisterBundles(BundleTable.Bundles);
19+
StackExchange.Profiling.MiniProfiler.Configure(new MiniProfilerOptions());
20+
}
21+
22+
protected void Application_BeginRequest()
23+
{
24+
this.profiler = StackExchange.Profiling.MiniProfiler.StartNew();
25+
}
26+
27+
protected void Application_EndRequest()
28+
{
29+
this.profiler?.Stop();
30+
}
31+
}
3032
}

Framework/PostSharp.Samples.MiniProfiler/PostSharp.Samples.MiniProfiler.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@
120120
<Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
121121
<HintPath>..\..\packages\MiniProfiler.4.1.0\lib\net461\MiniProfiler.dll</HintPath>
122122
</Reference>
123+
<Reference Include="MiniProfiler.Mvc5, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
124+
<HintPath>..\..\packages\MiniProfiler.Mvc5.4.1.0\lib\net461\MiniProfiler.Mvc5.dll</HintPath>
125+
</Reference>
123126
<Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
124127
<HintPath>..\..\packages\MiniProfiler.Shared.4.1.0\lib\net461\MiniProfiler.Shared.dll</HintPath>
125128
</Reference>

Framework/PostSharp.Samples.MiniProfiler/Views/Shared/_Layout.cshtml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434
</footer>
3535
</div>
3636

37-
@MiniProfiler.Current.RenderIncludes()
38-
3937
@Scripts.Render("~/bundles/jquery")
4038
@Scripts.Render("~/bundles/bootstrap")
4139
@RenderSection("scripts", false)
40+
@MiniProfiler.Current.RenderIncludes()
4241
</body>
4342
</html>

Framework/PostSharp.Samples.MiniProfiler/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</dependentAssembly>
7676
<dependentAssembly>
7777
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
78-
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
78+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
7979
</dependentAssembly>
8080
<dependentAssembly>
8181
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

Framework/PostSharp.Samples.MiniProfiler/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<package id="Microsoft.Owin.Security.Twitter" version="4.1.0" targetFramework="net472" />
2828
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
2929
<package id="MiniProfiler" version="4.1.0" targetFramework="net472" />
30+
<package id="MiniProfiler.Mvc5" version="4.1.0" targetFramework="net472" />
3031
<package id="MiniProfiler.Shared" version="4.1.0" targetFramework="net472" />
3132
<package id="Modernizr" version="2.8.3" targetFramework="net452" />
3233
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />

Solid/PostSharp.Samples.Caching/RedisServer.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ public static RedisServer Start()
3333

3434
Console.WriteLine("Starting Redis server with config file: " + configFile);
3535

36-
return new RedisServer(Process.Start(@"..\..\..\..\packages\redis-64.3.0.503\tools\redis-server.exe",
36+
// Update this path if the redis-64 NuGet package is restored to another location.
37+
return new RedisServer(Process.Start(
38+
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
39+
".nuget", "packages", "redis-64", "3.0.503", "tools", "redis-server.exe"),
3740
configFile));
3841
}
3942
return new RedisServer(null);

0 commit comments

Comments
 (0)