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

Commit 4a88258

Browse files
xplicitxplicit
committed
Merge branch master into netcore
2 parents 3f7083e + 2ceb9eb commit 4a88258

File tree

178 files changed

+80147
-65242
lines changed

Some content is hidden

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

178 files changed

+80147
-65242
lines changed

‎NuGet.Core/ServiceStack.OrmLite.Core/ServiceStack.OrmLite.Core.nuspec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>
10-
Common library for the Light, simple and fast convention-based code-first POCO, OrmLite.
11-
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs.
10+
Common library for the Light, simple and fast convention-based code-first POCO, OrmLite.
11+
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs.
1212
OrmLite is a suite extension methods on ADO.NET's underlying IDbConnection providing DRY, typed access for common data usage patterns that map to clean, simple POCOs. Great support for testing where OrmLite methods can be mocked.
13-
</description>
13+
</description>
1414
<projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
1515
<licenseUrl>https://servicestack.net/terms</licenseUrl>
1616
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -21,16 +21,16 @@
2121
<dependencies>
2222
<group targetFramework=".NETStandard1.3">
2323
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
24+
<dependency id="System.Reflection" version="[4.1.0, )" />
2425
<dependency id="System.Reflection.Emit" version="[4.0.1, )" />
25-
<dependency id="System.Reflection.Emit.ILGeneration" version="[4.0.1, )" />
26-
<dependency id="System.Reflection.Emit.LightWeight" version="[4.0.1, )" />
26+
<dependency id="System.Reflection.Emit.Lightweight" version="[4.0.1, )" />
27+
<dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
28+
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
2729
<dependency id="System.Collections.NonGeneric" version="[4.0.1, )" />
2830
<dependency id="System.Xml.XmlDocument" version="[4.0.1, )" />
2931
<dependency id="System.ComponentModel.Primitives" version="[4.1.0, )" />
3032
<dependency id="System.Data.SqlClient" version="[4.1.0, )" />
31-
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
3233
<dependency id="System.ComponentModel.Annotations" version="[4.1.0, )" />
33-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
3434
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
3535
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />
3636
<dependency id="ServiceStack.Common.Core" version="[1.0.0, )" />

‎NuGet.Core/ServiceStack.OrmLite.PostgreSQL.Core/ServiceStack.OrmLite.PostgreSQL.Core.nuspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>
10-
Light, simple and fast convention-based code-first POCO ORM for PostgreSQL.
11-
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in Postgres.
10+
Light, simple and fast convention-based code-first POCO ORM for PostgreSQL.
11+
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in Postgres.
1212
</description>
1313
<projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
1414
<licenseUrl>https://servicestack.net/terms</licenseUrl>
@@ -19,7 +19,6 @@
1919
<copyright>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
2121
<group targetFramework=".NETStandard1.3">
22-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2322
<dependency id="Npgsql" version="[3.1.7, )" />
2423
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
2524
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />

‎NuGet.Core/ServiceStack.OrmLite.SqlServer.Core/ServiceStack.OrmLite.SqlServer.Core.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>
10-
Light, simple and fast convention-based code-first POCO ORM for Sql Server.
11-
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in SQLServer.
12-
</description>
10+
Light, simple and fast convention-based code-first POCO ORM for Sql Server.
11+
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in SQLServer.
12+
</description>
1313
<projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
1414
<licenseUrl>https://servicestack.net/terms</licenseUrl>
1515
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -19,7 +19,7 @@
1919
<copyright>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
2121
<group targetFramework=".NETStandard1.3">
22-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
22+
<dependency id="System.Data.SqlClient" version="[4.1.0, )" />
2323
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
2424
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />
2525
<dependency id="ServiceStack.Common.Core" version="[1.0.0, )" />

‎NuGet.Core/ServiceStack.OrmLite.Sqlite.Core/ServiceStack.OrmLite.Sqlite.Core.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<copyright>Copyright 2016 Service Stack</copyright>
1919
<dependencies>
2020
<group targetFramework=".NETStandard1.3">
21-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2221
<dependency id="Microsoft.Data.SQLite" version="[1.0.0, )" />
2322
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
2423
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />

‎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

2 KB
Binary file not shown.

0 commit comments

Comments
 (0)