Upgraded to MiniProfiler 2.0 RC

aaronpowell · aaronpowell · commit b15396a0a942 · 2012-02-28T13:12:01.000-08:00
diff --git a/src/FunnelWeb.Web/Areas/Admin/Views/Shared/_Private.cshtml b/src/FunnelWeb.Web/Areas/Admin/Views/Shared/_Private.cshtml
@@ -67,7 +67,7 @@
         Html.RequiresJs("showdown.js", "Scripts", 1);
         Html.RequiresJs("wmd.js", "Scripts", 1);
         Html.RequiresJs("site.js", "Scripts", 1);
-        @MvcMiniProfiler.MiniProfiler.RenderIncludes()
+        @MiniProfiler.RenderIncludes()
     }
     @MvcHtmlString.Create(Html.RenderJsHere(new BasicPath("Scripts", "~/Scripts")))
 </body>
diff --git a/src/FunnelWeb.Web/Areas/Admin/Views/Web.config b/src/FunnelWeb.Web/Areas/Admin/Views/Web.config
@@ -1,6 +1,28 @@
 ﻿<?xml version="1.0"?>
 
 <configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <namespaces>
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="FunnelWeb.Web.Application.Extensions" />
+        <add namespace="ClientDependency.Core.Mvc"/>
+        <add namespace="ClientDependency.Core"/>
+        <add namespace="StackExchange.Profiling"/>
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
   <system.web>
     <httpHandlers>
       <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
diff --git a/src/FunnelWeb.Web/FunnelWeb.Web.csproj b/src/FunnelWeb.Web/FunnelWeb.Web.csproj
@@ -80,9 +80,8 @@
       <HintPath>C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\Assemblies\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MvcMiniProfiler, Version=1.9.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll</HintPath>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.0.0-rc1\lib\net40\MiniProfiler.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/FunnelWeb.Web/Global.asax.cs b/src/FunnelWeb.Web/Global.asax.cs
@@ -21,7 +21,7 @@
 using FunnelWeb.Web.Application.Mvc.Binders;
 using FunnelWeb.Web.Application.Spam;
 using FunnelWeb.Web.Application.Themes;
-using MvcMiniProfiler;
+using StackExchange.Profiling;
 
 namespace FunnelWeb.Web
 {
diff --git a/src/FunnelWeb.Web/Views/Shared/_Public.cshtml b/src/FunnelWeb.Web/Views/Shared/_Public.cshtml
@@ -103,7 +103,7 @@
       Html.RequiresJs("wmd.js", "Scripts", 1);
       Html.RequiresJs("site.js", "Scripts", 1);
     }
