Skip to content
This repository has been archived by the owner on Dec 10, 2018. It is now read-only.
/ t4models Public archive

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ili committed Jun 6, 2017
2 parents 4136e98 + 4816af3 commit 4b98337
Show file tree
Hide file tree
Showing 33 changed files with 42 additions and 38 deletions.
4 changes: 2 additions & 2 deletions NuGet/linq2db.Access.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Access</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Access</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db Access LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.DB2.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.DB2</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to IBM DB2</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db DB2 LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Firebird.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Firebird</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Firebird</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db Firebird LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Informix.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Informix</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Informix</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db Informix LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.MySql.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.MySql</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to MySql</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db MySql LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Oracle.Managed.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Oracle.Managed</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Oracle (ODP.NET) Managed</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db Oracle LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Oracle.x64.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Oracle.x64</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Oracle (ODP.NET) x64</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db Oracle ODP LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Oracle.x86.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Oracle.x86</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Oracle (ODP.NET) x86</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db Oracle ODP LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.PostgreSQL.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.PostgreSQL</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to PostgreSQL</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db Npgsql PostgreSQL LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.SQLite.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.SQLite</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to SQLite</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db SQLite LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.SapHana.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.SapHana</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to SAP HANA</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db SapHana LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.SqlCe.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.SqlCe</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to SqlCe</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db SqlCe SqlServerCe SqlServer Compact LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.SqlServer.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.SqlServer</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to SqlServer</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -18,7 +18,7 @@
</summary>
<tags>linq linq2db SqlServer LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions NuGet/linq2db.Sybase.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.Sybase</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to Sybase ASE</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -19,7 +19,7 @@
</summary>
<tags>linq linq2db Sybase LinqToDB ORM database DB SQL</tags>
<dependencies>
<dependency id="linq2db.t4models" version="1.8.1"/>
<dependency id="linq2db.t4models" version="1.8.2"/>
</dependencies>
</metadata>
<files>
Expand Down
8 changes: 4 additions & 4 deletions NuGet/linq2db.t4models.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>linq2db.t4models</id>
<version>1.8.1</version>
<version>1.8.2</version>
<title>LINQ to DB T4 Models</title>
<authors>Igor Tkachev</authors>
<owners />
Expand All @@ -23,17 +23,17 @@
<dependencies>

<group targetFramework="netstandard1.6">
<dependency id="linq2db.Core" version="1.8.1"/>
<dependency id="linq2db.Core" version="1.8.2"/>
</group>

<group targetFramework="net40">
<dependency id="linq2db" version="1.8.1"/>
<dependency id="linq2db" version="1.8.2"/>
</group>

</dependencies>
</metadata>
<files>
<file src="..\packages\linq2db.1.8.1\lib\net40\linq2db.dll" target="tools" />
<file src="..\packages\linq2db.1.8.2\lib\net40\linq2db.dll" target="tools" />
<file src="init.ps1" target="tools" />

<file src="..\ReadMe.md" target="content\LinqToDB.Templates" />
Expand Down
4 changes: 2 additions & 2 deletions Tests/LinqToDB/T4Model.LinqToDB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<HintPath>..\..\packages\FirebirdSql.Data.FirebirdClient.5.6.0\lib\net45\FirebirdSql.Data.FirebirdClient.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="linq2db, Version=1.8.1.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
<HintPath>..\..\packages\linq2db.1.8.1\lib\net45\linq2db.dll</HintPath>
<Reference Include="linq2db, Version=1.8.2.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
<HintPath>..\..\packages\linq2db.1.8.2\lib\net45\linq2db.dll</HintPath>
</Reference>
<Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion Tests/LinqToDB/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FirebirdSql.Data.FirebirdClient" version="5.6.0" targetFramework="net45" />
<package id="linq2db" version="1.8.1" targetFramework="net45" />
<package id="linq2db" version="1.8.2" targetFramework="net45" />
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net40" />
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net45" />
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
configuration: Release

environment:
packageVersion: 1.8.1
linq2dbVersion: 1.8.1
packageVersion: 1.8.2
linq2dbVersion: 1.8.2

version: $(packageVersion).{build}

Expand Down Expand Up @@ -53,4 +53,4 @@ deploy:
branch: release

skip_commits:
message: /skip_ci./ # Regex for matching commit message
message: /ci skip./ # Regex for matching commit message
Binary file removed packages/linq2db.1.8.1/linq2db.1.8.1.nupkg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
LINQ to DB 1.8.2 Release Notes
---------------------------------
Configuration.Linq.UseBinaryAggregateExpression is set to false by default as supposed to be unstable

LINQ to DB 1.8.1 Release Notes
---------------------------------
Fixed issue with !IEnumerable.Contains (#228)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added packages/linq2db.1.8.2/linq2db.1.8.2.nupkg
Binary file not shown.

0 comments on commit 4b98337

Please sign in to comment.