yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade NuGet dependencies

Browse Source
This commit is contained in:
Stephan
2016-07-01 09:09:50 +02:00
parent 5cb3a3be2b
commit 9edffa010d
9 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Persistence/UmbracoDatabase.cs
View File

@@ -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;

4
src/Umbraco.Core/project.json
View File

@@ -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"

6
src/Umbraco.Tests/TestHelpers/TestObjects.cs
View File

@@ -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);
}
/// <summary>
@@ -68,9 +67,8 @@ namespace Umbraco.Tests.TestHelpers
public static UmbracoDatabase GetUmbracoSqlServerDatabase(ILogger logger)
{
var syntax = new SqlServerSyntaxProvider(new Lazy<IDatabaseFactory>(() => 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);
}
/// <summary>

8
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -64,8 +64,8 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LightInject, Version=4.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.9\lib\net46\LightInject.dll</HintPath>
<Reference Include="LightInject, Version=4.0.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.10\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LightInject.Annotation, Version=1.0.0.4, Culture=neutral, processorArchitecture=MSIL">
@@ -139,8 +139,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.3.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.4\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.4.0\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

4
src/Umbraco.Tests/packages.config
View File

@@ -3,7 +3,7 @@
<package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="Examine" version="2.0.0-beta2" targetFramework="net461" />
<package id="LightInject" version="4.0.9" targetFramework="net461" />
<package id="LightInject" version="4.0.10" targetFramework="net461" />
<package id="LightInject.Annotation" version="1.0.0.4" targetFramework="net461" />
<package id="log4net" version="2.0.5" targetFramework="net461" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net461" />
@@ -21,7 +21,7 @@
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.3.4" targetFramework="net461" />
<package id="NPoco" version="3.4.0" targetFramework="net461" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />

10
src/Umbraco.Web/project.json
View File

@@ -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",

4
src/UmbracoExamine/UmbracoExamine.csproj
View File

@@ -139,8 +139,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.3.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.4\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.4.0\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
src/UmbracoExamine/packages.config
View File

@@ -4,6 +4,6 @@
<package id="Lucene.Net" version="3.0.3" targetFramework="net461" />
<package id="Lucene.Net.Contrib" version="3.0.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.3.4" targetFramework="net461" />
<package id="NPoco" version="3.4.0" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
</packages>

4
src/umbraco.cms/umbraco.cms.csproj
View File

@@ -123,8 +123,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.3.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.4\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.4.0\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">