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

Commit 0ced465

Browse files
KevinHowardKevinHoward
committed
Merge remote-tracking branch 'refs/remotes/ServiceStack/master'
2 parents 697f6b1 + 9f277de commit 0ced465

File tree

51 files changed

+1144
-558
lines changed

Some content is hidden

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

51 files changed

+1144
-558
lines changed

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>ServiceStack.OrmLite.MySql.Core</id>
5+
<title>ServiceStack.OrmLite.MySql.Core</title>
6+
<version>1.0.0</version>
7+
<authors>Service Stack</authors>
8+
<owners>Service Stack</owners>
9+
<description>
10+
Light, simple and fast convention-based code-first POCO ORM for MySQL.
11+
Support for Creating and Dropping Table Schemas from POCOs, Complex Property types transparently stored in schemaless text blobs in MySQL.
12+
</description>
13+
<projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
14+
<licenseUrl>https://servicestack.net/terms</licenseUrl>
15+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
16+
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
17+
<tags>MySql OrmLite POCO Code-First Orm Schema-less Blobs</tags>
18+
<language>en-US</language>
19+
<copyright>Copyright 2016 Service Stack</copyright>
20+
<dependencies>
21+
<group targetFramework=".NETStandard1.6">
22+
<dependency id="MySql.Data" version="[7.0.6-ir31, )" />
23+
<dependency id="ServiceStack.Interfaces.Core" version="[1.0.0, )" />
24+
<dependency id="ServiceStack.Text.Core" version="[1.0.0, )" />
25+
<dependency id="ServiceStack.Common.Core" version="[1.0.0, )" />
26+
<dependency id="ServiceStack.OrmLite.Core" version="[1.0.0, )" />
27+
</group>
28+
</dependencies>
29+
</metadata>
30+
<files>
31+
<file src="lib/**/*.*" target="lib" />
32+
<file src="../../src/ServiceStack.OrmLite.MySql/**/*.cs" target="src" />
33+
</files>
34+
</package>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<copyright>Copyright 2016 Service Stack</copyright>
2020
<dependencies>
2121
<group targetFramework=".NETStandard1.3">
22-
<dependency id="Npgsql" version="[3.1.7, )" />
22+
<dependency id="Npgsql" version="[3.1.9, )" />
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/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.8" />
21+
<dependency id="Npgsql" version="3.1.9" />
2222
<dependency id="ServiceStack.OrmLite" version="4.5" />
2323
</dependencies>
2424
</metadata>

‎build/build-core.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ find ./src -type f -name "AssemblyInfo.cs" -exec sed -i "s/AssemblyFileVersion(\
2525
echo replace project.json
2626
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite/project.json
2727
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.PostgreSQL/project.json
28+
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.MySql/project.json
2829
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.SqlServer/project.json
2930
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.OrmLite.Sqlite/project.json
3031
sed -i "s/\"version\": \"[^\"]\+\"/\"version\": \"${Version}\"/g" ./src/ServiceStack.Text/project.json

‎build/publish-core.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ declare -A projects=( \
55
["ServiceStack.OrmLite.Sqlite"]="1.3" \
66
["ServiceStack.OrmLite.SqlServer"]="1.3" \
77
["ServiceStack.OrmLite.PostgreSQL"]="1.3" \
8+
["ServiceStack.OrmLite.MySql"]="1.6" \
89
)
910

1011
#for each project copy files to Nuget.Core/$project/lib folder

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.Signed.project.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"frameworks": {
3+
"net45": {}
4+
},
5+
"runtimes": {
6+
"win": {}
7+
},
8+
"dependencies": {
9+
"Mysql.Data": "6.9.9"
10+
}
11+
}

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.project.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"frameworks": {
3+
"net45": {}
4+
},
5+
"runtimes": {
6+
"win": {}
7+
},
8+
"dependencies": {
9+
"Mysql.Data": "6.9.9"
10+
}
11+
}

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySqlV45.csproj

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎src/ServiceStack.OrmLite.MySql/project.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"configurations": {
3+
"Debug": {
4+
"buildOptions": {
5+
"define": ["DEBUG", "TRACE"]
6+
}
7+
},
8+
"Release": {
9+
"buildOptions": {
10+
"define": ["TRACE"],
11+
"optimize": true
12+
}
13+
}
14+
},
15+
"dependencies": {
16+
},
17+
"frameworks": {
18+
"netstandard1.6": {
19+
"dependencies" : {
20+
"Mysql.Data" : "7.0.6-ir31",
21+
"ServiceStack.Interfaces" : "1.0.*",
22+
"ServiceStack.Text" : "1.0.*",
23+
"ServiceStack.Common" : "1.0.*",
24+
"ServiceStack.OrmLite" : "1.0.*"
25+
}
26+
}
27+
},
28+
"version": "1.0.0"
29+
}

‎src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,9 @@
301301
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\BuiltInsFactory.cs">
302302
<Link>Shared\BuiltInsFactory.cs</Link>
303303
</Compile>
304+
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\DefaultValues.cs">
305+
<Link>Shared\DefaultValues.cs</Link>
306+
</Compile>
304307
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\IModelFactory.cs">
305308
<Link>Shared\IModelFactory.cs</Link>
306309
</Compile>
@@ -379,6 +382,9 @@
379382
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\TaskQueue.cs">
380383
<Link>Shared\TaskQueue.cs</Link>
381384
</Compile>
385+
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\UpdateCommandFilter.cs">
386+
<Link>Shared\UpdateCommandFilter.cs</Link>
387+
</Compile>
382388
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\ShippersExample.cs">
383389
<Link>ShippersExample.cs</Link>
384390
</Compile>
@@ -400,6 +406,9 @@
400406
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\TestHelpers.cs">
401407
<Link>TestHelpers.cs</Link>
402408
</Compile>
409+
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\ToInsertAndUpdateStatementTests.cs">
410+
<Link>ToInsertAndUpdateStatementTests.cs</Link>
411+
</Compile>
403412
<Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\TypeDescriptorMetadataTests.cs">
404413
<Link>TypeDescriptorMetadataTests.cs</Link>
405414
</Compile>
@@ -455,6 +464,10 @@
455464
<Project>{517B64BA-D7A6-4A15-8719-821B38147C61}</Project>
456465
<Name>ServiceStack.OrmLite.Oracle</Name>
457466
</ProjectReference>
467+
<ProjectReference Include="..\ServiceStack.OrmLite.SqlServer\ServiceStack.OrmLite.SqlServer.csproj">
468+
<Project>{1887dc99-9139-43e3-a7aa-6d74714b3a5d}</Project>
469+
<Name>ServiceStack.OrmLite.SqlServer</Name>
470+
</ProjectReference>
458471
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj">
459472
<Project>{96179AC6-F6F1-40C3-9FDD-4F6582F54C5C}</Project>
460473
<Name>ServiceStack.OrmLite</Name>

0 commit comments

Comments
 (0)