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

Commit b7f87f7

Browse files
authored
Merge pull request #5 from ServiceStack/master
Merge from upsteam
2 parents 3a4211f + 2ceb9eb commit b7f87f7

File tree

145 files changed

+79142
-64919
lines changed

Some content is hidden

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

145 files changed

+79142
-64919
lines changed

NuGet.Signed/ServiceStack.OrmLite.Sqlite.Windows.Signed/servicestack.ormlite.sqlite.windows.signed.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<language>en-US</language>
1818
<copyright>ServiceStack 2013 and contributors</copyright>
1919
<dependencies>
20-
<dependency id="System.Data.SQLite.Core" version="1.0.102.0" />
20+
<dependency id="System.Data.SQLite.Core" version="1.0.103" />
2121
<dependency id="ServiceStack.OrmLite.Signed" version="4.5" />
2222
</dependencies>
2323
</metadata>

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>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
21-
<dependency id="Npgsql" version="3.1.7" />
21+
<dependency id="Npgsql" version="3.1.8" />
2222
<dependency id="ServiceStack.OrmLite" version="4.5" />
2323
</dependencies>
2424
</metadata>

NuGet/ServiceStack.OrmLite.Sqlite.Windows/servicestack.ormlite.sqlite.windows.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<language>en-US</language>
1818
<copyright>Copyright 2016 Service Stack</copyright>
1919
<dependencies>
20-
<dependency id="System.Data.SQLite.Core" version="1.0.102.0" />
20+
<dependency id="System.Data.SQLite.Core" version="1.0.103" />
2121
<dependency id="ServiceStack.OrmLite" version="4.5" />
2222
</dependencies>
2323
</metadata>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ This query rougly maps to the following SQL:
611611
SELECT Customer.*
612612
FROM Customer
613613
INNER JOIN
614-
CustomerAddress ON (Customer.Id == CustomerAddress.Id)
614+
CustomerAddress ON (Customer.Id == CustomerAddress.CustomerId)
615615
```
616616

617617
Just like before `q` is an instance of `SqlExpression<Customer>` which is bounded to the base `Customer` type (and what any subsequent implicit API's apply to).

build/copy.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,3 @@ COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\Npgsql.* ..\..\ServiceSt
3636

3737
COPY ..\src\ServiceStack.OrmLite\bin\Signed\ServiceStack.OrmLite.* ..\..\ServiceStack\lib\signed
3838
COPY ..\src\ServiceStack.OrmLite.SqlServer\bin\Signed\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib\signed
39-
40-
COPY ..\src\ServiceStack.OrmLiteV45\bin\%BUILD%\ServiceStack.OrmLite.* ..\..\ServiceStack\lib\net45
41-
COPY ..\src\ServiceStack.OrmLite.SqlServerV45\bin\%BUILD%\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib\net45

lib/ServiceStack.Client.dll

512 Bytes
Binary file not shown.

lib/ServiceStack.Common.dll

0 Bytes
Binary file not shown.

lib/ServiceStack.Common.pdb

2 KB
Binary file not shown.

lib/ServiceStack.Interfaces.dll

0 Bytes
Binary file not shown.

lib/ServiceStack.Text.XML

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

0 commit comments

Comments
 (0)