diff --git a/src/Umbraco.Compat7/project.json b/src/Umbraco.Compat7/project.json index c632be90df..d59e1f6f0a 100644 --- a/src/Umbraco.Compat7/project.json +++ b/src/Umbraco.Compat7/project.json @@ -1,12 +1,12 @@ { - "dependencies": { - "LightInject": "4.1.1" - }, - "frameworks": { - "net461": { } - }, - "runtimes": { - "win": { }, - "win-anycpu": { } - } + "dependencies": { + "LightInject": "4.1.3" + }, + "frameworks": { + "net461": {} + }, + "runtimes": { + "win": {}, + "win-anycpu": {} + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Logging/WebProfilerProvider.cs b/src/Umbraco.Core/Logging/WebProfilerProvider.cs index d2114362e4..8fe657a01b 100644 --- a/src/Umbraco.Core/Logging/WebProfilerProvider.cs +++ b/src/Umbraco.Core/Logging/WebProfilerProvider.cs @@ -76,12 +76,12 @@ namespace Umbraco.Core.Logging /// Starts a new MiniProfiler. /// /// - /// This is called when WebProfiler calls MiniProfiler.Start() so, + /// This is called when WebProfiler calls MiniProfiler.Start() so, /// - as a result of WebRuntime starting the WebProfiler, and /// - assuming profiling is enabled, on every BeginRequest that should be profiled, /// - except for the very first one which is the boot request. /// - public override MiniProfiler Start(string sessionName) + public override MiniProfiler Start(string sessionName = null) { var first = Interlocked.Exchange(ref _first, 1) == 0; if (first == false) return base.Start(sessionName); @@ -91,6 +91,12 @@ namespace Umbraco.Core.Logging return _startupProfiler; } + // obsolete but that's the one that's called ;-( + public override MiniProfiler Start(ProfileLevel level, string sessionName = null) + { + return Start(sessionName); + } + /// /// Gets the current profiler. /// diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs index 176232cfe7..5cabb4ad30 100644 --- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs +++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs @@ -267,7 +267,7 @@ namespace Umbraco.Core.Persistence .Skip(commandIndex * rowsPerCommand) .Take(rowsPerCommand); - var cmd = db.CreateCommand(connection, ""); + var cmd = db.CreateCommand(connection, CommandType.Text, ""); var prefix = db.DatabaseType.GetParameterPrefix(cmd.Connection.ConnectionString); var pocoValues = new List(); var index = 0; diff --git a/src/Umbraco.Core/project.json b/src/Umbraco.Core/project.json index 5be3ac6c76..c545608528 100644 --- a/src/Umbraco.Core/project.json +++ b/src/Umbraco.Core/project.json @@ -3,9 +3,9 @@ "AutoMapper": "4.2.1", "HtmlAgilityPack": "1.4.9.5", "ImageProcessor": "2.4.*", - "LightInject": "4.0.10", - "LightInject.Annotation": "1.0.0.4", - "LightInject.Web": "1.0.0.7", + "LightInject": "4.1.3", + "LightInject.Annotation": "1.1.0", + "LightInject.Web": "1.1.0", "log4net": "2.0.5", "Microsoft.AspNet.Identity.Core": "2.2.1", "Microsoft.AspNet.Identity.Owin": "2.2.1", @@ -14,7 +14,7 @@ "MiniProfiler": "3.2.0.157", "MySql.Data": "6.9.8", "Newtonsoft.Json": "8.0.3", - "NPoco": "3.4.0", + "NPoco": "3.4.5", "semver": "1.1.2", "SharpZipLib": "0.86.0", "SqlServerCE": "4.0.0.1" diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index db710d6698..9dcc6d4526 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -64,12 +64,12 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\packages\LightInject.4.0.10\lib\net46\LightInject.dll + + ..\packages\LightInject.4.1.3\lib\net46\LightInject.dll True - - ..\packages\LightInject.Annotation.1.0.0.4\lib\net45\LightInject.Annotation.dll + + ..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll True @@ -139,8 +139,8 @@ ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.5\lib\net45\NPoco.dll True diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index 97fe4513cf..4022d3d17a 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -3,8 +3,8 @@ - - + + @@ -21,7 +21,7 @@ - + diff --git a/src/Umbraco.Web/project.json b/src/Umbraco.Web/project.json index fef07cdd33..e6b380ad3c 100644 --- a/src/Umbraco.Web/project.json +++ b/src/Umbraco.Web/project.json @@ -6,11 +6,11 @@ "dotless": "1.4.1.0", "Examine": "2.0.0-beta2", "HtmlAgilityPack": "1.4.9.5", - "LightInject": "4.0.10", - "LightInject.Annotation": "1.0.0.4", - "LightInject.Mvc": "1.0.0.4", - "LightInject.Web": "1.0.0.7", - "LightInject.WebApi": "1.0.0.4", + "LightInject": "4.1.3", + "LightInject.Annotation": "1.1.0", + "LightInject.Mvc": "1.1.0", + "LightInject.Web": "1.1.0", + "LightInject.WebApi": "1.1.0", "log4net": "2.0.5", "Lucene.Net": "3.0.3", "Markdown": "1.*", @@ -32,7 +32,7 @@ "Microsoft.Web.Infrastructure": "1.0.0.0", "MiniProfiler": "3.2.0.157", "Newtonsoft.Json": "8.0.3", - "NPoco": "3.4.0", + "NPoco": "3.4.5", "Owin": "1.0.*", "semver": "1.1.2", "SharpZipLib": "0.86.0", diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 853711197f..6d61a4ff59 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -139,8 +139,8 @@ ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.5\lib\net45\NPoco.dll True diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index d5941c4122..ce62e601ff 100644 --- a/src/UmbracoExamine/packages.config +++ b/src/UmbracoExamine/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config index fc267b29e6..9e4fc86cc8 100644 --- a/src/umbraco.cms/packages.config +++ b/src/umbraco.cms/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index b2718fc1dd..9b8ce3746b 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -123,8 +123,8 @@ ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.5\lib\net45\NPoco.dll True