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

Upgrade to NPoco 3.3.0-beta3

Browse Source
This commit is contained in:
Stephan
2016-05-10 08:48:49 +02:00
parent 1a522f2136
commit 9458fad190
11 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs
View File

@@ -120,15 +120,6 @@ namespace Umbraco.Core.Persistence
return sql.LeftJoin(sql.SqlContext.SqlSyntax.GetQuotedTableName(tableName));
}
public static Sql<SqlContext>.SqlJoinClause<SqlContext> LeftOuterJoin<T>(this Sql<SqlContext> sql)
{
var type = typeof(T);
var tableNameAttribute = type.FirstAttribute<TableNameAttribute>();
var tableName = tableNameAttribute == null ? string.Empty : tableNameAttribute.Value;
return sql.LeftOuterJoin(sql.SqlContext.SqlSyntax.GetQuotedTableName(tableName));
}
public static Sql<SqlContext>.SqlJoinClause<SqlContext> RightJoin<T>(this Sql<SqlContext> sql)
{
var type = typeof(T);

4
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -96,8 +96,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.1.0-u005\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.0-beta3\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">

2
src/Umbraco.Core/packages.config
View File

@@ -14,7 +14,7 @@
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.1.0-u005" targetFramework="net461" />
<package id="NPoco" version="3.3.0-beta3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="semver" version="1.1.2" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4" />

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

@@ -98,8 +98,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.1.0-u005\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.0-beta3\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

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

@@ -20,7 +20,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.1.0-u005" targetFramework="net461" />
<package id="NPoco" version="3.3.0-beta3" 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" />

4
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -201,8 +201,8 @@
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.1.0-u005\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.0-beta3\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

2
src/Umbraco.Web/packages.config
View File

@@ -30,7 +30,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.1.0-u005" targetFramework="net461" />
<package id="NPoco" version="3.3.0-beta3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="semver" version="1.1.2" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />

5
src/UmbracoExamine/UmbracoExamine.csproj
View File

@@ -99,8 +99,8 @@
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NPoco, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.1.0-u005\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.0-beta3\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -110,6 +110,7 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Xml.Linq">

2
src/UmbracoExamine/packages.config
View File

@@ -3,6 +3,6 @@
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net461" />
<package id="NPoco" version="3.1.0-u005" targetFramework="net461" />
<package id="NPoco" version="3.3.0-beta3" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
</packages>

2
src/umbraco.cms/packages.config
View File

@@ -3,6 +3,6 @@
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.1.0-u005" targetFramework="net461" />
<package id="NPoco" version="3.3.0-beta3" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
</packages>

5
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.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.1.0-u005\lib\net45\NPoco.dll</HintPath>
<Reference Include="NPoco, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NPoco.3.3.0-beta3\lib\net45\NPoco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">
@@ -139,6 +139,7 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security">
<Name>System.Security</Name>
</Reference>