diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 508f85abe..ecf58e523 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -133,8 +133,9 @@ <Reference Include="MigSharp"> <HintPath>..\Libraries\MigSharp.dll</HintPath> </Reference> - <Reference Include="MvcMiniProfiler"> - <HintPath>..\packages\MiniProfiler.1.2\lib\MvcMiniProfiler.dll</HintPath> + <Reference Include="MvcMiniProfiler, Version=2.1.4183.14740, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\MiniProfiler.1.3\lib\MvcMiniProfiler.dll</HintPath> </Reference> <Reference Include="Ninject, Version=2.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL"> <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath> diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config index dc63f6ebd..249f147ba 100644 --- a/NzbDrone.Core/packages.config +++ b/NzbDrone.Core/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Ninject" version="2.2.1.4" /> - <package id="MiniProfiler" version="1.2" /> + <package id="MiniProfiler" version="1.3" /> </packages> \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 6c6e0c9f8..963cea074 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -57,8 +57,9 @@ <HintPath>..\Libraries\MVC3\Microsoft.Web.Infrastructure.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="MvcMiniProfiler"> - <HintPath>..\packages\MiniProfiler.1.2\lib\MvcMiniProfiler.dll</HintPath> + <Reference Include="MvcMiniProfiler, Version=2.1.4183.14740, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\MiniProfiler.1.3\lib\MvcMiniProfiler.dll</HintPath> </Reference> <Reference Include="Ninject, Version=2.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL"> <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath> diff --git a/NzbDrone.Web/packages.config b/NzbDrone.Web/packages.config index fdd72d2b3..0f9d9b4b9 100644 --- a/NzbDrone.Web/packages.config +++ b/NzbDrone.Web/packages.config @@ -9,5 +9,5 @@ <package id="jQuery.vsdoc" version="1.6" /> <package id="jQuery.Validation" version="1.8.0.1" /> <package id="jQuery" version="1.6.1" /> - <package id="MiniProfiler" version="1.2" /> + <package id="MiniProfiler" version="1.3" /> </packages> \ No newline at end of file diff --git a/packages/MiniProfiler.1.2/MiniProfiler.1.2.nupkg b/packages/MiniProfiler.1.2/MiniProfiler.1.2.nupkg deleted file mode 100644 index 8b03a0034..000000000 Binary files a/packages/MiniProfiler.1.2/MiniProfiler.1.2.nupkg and /dev/null differ diff --git a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.dll b/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.dll deleted file mode 100644 index bf7f0a3b1..000000000 Binary files a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.dll and /dev/null differ diff --git a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.pdb b/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.pdb deleted file mode 100644 index d70f75438..000000000 Binary files a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.pdb and /dev/null differ diff --git a/packages/MiniProfiler.1.3/MiniProfiler.1.3.nupkg b/packages/MiniProfiler.1.3/MiniProfiler.1.3.nupkg new file mode 100644 index 000000000..3acc489ca Binary files /dev/null and b/packages/MiniProfiler.1.3/MiniProfiler.1.3.nupkg differ diff --git a/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.dll b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.dll new file mode 100644 index 000000000..5e11c81d0 Binary files /dev/null and b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.dll differ diff --git a/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.pdb b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.pdb new file mode 100644 index 000000000..46efddc14 Binary files /dev/null and b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.pdb differ diff --git a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.xml b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.xml similarity index 83% rename from packages/MiniProfiler.1.2/lib/MvcMiniProfiler.xml rename to packages/MiniProfiler.1.3/lib/MvcMiniProfiler.xml index ac83c177f..937e4d4cd 100644 --- a/packages/MiniProfiler.1.2/lib/MvcMiniProfiler.xml +++ b/packages/MiniProfiler.1.3/lib/MvcMiniProfiler.xml @@ -116,6 +116,11 @@ Gets the ellapsed milliseconds in this step without any children's durations. </summary> </member> + <member name="P:MvcMiniProfiler.Timing.SqlTimingsDurationMilliseconds"> + <summary> + Gets the aggregate ellapsed milliseconds of all SqlTimings executed in this Timing, excluding Children Timings. + </summary> + </member> <member name="P:MvcMiniProfiler.Timing.IsTrivial"> <summary> Returns true when this <see cref="P:MvcMiniProfiler.Timing.DurationWithoutChildrenMilliseconds"/> is less than the configured @@ -132,6 +137,11 @@ Returns true if this Timing step collected sql execution timings. </summary> </member> + <member name="P:MvcMiniProfiler.Timing.HasDuplicateSqlTimings"> + <summary> + Returns true if any <see cref="T:MvcMiniProfiler.SqlTiming"/>s executed in this step are detected as duplicate statements. + </summary> + </member> <member name="P:MvcMiniProfiler.Timing.IsRoot"> <summary> Returns true when this Timing is the first one created in a MiniProfiler session. @@ -142,6 +152,21 @@ How far away this Timing is from the Profiler's Root. </summary> </member> + <member name="P:MvcMiniProfiler.Timing.ExecutedReaders"> + <summary> + How many sql data readers were executed in this Timing step. + </summary> + </member> + <member name="P:MvcMiniProfiler.Timing.ExecutedScalars"> + <summary> + How many sql scalar queries were executed in this Timing step. + </summary> + </member> + <member name="P:MvcMiniProfiler.Timing.ExecutedNonQueries"> + <summary> + How many sql non-query statements were executed in this Timing step. + </summary> + </member> <member name="P:MvcMiniProfiler.Data.ProfiledDbCommand.BindByName"> <summary> If the underlying command supports BindByName, this sets/clears the underlying @@ -201,6 +226,11 @@ Called when database reader is closed, ending profiling for <see cref="F:MvcMiniProfiler.ExecuteType.Reader"/> SqlTimings. </summary> </member> + <member name="M:MvcMiniProfiler.SqlTiming.AddSpacesToParameters(System.String)"> + <summary> + To help with display, put some space around sammiched commas + </summary> + </member> <member name="P:MvcMiniProfiler.SqlTiming.ExecuteType"> <summary> Category of sql statement executed. @@ -232,6 +262,11 @@ before all records are fetched and reader is closed. </summary> </member> + <member name="P:MvcMiniProfiler.SqlTiming.IsDuplicate"> + <summary> + True when other identical sql statements have been executed during this MiniProfiler session. + </summary> + </member> <member name="T:MvcMiniProfiler.Helpers.StackTraceSnippet"> <summary> Gets part of a stack trace containing only methods we care about. @@ -254,6 +289,11 @@ their starting time. </summary> </member> + <member name="F:MvcMiniProfiler.MiniProfiler._sqlCounts"> + <summary> + + </summary> + </member> <member name="M:MvcMiniProfiler.MiniProfiler.#ctor(System.String,MvcMiniProfiler.ProfileLevel)"> <summary> Creates and starts a new MiniProfiler for the root <paramref name="url"/>, filtering <see cref="T:MvcMiniProfiler.Timing"/> steps to <paramref name="level"/>. @@ -294,12 +334,38 @@ be prematurely stopped and discarded. Useful for when a specific route does not need to be profiled. </param> </member> - <member name="M:MvcMiniProfiler.MiniProfiler.RenderIncludes"> + <member name="M:MvcMiniProfiler.MiniProfiler.StepStatic(System.String,MvcMiniProfiler.ProfileLevel)"> + <summary> + Returns an <see cref="T:System.IDisposable"/> that will time the code between its creation and disposal. Use this method when you + do not wish to include the MvcMiniProfiler namespace for the <see cref="M:MvcMiniProfiler.MiniProfilerExtensions.Step(MvcMiniProfiler.MiniProfiler,System.String,MvcMiniProfiler.ProfileLevel)"/> extension method. + </summary> + <param name="name">A descriptive name for the code that is encapsulated by the resulting IDisposable's lifetime.</param> + <param name="level">This step's visibility level; allows filtering when <see cref="M:MvcMiniProfiler.MiniProfiler.Start(MvcMiniProfiler.ProfileLevel)"/> is called.</param> + </member> + <member name="M:MvcMiniProfiler.MiniProfiler.RenderIncludes(System.Nullable{MvcMiniProfiler.RenderPosition},System.Boolean,System.Boolean)"> <summary> Returns the css and javascript includes needed to display the MiniProfiler results UI. </summary> + <param name="position">Which side of the page the profiler popup button should be displayed on (defaults to left)</param> + <param name="showTrivial">Whether to show trivial timings by default (defaults to false)</param> + <param name="showTimeWithChildren">Whether to show time the time with children column by default (defaults to false)</param> <returns>Script and link elements normally; an empty string when there is no active profiling session.</returns> </member> + <member name="M:MvcMiniProfiler.MiniProfiler.ToJson"> + <summary> + Renders the current <see cref="T:MvcMiniProfiler.MiniProfiler"/> to json. + </summary> + </member> + <member name="M:MvcMiniProfiler.MiniProfiler.ToJson(MvcMiniProfiler.MiniProfiler)"> + <summary> + Renders the parameter <see cref="T:MvcMiniProfiler.MiniProfiler"/> to json. + </summary> + </member> + <member name="M:MvcMiniProfiler.MiniProfiler.FromJson(System.String)"> + <summary> + Deserializes the json string parameter to a <see cref="T:MvcMiniProfiler.MiniProfiler"/>. + </summary> + </member> <member name="P:MvcMiniProfiler.MiniProfiler.Id"> <summary> Identifies this Profiler so it may be stored/cached. @@ -352,6 +418,26 @@ Returns true when we have profiled queries. </summary> </member> + <member name="P:MvcMiniProfiler.MiniProfiler.HasDuplicateSqlTimings"> + <summary> + Returns true when any child Timings have duplicate queries. + </summary> + </member> + <member name="P:MvcMiniProfiler.MiniProfiler.HasTrivialTimings"> + <summary> + Returns true when <see cref="P:MvcMiniProfiler.MiniProfiler.Root"/> or any of its <see cref="P:MvcMiniProfiler.Timing.Children"/> are <see cref="P:MvcMiniProfiler.Timing.IsTrivial"/>. + </summary> + </member> + <member name="P:MvcMiniProfiler.MiniProfiler.HasAllTrivialTimings"> + <summary> + Returns true when all child <see cref="T:MvcMiniProfiler.Timing"/>s are <see cref="P:MvcMiniProfiler.Timing.IsTrivial"/>. + </summary> + </member> + <member name="P:MvcMiniProfiler.MiniProfiler.TrivialDurationThresholdMilliseconds"> + <summary> + Any Timing step with a duration less than or equal to this will be hidden by default in the UI; defaults to 2.0 ms. + </summary> + </member> <member name="P:MvcMiniProfiler.MiniProfiler.ElapsedTicks"> <summary> Ticks since this MiniProfiler was started. @@ -461,7 +547,7 @@ Returns either includes' css/javascript or results' html. </summary> </member> - <member name="M:MvcMiniProfiler.UI.MiniProfilerHandler.Includes(System.Web.HttpContext)"> + <member name="M:MvcMiniProfiler.UI.MiniProfilerHandler.Includes(System.Web.HttpContext,System.String)"> <summary> Handles rendering our .js and .less static content files. </summary> @@ -508,6 +594,21 @@ Useful when profiling many items in a loop, but you don't wish to always see this detail. </summary> </member> + <member name="T:MvcMiniProfiler.RenderPosition"> + <summary> + Dictates on which side of the page the profiler popup button is displayed; defaults to left. + </summary> + </member> + <member name="F:MvcMiniProfiler.RenderPosition.Left"> + <summary> + Profiler popup button is displayed on the left. + </summary> + </member> + <member name="F:MvcMiniProfiler.RenderPosition.Right"> + <summary> + Profiler popup button is displayed on the right. + </summary> + </member> <member name="T:MvcMiniProfiler.MiniProfilerExtensions"> <summary> Contains helper methods that ease working with null <see cref="T:MvcMiniProfiler.MiniProfiler"/>s.