Skip to content

Commit 896df2c

Browse files
author
Roy Chase
authored
Merge pull request #6 from LinqToDB4iSeries/Linq2DB_1.10.0Testing
V1.10.0 referencing Linq2DB 1.10.0 package
2 parents 347ca30 + 679800a commit 896df2c

File tree

15 files changed

+25
-30
lines changed

15 files changed

+25
-30
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ packages/**
4040
/Tests/Linq/UserConnectionStrings.xml
4141
*.runsettings
4242
*.playlist
43+
/.vs/linq2db4iSeries.4.5/v15/Server/sqlite3

‎ISeriesProvider/LinqToDB.DataProvider.DB2iSeries.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="IBM.Data.DB2.iSeries, Version=12.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26, processorArchitecture=MSIL" />
43-
<Reference Include="linq2db, Version=1.9.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
44-
<HintPath>..\packages\linq2db.1.9.0\lib\net45\linq2db.dll</HintPath>
45-
<Private>True</Private>
43+
<Reference Include="linq2db, Version=1.10.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
44+
<HintPath>..\packages\linq2db.1.10.0\lib\net45\linq2db.dll</HintPath>
4645
</Reference>
4746
<Reference Include="System" />
4847
<Reference Include="System.Configuration" />

‎ISeriesProvider/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="linq2db" version="1.9.0" targetFramework="net45" />
3+
<package id="linq2db" version="1.10.0" targetFramework="net45" />
44
</packages>

‎NuGet/linq2db4iSeries.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>linq2db4iSeries</id>
5-
<version>1.9.0.0</version>
5+
<version>1.10.0.0</version>
66
<title>LINQ to DB provider for iSeries DB2</title>
77
<authors>Retail Assist Ltd</authors>
88
<owners />
@@ -17,8 +17,8 @@
1717
</tags>
1818
<dependencies>
1919
<group>
20-
<!-- 1.9.0 <= x < 1.9.1 -->
21-
<dependency id="linq2db" version="[1.9.0,1.9.1)" />
20+
<!-- 1.9.0 <= x < 1.10.1 -->
21+
<dependency id="linq2db" version="[1.9.0,1.10.1)" />
2222
</group>
2323
</dependencies>
2424
</metadata>

‎Tests/FSharp/Tests.FSharp.fsproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
</ItemGroup>
5959
<ItemGroup>
6060
<Reference Include="linq2db">
61-
<HintPath>..\..\packages\linq2db.1.9.0\lib\net45\linq2db.dll</HintPath>
62-
<Private>True</Private>
61+
<HintPath>..\..\packages\linq2db.1.10.0\lib\net45\linq2db.dll</HintPath>
6362
</Reference>
6463
<Reference Include="mscorlib" />
6564
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎Tests/FSharp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="linq2db" version="1.9.0" targetFramework="net45" />
3+
<package id="linq2db" version="1.10.0" targetFramework="net45" />
44
<package id="NUnit" version="3.2.1" targetFramework="net45" />
55
</packages>

‎Tests/Linq/Linq/ParserTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ where t > 2
776776
select t;
777777

778778
var ctx = q.GetMyContext();
779-
ctx.BuildExpression(null, 0);
779+
ctx.BuildExpression(null, 0, false);
780780

781781
Assert.AreEqual(1, ctx.SelectQuery.Select.Columns.Count);
782782
}
@@ -796,7 +796,7 @@ where t.ID > 2
796796
select t;
797797

798798
var ctx = q.GetMyContext();
799-
ctx.BuildExpression(null, 0);
799+
ctx.BuildExpression(null, 0, false);
800800

801801
Assert.AreEqual(2, ctx.SelectQuery.Select.Columns.Count);
802802
}
@@ -818,7 +818,7 @@ join j in db.Child on p.ParentID equals j.ParentID
818818
select p;
819819

820820
var ctx = q.GetMyContext();
821-
ctx.BuildExpression(null, 0);
821+
ctx.BuildExpression(null, 0, false);
822822

823823
Assert.AreEqual(2, ctx.SelectQuery.Select.Columns.Count);
824824
}
@@ -841,7 +841,7 @@ on p.ID.ID equals j.ID.ID
841841
select p;
842842

843843
var ctx = q.GetMyContext();
844-
ctx.BuildExpression(null, 0);
844+
ctx.BuildExpression(null, 0, false);
845845

846846
Assert.AreEqual(1, ctx.SelectQuery.Select.Columns.Count);
847847
}

‎Tests/Linq/Tests.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,8 @@
131131
<HintPath>..\..\..\..\..\packages\IBM.Data.DB2.iSeries.7.1.0\lib\IBM.Data.DB2.iSeries.dll</HintPath>
132132
<Private>True</Private>
133133
</Reference>
134-
<Reference Include="linq2db, Version=1.9.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
135-
<HintPath>..\..\packages\linq2db.1.9.0\lib\net45\linq2db.dll</HintPath>
136-
<Private>True</Private>
134+
<Reference Include="linq2db, Version=1.10.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
135+
<HintPath>..\..\packages\linq2db.1.10.0\lib\net45\linq2db.dll</HintPath>
137136
</Reference>
138137
<Reference Include="Microsoft.CSharp" />
139138
<Reference Include="MiniProfiler, Version=3.2.0.157, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">

‎Tests/Linq/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="IBM.Data.DB2.iSeries" version="7.1.0" targetFramework="net45" />
4-
<package id="linq2db" version="1.9.0" targetFramework="net45" />
4+
<package id="linq2db" version="1.10.0" targetFramework="net45" />
55
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net45" />
66
<package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net45" />
77
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net45" />

‎Tests/Model/Tests.Model.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,8 @@
118118
<AssemblyOriginatorKeyFile>linq2db.Tests.snk</AssemblyOriginatorKeyFile>
119119
</PropertyGroup>
120120
<ItemGroup>
121-
<Reference Include="linq2db, Version=1.9.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
122-
<HintPath>..\..\packages\linq2db.1.9.0\lib\net45\linq2db.dll</HintPath>
123-
<Private>True</Private>
121+
<Reference Include="linq2db, Version=1.10.0.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
122+
<HintPath>..\..\packages\linq2db.1.10.0\lib\net45\linq2db.dll</HintPath>
124123
</Reference>
125124
<Reference Include="System">
126125
</Reference>

0 commit comments

Comments
 (0)