From 9edffa010ddc3a0e413ff2b01a8e23898fc6ee36 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 1 Jul 2016 09:09:50 +0200 Subject: [PATCH] Upgrade NuGet dependencies --- src/Umbraco.Core/Persistence/UmbracoDatabase.cs | 4 ++-- src/Umbraco.Core/project.json | 4 ++-- src/Umbraco.Tests/TestHelpers/TestObjects.cs | 6 ++---- src/Umbraco.Tests/Umbraco.Tests.csproj | 8 ++++---- src/Umbraco.Tests/packages.config | 4 ++-- src/Umbraco.Web/project.json | 10 +++++----- src/UmbracoExamine/UmbracoExamine.csproj | 4 ++-- src/UmbracoExamine/packages.config | 2 +- src/umbraco.cms/umbraco.cms.csproj | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs index 8e9cc28c7f..e7967dc795 100644 --- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs +++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs @@ -82,9 +82,9 @@ namespace Umbraco.Core.Persistence // INTERNAL FOR UNIT TESTS internal UmbracoDatabase(DbConnection connection, - ISqlSyntaxProvider sqlSyntax, DatabaseType databaseType, DbProviderFactory provider, + ISqlSyntaxProvider sqlSyntax, DatabaseType databaseType, ILogger logger) - : base(connection, databaseType, provider, DefaultIsolationLevel) + : base(connection, databaseType, DefaultIsolationLevel) { SqlSyntax = sqlSyntax; _logger = logger; diff --git a/src/Umbraco.Core/project.json b/src/Umbraco.Core/project.json index e0dabe88c8..a9d7462f75 100644 --- a/src/Umbraco.Core/project.json +++ b/src/Umbraco.Core/project.json @@ -3,7 +3,7 @@ "AutoMapper": "4.2.1", "HtmlAgilityPack": "1.4.9.5", "ImageProcessor": "2.4.*", - "LightInject": "4.0.9", + "LightInject": "4.0.10", "LightInject.Annotation": "1.0.0.4", "log4net": "2.0.5", "Microsoft.AspNet.Identity.Core": "2.2.1", @@ -13,7 +13,7 @@ "MiniProfiler": "3.2.0.157", "MySql.Data": "6.9.8", "Newtonsoft.Json": "8.0.3", - "NPoco": "3.3.4", + "NPoco": "3.4.0", "semver": "1.1.2", "SharpZipLib": "0.86.0", "SqlServerCE": "4.0.0.1" diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index 39a88051dd..dbe4c58fb3 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -53,9 +53,8 @@ namespace Umbraco.Tests.TestHelpers public static UmbracoDatabase GetUmbracoSqlCeDatabase(ILogger logger) { var syntax = new SqlCeSyntaxProvider(); - var dbProviderFactory = DbProviderFactories.GetFactory(Constants.DbProviderNames.SqlCe); var connection = TestObjects.GetDbConnection(); - return new UmbracoDatabase(connection, syntax, DatabaseType.SQLCe, dbProviderFactory, logger); + return new UmbracoDatabase(connection, syntax, DatabaseType.SQLCe, logger); } /// @@ -68,9 +67,8 @@ namespace Umbraco.Tests.TestHelpers public static UmbracoDatabase GetUmbracoSqlServerDatabase(ILogger logger) { var syntax = new SqlServerSyntaxProvider(new Lazy(() => null)); // do NOT try to get the server's version! - var dbProviderFactory = DbProviderFactories.GetFactory(Constants.DbProviderNames.SqlServer); var connection = TestObjects.GetDbConnection(); - return new UmbracoDatabase(connection, syntax, DatabaseType.SqlServer2008, dbProviderFactory, logger); + return new UmbracoDatabase(connection, syntax, DatabaseType.SqlServer2008, logger); } /// diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index c4b6f51dad..c34b9e108c 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -64,8 +64,8 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\packages\LightInject.4.0.9\lib\net46\LightInject.dll + + ..\packages\LightInject.4.0.10\lib\net46\LightInject.dll True @@ -139,8 +139,8 @@ ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NPoco.3.3.4\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll True diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index be1f907c27..97fe4513cf 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/src/Umbraco.Web/project.json b/src/Umbraco.Web/project.json index c188ee6230..72f48534fb 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.9", + "LightInject": "4.0.10", "LightInject.Annotation": "1.0.0.4", - "LightInject.Mvc": "1.0.*", - "LightInject.Web": "1.0.*", - "LightInject.WebApi": "1.0.*", + "LightInject.Mvc": "1.0.0.4", + "LightInject.Web": "1.0.0.7", + "LightInject.WebApi": "1.0.0.4", "log4net": "2.0.5", "Lucene.Net": "3.0.3", "Markdown": "1.*", @@ -33,7 +33,7 @@ "Microsoft.Web.Infrastructure": "1.0.0.0", "MiniProfiler": "3.2.0.157", "Newtonsoft.Json": "8.0.3", - "NPoco": "3.3.4", + "NPoco": "3.4.0", "Owin": "1.0.*", "semver": "1.1.2", "SharpZipLib": "0.86.0", diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 271d81ede4..853711197f 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.3.4\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll True diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index 555c11e47f..d5941c4122 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/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index ae7176a715..527150759c 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.3.4\lib\net45\NPoco.dll + + ..\packages\NPoco.3.4.0\lib\net45\NPoco.dll True