Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit cf82420

Browse files
committed
Upgrade to Npgsql 2.2.3
1 parent ae87c84 commit cf82420

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+27
-24
lines changed

NuGet/ServiceStack.OrmLite.PostgreSQL/servicestack.ormlite.postgresql.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<language>en-US</language>
1919
<copyright>ServiceStack 2013 and contributors</copyright>
2020
<dependencies>
21-
<dependency id="Npgsql" version="2.2.2" />
21+
<dependency id="Npgsql" version="2.2.3" />
2222
<dependency id="ServiceStack.OrmLite" version="4.0" />
2323
</dependencies>
2424
</metadata>

src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\packages\Npgsql.2.2.2\lib\net45\Mono.Security.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Npgsql, Version=2.2.2.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\packages\Npgsql.2.2.2\lib\net45\Npgsql.dll</HintPath>
57-
</Reference>
5850
<Reference Include="ServiceStack.Common">
5951
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
6052
</Reference>
@@ -114,7 +106,6 @@
114106
<None Include="app.config">
115107
<SubType>Designer</SubType>
116108
</None>
117-
<None Include="packages.config" />
118109
</ItemGroup>
119110
<ItemGroup>
120111
<ProjectReference Include="..\..\tests\ServiceStack.OrmLite.Tests\ServiceStack.OrmLite.Tests.csproj">
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="Npgsql" version="2.2.2" targetFramework="net45" />
3+
<package id="Npgsql" version="2.2.3" targetFramework="net45" />
44
</packages>

src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@
4343
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\packages\Npgsql.2.2.2\lib\net40\Mono.Security.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Npgsql, Version=2.2.2.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\packages\Npgsql.2.2.2\lib\net40\Npgsql.dll</HintPath>
53-
</Reference>
5446
<Reference Include="ServiceStack.Common">
5547
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
5648
</Reference>
@@ -85,9 +77,6 @@
8577
<Name>ServiceStack.OrmLite</Name>
8678
</ProjectReference>
8779
</ItemGroup>
88-
<ItemGroup>
89-
<None Include="packages.config" />
90-
</ItemGroup>
9180
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9281
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9382
<PropertyGroup>
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="Npgsql" version="2.2.2" targetFramework="net40" />
3+
<package id="Npgsql" version="2.2.3" targetFramework="net40" />
44
</packages>

src/packages/Npgsql.2.2.2/lib/net20/Npgsql.xml renamed to src/packages/Npgsql.2.2.3/lib/net20/Npgsql.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/Npgsql.2.2.2/lib/net40/Npgsql.xml renamed to src/packages/Npgsql.2.2.3/lib/net35/Npgsql.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/Npgsql.2.2.2/lib/net45/Npgsql.xml renamed to src/packages/Npgsql.2.2.3/lib/net40/Npgsql.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/Npgsql.2.2.2/lib/net35/Npgsql.xml renamed to src/packages/Npgsql.2.2.3/lib/net45/Npgsql.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,10 @@ public void Can_perform_a_crossjoin_without_a_join_expression()
498498
db.Insert(new CrossJoinTableB {Id = 5, Value = 3});
499499
db.Insert(new CrossJoinTableB {Id = 6, Value = 42});
500500

501-
var q = db.From<CrossJoinTableA>().CrossJoin<CrossJoinTableB>().OrderBy<CrossJoinTableA>(x => x.Id).ThenBy<CrossJoinTableB>(x => x.Id);
501+
var q = db.From<CrossJoinTableA>()
502+
.CrossJoin<CrossJoinTableB>()
503+
.OrderBy<CrossJoinTableA>(x => x.Id)
504+
.ThenBy<CrossJoinTableB>(x => x.Id);
502505
var result = db.Select<CrossJoinResult>(q);
503506

504507
db.GetLastSql().Print();

0 commit comments

Comments
 (0)