diff --git a/NzbDrone.Core/Datastore/PetaDbProviderFactory.cs b/NzbDrone.Core/Datastore/PetaDbProviderFactory.cs
index c6e1cc426..abdf4934f 100644
--- a/NzbDrone.Core/Datastore/PetaDbProviderFactory.cs
+++ b/NzbDrone.Core/Datastore/PetaDbProviderFactory.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data.Common;
using System.Data.SqlServerCe;
using System.Text;
+using MvcMiniProfiler;
using MvcMiniProfiler.Data;
namespace NzbDrone.Core.Datastore
@@ -18,7 +19,7 @@ namespace NzbDrone.Core.Datastore
if (IsProfiled)
{
- connection = ProfiledDbConnection.Get(sqliteConnection);
+ connection = new ProfiledDbConnection(sqliteConnection, MiniProfiler.Current);
}
return connection;
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index ef5e2cd8d..c66fbfbfb 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -138,9 +138,9 @@
False
..\Libraries\Migrator.NET\Migrator.Providers.dll
-
+
False
- ..\packages\MiniProfiler.1.7\lib\MvcMiniProfiler.dll
+ ..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll
..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll
diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config
index e8ff40357..15b7af0e6 100644
--- a/NzbDrone.Core/packages.config
+++ b/NzbDrone.Core/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 7aa2e544a..015d34733 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -51,9 +51,9 @@
..\Libraries\MVC3\Microsoft.Web.Infrastructure.dll
True
-
+
False
- ..\packages\MiniProfiler.1.7\lib\MvcMiniProfiler.dll
+ ..\packages\MiniProfiler.1.9\lib\net40\MvcMiniProfiler.dll
..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll
@@ -130,8 +130,9 @@
False
..\Libraries\TvdbLib.dll
-
- ..\packages\WebActivator.1.4.1\lib\net40\WebActivator.dll
+
+ False
+ ..\packages\WebActivator.1.4.2\lib\net40\WebActivator.dll
diff --git a/NzbDrone.Web/packages.config b/NzbDrone.Web/packages.config
index 9d179e259..2b434ad41 100644
--- a/NzbDrone.Web/packages.config
+++ b/NzbDrone.Web/packages.config
@@ -1,12 +1,12 @@
-
-
+
+
\ No newline at end of file
diff --git a/packages/MiniProfiler.1.7/MiniProfiler.1.7.nupkg b/packages/MiniProfiler.1.7/MiniProfiler.1.7.nupkg
deleted file mode 100644
index 09419a75a..000000000
Binary files a/packages/MiniProfiler.1.7/MiniProfiler.1.7.nupkg and /dev/null differ
diff --git a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.dll b/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.dll
deleted file mode 100644
index 7b1535957..000000000
Binary files a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.dll and /dev/null differ
diff --git a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.pdb b/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.pdb
deleted file mode 100644
index 84be4a775..000000000
Binary files a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.pdb and /dev/null differ
diff --git a/packages/MiniProfiler.1.9/MiniProfiler.1.9.nupkg b/packages/MiniProfiler.1.9/MiniProfiler.1.9.nupkg
new file mode 100644
index 000000000..245ccfcdd
Binary files /dev/null and b/packages/MiniProfiler.1.9/MiniProfiler.1.9.nupkg differ
diff --git a/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.dll b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.dll
new file mode 100644
index 000000000..98f7259bf
Binary files /dev/null and b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.dll differ
diff --git a/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.pdb b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.pdb
new file mode 100644
index 000000000..fab3f2cdd
Binary files /dev/null and b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.pdb differ
diff --git a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.xml b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.xml
similarity index 89%
rename from packages/MiniProfiler.1.7/lib/MvcMiniProfiler.xml
rename to packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.xml
index 6c0ff7e9a..a2baacbbd 100644
--- a/packages/MiniProfiler.1.7/lib/MvcMiniProfiler.xml
+++ b/packages/MiniProfiler.1.9/lib/net40/MvcMiniProfiler.xml
@@ -103,7 +103,7 @@
- Starts a new MiniProfiler for the current Request. This new profiler can be accessed by
+ Starts a new MiniProfiler based on the current . This new profiler can be accessed by
@@ -116,11 +116,6 @@
be prematurely stopped and discarded. Useful for when a specific route does not need to be profiled.
-
-
- Makes sure 'profiler' has a Name, pulling it from route data or url.
-
-
Returns an that will time the code between its creation and disposal. Use this method when you
@@ -129,7 +124,7 @@
A descriptive name for the code that is encapsulated by the resulting IDisposable's lifetime.
This step's visibility level; allows filtering when is called.
-
+
Returns the css and javascript includes needed to display the MiniProfiler results UI.
@@ -137,6 +132,7 @@
Whether to show trivial timings by default (defaults to false)
Whether to show time the time with children column by default (defaults to false)
The maximum number of trace popups to show before removing the oldest (defaults to 15)
+ xhtml rendering mode, ensure script tag is closed ... etc
Script and link elements normally; an empty string when there is no active profiling session.
@@ -258,7 +254,7 @@
- Points to the currently executing Timing.
+ Points to the currently executing Timing.
@@ -395,6 +391,12 @@
Assembly version of this dank MiniProfiler.
+
+
+ The provider used to provider the current instance of a provider
+ This is also
+
+
A function that determines who can access the MiniProfiler results url. It should return true when
@@ -459,20 +461,15 @@
Wraps a database connection, allowing sql execution timings to be collected when a session is started.
-
+
- Returns a new that wraps ,
- providing query execution profiling.
+ Current unwrapped connection
- Your provider-specific flavor of connection, e.g. SqlConnection, OracleConnection
-
+
- Returns a new that wraps ,
- providing query execution profiling.
+ The current profiler instance
- Your provider-specific flavor of connection, e.g. SqlConnection, OracleConnection
- The currently started or null.
@@ -482,24 +479,11 @@
Your provider-specific flavor of connection, e.g. SqlConnection, OracleConnection
The currently started or null.
-
+
- Connection factory used for EF Code First DbContext API
+ The raw connection this is wrapping
-
-
- Create a profiled connection factory
-
- The underlying connection that needs to be profiled
-
-
-
- Create a wrapped connection for profiling purposes
-
-
-
-
Understands how to save MiniProfiler results to a MSSQL database, allowing more permanent storage and
@@ -657,17 +641,87 @@
proxy
-
-
- Extension mechanism for additional services;
-
- requested service provider or null.
-
proxy
+
+
+ BaseProfilerProvider. This providers some helper methods which provide access to
+ internals not otherwise available.
+ To use, override the , and
+ methods.
+
+
+
+
+ A provider used to create instances and maintain the current instance.
+
+
+
+
+ Starts a new MiniProfiler and sets it to be current. By the end of this method
+ should return the new MiniProfiler.
+
+
+
+
+ Ends the current profiling session, if one exists.
+
+
+ When true, clears the for this HttpContext, allowing profiling to
+ be prematurely stopped and discarded. Useful for when a specific route does not need to be profiled.
+
+
+
+
+ Returns the current MiniProfiler. This is used by .
+
+
+
+
+
+ Starts a new MiniProfiler and sets it to be current. By the end of this method
+ should return the new MiniProfiler.
+
+
+
+
+ Stops the current MiniProfiler (if any is currently running).
+ should be called if is false
+
+ If true, any current results will be thrown away and nothing saved
+
+
+
+ Returns the current MiniProfiler. This is used by .
+
+
+
+
+
+ Sets to be active (read to start profiling)
+ This should be called once a new MiniProfiler has been created.
+
+ The profiler to set to active
+ If is null
+
+
+
+ Stops the profiler and marks it as inactive.
+
+ The profiler to stop
+ True if successful, false if Stop had previously been called on this profiler
+ If is null
+
+
+
+ Calls to save the current
+ profiler using the current storage settings
+
+
+
This filter can be applied globally to hook up automatic action profiling
@@ -803,13 +857,58 @@
)
-
+
- Get DB command definition
+ HttpContext based profiler provider. This is the default provider to use in a web context.
+ The current profiler is associated with a HttpContext.Current ensuring that profilers are
+ specific to a individual HttpRequest.
+
+
+
+
+ Public constructor. This also registers any UI routes needed to display results
+
+
+
+
+ Starts a new MiniProfiler and associates it with the current .
+
+
+
+
+ Ends the current profiling session, if one exists.
+
+
+ When true, clears the for this HttpContext, allowing profiling to
+ be prematurely stopped and discarded. Useful for when a specific route does not need to be profiled.
+
+
+
+
+ Makes sure 'profiler' has a Name, pulling it from route data or url.
+
+
+
+
+ Returns the current profiler
-
+
+
+ Gets the currently running MiniProfiler for the current HttpContext; null if no MiniProfiler was ed.
+
+
+
+
+ WebRequestProfilerProvider specific configurations
+
+
+
+
+ Provides user identification for a given profiling request.
+
+
An individual profiling step that can contain child steps.
@@ -1315,23 +1414,23 @@
- Create a wrapped view engine, which will profile partials an non-partial views
+ Wrap your view engines with this to allow profiling
- Find a partial view
+ Find a partial
- Fined a view
+ Find a view
- Release view
+ Find a partial
diff --git a/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg b/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg
deleted file mode 100644
index 270b40aab..000000000
Binary files a/packages/WebActivator.1.4.1/WebActivator.1.4.1.nupkg and /dev/null differ
diff --git a/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll b/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll
deleted file mode 100644
index 8ae134cbf..000000000
Binary files a/packages/WebActivator.1.4.1/lib/net40/WebActivator.dll and /dev/null differ
diff --git a/packages/WebActivator.1.4.2/WebActivator.1.4.2.nupkg b/packages/WebActivator.1.4.2/WebActivator.1.4.2.nupkg
new file mode 100644
index 000000000..a5e6a42e0
Binary files /dev/null and b/packages/WebActivator.1.4.2/WebActivator.1.4.2.nupkg differ
diff --git a/packages/WebActivator.1.4.2/lib/net40/WebActivator.dll b/packages/WebActivator.1.4.2/lib/net40/WebActivator.dll
new file mode 100644
index 000000000..268d9af28
Binary files /dev/null and b/packages/WebActivator.1.4.2/lib/net40/WebActivator.dll differ