Browse files

Upgraded Glimpse to the newest version

  • Loading branch information...
1 parent 6472886 commit a4e6804e32378ae88646a5904b89d36e44a0aa58 @dproteau committed Apr 17, 2013
Showing with 26 additions and 16 deletions.
  1. +4 −4 src/M13n/GlimpseSecurityPolicy.cs
  2. +8 −6 src/M13n/M13n.csproj
  3. +11 −3 src/M13n/Web.config
  4. +3 −3 src/M13n/packages.config
View
8 src/M13n/GlimpseSecurityPolicy.cs
@@ -1,8 +1,7 @@
/*
// Uncomment this class to provide custom runtime policy for Glimpse
-using System.Web;
-using Glimpse.Core;
+using Glimpse.AspNet.Extensions;
using Glimpse.Core.Extensibility;
namespace M13n
@@ -12,8 +11,9 @@ public class GlimpseSecurityPolicy:IRuntimePolicy
public RuntimePolicy Execute(IRuntimePolicyContext policyContext)
{
// You can perform a check like the one below to control Glimpse's permissions within your application.
- // var context = policyContext.GetRequestContext<HttpContextBase>();
- // if (!context.User.IsInRole("Administrator"))
+ // More information about RuntimePolicies can be found at http://getglimpse.com/Help/Custom-Runtime-Policy
+ // var httpContext = policyContext.GetHttpContext();
+ // if (!httpContext.User.IsInRole("Administrator"))
// {
// return RuntimePolicy.Off;
// }
View
14 src/M13n/M13n.csproj
@@ -47,14 +47,16 @@
<Reference Include="DataAnnotationsExtensions.ClientValidation">
<HintPath>..\packages\DataAnnotationsExtensions.MVC3.1.1.0.0\lib\NETFramework40\DataAnnotationsExtensions.ClientValidation.dll</HintPath>
</Reference>
- <Reference Include="Glimpse.AspNet">
- <HintPath>..\packages\Glimpse.AspNet.1.0.1\lib\net40\Glimpse.AspNet.dll</HintPath>
+ <Reference Include="Glimpse.AspNet, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Glimpse.AspNet.1.2.1\lib\net45\Glimpse.AspNet.dll</HintPath>
</Reference>
- <Reference Include="Glimpse.Core">
- <HintPath>..\packages\Glimpse.1.0.1\lib\net40\Glimpse.Core.dll</HintPath>
+ <Reference Include="Glimpse.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Glimpse.1.2.0\lib\net45\Glimpse.Core.dll</HintPath>
</Reference>
- <Reference Include="Glimpse.Mvc3">
- <HintPath>..\packages\Glimpse.Mvc3.1.0.1\lib\net40\Glimpse.Mvc3.dll</HintPath>
+ <Reference Include="Glimpse.Mvc4">
+ <HintPath>..\packages\Glimpse.Mvc4.1.2.1\lib\net40\Glimpse.Mvc4.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
View
14 src/M13n/Web.config
@@ -5,7 +5,6 @@
-->
<configuration>
<configSections>
- <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="glimpse" type="Glimpse.Core.Configuration.Section, Glimpse.Core" />
</configSections>
<connectionStrings></connectionStrings>
@@ -70,7 +69,6 @@
</httpHandlers>
</system.web>
<system.webServer>
- <validation validateIntegratedModeConfiguration="false" />
<handlers>
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
@@ -80,6 +78,7 @@
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="Glimpse" path="glimpse.axd" verb="GET" type="Glimpse.AspNet.HttpHandler, Glimpse.AspNet" preCondition="integratedMode" />
</handlers>
+ <validation validateIntegratedModeConfiguration="false" />
<modules>
<add name="Glimpse" type="Glimpse.AspNet.HttpModule, Glimpse.AspNet" preCondition="integratedMode" />
</modules>
@@ -108,5 +107,14 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
- <glimpse defaultRuntimePolicy="On" endpointBaseUri="~/Glimpse.axd" />
+ <glimpse defaultRuntimePolicy="On" endpointBaseUri="~/Glimpse.axd">
+ <!-- If you are having issues with Glimpse, please include this. It will help us figure out whats going on.
+ <logging level="Trace" />-->
+ <!-- Want to use Glimpse on a remote server? Ignore the LocalPolicy by removing this comment.
+ <runtimePolicies>
+ <ignoredTypes>
+ <add type="Glimpse.AspNet.Policy.LocalPolicy, Glimpse.AspNet"/>
+ </ignoredTypes>
+ </runtimePolicies>-->
+ </glimpse>
</configuration>
View
6 src/M13n/packages.config
@@ -3,9 +3,9 @@
<package id="DataAnnotationsExtensions" version="1.1.0.0" targetFramework="net45" />
<package id="DataAnnotationsExtensions.MVC3" version="1.1.0.0" targetFramework="net45" />
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
- <package id="Glimpse" version="1.0.1" targetFramework="net45" />
- <package id="Glimpse.AspNet" version="1.0.1" targetFramework="net45" />
- <package id="Glimpse.Mvc3" version="1.0.1" targetFramework="net45" />
+ <package id="Glimpse" version="1.2.0" targetFramework="net45" />
+ <package id="Glimpse.AspNet" version="1.2.1" targetFramework="net45" />
+ <package id="Glimpse.Mvc4" version="1.2.1" targetFramework="net45" />
<package id="jQuery" version="1.8.2" targetFramework="net45" />
<package id="jQuery.Validation" version="1.10.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />

0 comments on commit a4e6804

Please sign in to comment.