Readded PreApplicationStartCode after it was lost in a merge

avanderhoorn · Mar 29, 2011 · d79c246 · d79c246
1 parent c4c7f46
commit d79c246
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/source/Glimpse.Net/Glimpse.Net.csproj b/source/Glimpse.Net/Glimpse.Net.csproj
@@ -31,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.configuration" />
@@ -52,6 +53,7 @@
     <Compile Include="Extentions.cs" />
     <Compile Include="GlimpseRequestMetadata.cs" />
     <Compile Include="GlimpseTraceListener.cs" />
+    <Compile Include="PreApplicationStartCode.cs" />
     <Compile Include="Responder\Clients.cs" />
     <Compile Include="Responder\Config.cs" />
     <Compile Include="Responder\GlimpseResponderAttribute.cs" />

diff --git a/source/Glimpse.Net/PreApplicationStartCode.cs b/source/Glimpse.Net/PreApplicationStartCode.cs
@@ -0,0 +1,12 @@
+using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+
+namespace Glimpse.Net
+{
+    public class PreApplicationStartCode
+    {
+        public static void Start()
+        {
+            DynamicModuleUtility.RegisterModule(typeof(Module));
+        }
+    }
+}
diff --git a/source/Glimpse.Net/Properties/AssemblyInfo.cs b/source/Glimpse.Net/Properties/AssemblyInfo.cs
@@ -1,6 +1,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Web;
+using Glimpse.Net;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -37,3 +39,4 @@
 
 [assembly: System.Web.UI.WebResource("Glimpse.Net.glimpseClient.js", "application/x-javascript")]
 [assembly: System.Web.UI.WebResource("Glimpse.Net.glimpseSprinte.png", "image/png")]
+[assembly: PreApplicationStartMethod(typeof(PreApplicationStartCode), "Start")]
diff --git a/source/Glimpse.Test/Web.config b/source/Glimpse.Test/Web.config
@@ -34,9 +34,11 @@
         <authentication mode="Forms">
             <forms loginUrl="~/Account/LogOn" timeout="2880" />
         </authentication>
+        <!--
+        Look Ma - no httpModules!
         <httpModules>
             <add name="Glimpse" type="Glimpse.Net.Module" />
-        </httpModules>
+        </httpModules>-->
         <pages>
             <namespaces>
                 <add namespace="System.Web.Helpers" />