-    @MvcMiniProfiler.MiniProfiler.RenderIncludes()
+    @MiniProfiler.RenderIncludes()
     @if (IsSectionDefined("Scripts"))
     {
         @RenderSection("Scripts")
diff --git a/src/FunnelWeb.Web/Views/Web.config b/src/FunnelWeb.Web/Views/Web.config
@@ -19,6 +19,7 @@
         <add namespace="FunnelWeb.Web.Application.Extensions" />
         <add namespace="ClientDependency.Core.Mvc"/>
         <add namespace="ClientDependency.Core"/>
+        <add namespace="StackExchange.Profiling"/>
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/src/FunnelWeb.Web/packages.config b/src/FunnelWeb.Web/packages.config
@@ -11,7 +11,7 @@
   <package id="jQuery" version="1.7.1" />
   <package id="jQuery.UI.Combined" version="1.8.17" />
   <package id="jQuery.Validation" version="1.9" />
-  <package id="MiniProfiler" version="1.9" />
+  <package id="MiniProfiler" version="2.0.0-rc1" />
   <package id="NHibernate" version="3.2.0.4000" />
   <package id="SqlServerCompact" version="4.0.8482.1" />
   <package id="xmlrpcnet" version="2.5.0" />
diff --git a/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlClientDriver.cs b/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlClientDriver.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Data;
 using System.Data.SqlClient;
-using MvcMiniProfiler;
 using NHibernate.AdoNet;
 using NHibernate.Driver;
+using StackExchange.Profiling;
 
 namespace FunnelWeb.DatabaseDeployer.DbProviders
 {
diff --git a/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbCommand.cs b/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbCommand.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Data.Common;
 using System.Data.SqlClient;
-using MvcMiniProfiler;
-using MvcMiniProfiler.Data;
+using StackExchange.Profiling;
+using StackExchange.Profiling.Data;
 
 namespace FunnelWeb.DatabaseDeployer.DbProviders
 {
diff --git a/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbConnection.cs b/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbConnection.cs
@@ -2,8 +2,8 @@
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
-using MvcMiniProfiler;
-using MvcMiniProfiler.Data;
+using StackExchange.Profiling;
+using StackExchange.Profiling.Data;
 
 namespace FunnelWeb.DatabaseDeployer.DbProviders
 {
diff --git a/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbTransaction.cs b/src/FunnelWeb/DatabaseDeployer/DbProviders/ProfiledSqlDbTransaction.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data.SqlClient;
-using MvcMiniProfiler.Data;
+using StackExchange.Profiling.Data;
 
 namespace FunnelWeb.DatabaseDeployer.DbProviders
 {
diff --git a/src/FunnelWeb/FunnelWeb.csproj b/src/FunnelWeb/FunnelWeb.csproj
@@ -59,9 +59,8 @@
     <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="MvcMiniProfiler, Version=1.9.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll</HintPath>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.0.0-rc1\lib\net40\MiniProfiler.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -115,12 +114,8 @@
     <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlClientBatchingBatcher.cs" />
     <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlClientBatchingBatcherFactory.cs" />
     <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlClientDriver.cs" />
-    <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlDbCommand.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlDbConnection.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlDbCommand.cs" />
+    <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlDbConnection.cs" />
     <Compile Include="DatabaseDeployer\DbProviders\ProfiledSqlDbTransaction.cs" />
     <Compile Include="DatabaseDeployer\DbProviders\ProviderMetaData.cs" />
     <Compile Include="DatabaseDeployer\DbProviders\SqlCeDatabaseProvider.cs" />
@@ -377,4 +372,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/src/FunnelWeb/Repositories/NHibernateRepository.cs b/src/FunnelWeb/Repositories/NHibernateRepository.cs
@@ -1,24 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
 using Autofac.Features.Indexed;
 using FunnelWeb.DatabaseDeployer;
 using FunnelWeb.DatabaseDeployer.DbProviders;
-using MvcMiniProfiler;
-using MvcMiniProfiler.Data;
 using NHibernate;
-using NHibernate.AdoNet;
-using NHibernate.AdoNet.Util;
-using NHibernate.Driver;
-using NHibernate.Engine;
-using NHibernate.Exceptions;
-using NHibernate.SqlCommand;
-using NHibernate.SqlTypes;
-using NHibernate.Util;
 
 namespace FunnelWeb.Repositories
 {
diff --git a/src/FunnelWeb/packages.config b/src/FunnelWeb/packages.config
@@ -6,7 +6,7 @@
   <package id="dbup" version="2.0.67" />
   <package id="dbup-sqlce" version="2.0.67" />
   <package id="Iesi.Collections" version="3.2.0.4000" />
-  <package id="MiniProfiler" version="1.9" />
+  <package id="MiniProfiler" version="2.0.0-rc1" />
   <package id="NHibernate" version="3.2.0.4000" />
   <package id="NHibernate.Validator" version="1.3.1.4000" />
   <package id="SharpZipLib" version="0.86.0" />
diff --git a/src/packages/MiniProfiler.1.9/MiniProfiler.1.9.nupkg b/src/packages/MiniProfiler.1.9/MiniProfiler.1.9.nupkg
diff --git a/src/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.dll b/src/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.dll
diff --git a/src/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.xml b/src/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.xml
diff --git a/src/packages/MiniProfiler.2.0.0-rc1/MiniProfiler.2.0.0-rc1.nupkg b/src/packages/MiniProfiler.2.0.0-rc1/MiniProfiler.2.0.0-rc1.nupkg
diff --git a/src/packages/MiniProfiler.2.0.0-rc1/lib/net40/MiniProfiler.dll b/src/packages/MiniProfiler.2.0.0-rc1/lib/net40/MiniProfiler.dll
diff --git a/src/packages/MiniProfiler.2.0.0-rc1/lib/net40/MiniProfiler.xml b/src/packages/MiniProfiler.2.0.0-rc1/lib/net40/MiniProfiler.xml

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`Html.RequiresJs("showdown.js", "Scripts", 1);`
`68`	`68`	`Html.RequiresJs("wmd.js", "Scripts", 1);`
`69`	`69`	`Html.RequiresJs("site.js", "Scripts", 1);`
`70`		`- @MvcMiniProfiler.MiniProfiler.RenderIncludes()`
	`70`	`+ @MiniProfiler.RenderIncludes()`
`71`	`71`	`}`
`72`	`72`	`@MvcHtmlString.Create(Html.RenderJsHere(new BasicPath("Scripts", "~/Scripts")))`
`73`	`73`	`</body>`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`using FunnelWeb.Web.Application.Mvc.Binders;`
`22`	`22`	`using FunnelWeb.Web.Application.Spam;`
`23`	`23`	`using FunnelWeb.Web.Application.Themes;`
`24`		`-using MvcMiniProfiler;`
	`24`	`+using StackExchange.Profiling;`
`25`	`25`
`26`	`26`	`namespace FunnelWeb.Web`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@`
`103`	`103`	`Html.RequiresJs("wmd.js", "Scripts", 1);`
`104`	`104`	`Html.RequiresJs("site.js", "Scripts", 1);`
`105`	`105`	`}`
`106`		`- @MvcMiniProfiler.MiniProfiler.RenderIncludes()`
	`106`	`+ @MiniProfiler.RenderIncludes()`
`107`	`107`	`@if (IsSectionDefined("Scripts"))`
`108`	`108`	`{`
`109`	`109`	`@RenderSection("Scripts")`