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

Commit eaede0e

Browse files
mythzmythz
committed
upgrade deps
1 parent 0751d80 commit eaede0e

21 files changed

+58
-60
lines changed

‎src/ServiceStack.OrmLite.MySql/MySqlDialectProviderBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public MySqlDialectProviderBase()
4242

4343
this.Variables = new Dictionary<string, string>
4444
{
45-
{ OrmLiteVariables.SystemUtc, "UTC_TIMESTAMP" },
45+
{ OrmLiteVariables.SystemUtc, "CURRENT_TIMESTAMP" },
4646
{ OrmLiteVariables.MaxText, "LONGTEXT" },
4747
{ OrmLiteVariables.MaxTextUnicode, "LONGTEXT" },
4848
{ OrmLiteVariables.True, SqlBool(true) },

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
1818
<PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
19-
<PackageReference Include="Mysql.Data" Version="8.0.21" />
19+
<PackageReference Include="Mysql.Data" Version="8.0.26" />
2020
</ItemGroup>
2121

2222
</Project>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
18-
<PackageReference Include="Mysql.Data" Version="8.0.21" />
18+
<PackageReference Include="Mysql.Data" Version="8.0.26" />
1919
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
2020
</ItemGroup>
2121

‎src/ServiceStack.OrmLite.MySql/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
55
<DbProviderFactories>
66
<remove invariant="MySql.Data.MySqlClient" />
7-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.26.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
88
</DbProviderFactories>
99
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<ItemGroup>
2828
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
2929
<PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
30-
<PackageReference Include="MySqlConnector" Version="1.3.3" />
30+
<PackageReference Include="MySqlConnector" Version="1.3.11" />
3131
</ItemGroup>
3232
<ItemGroup>
3333
<Folder Include="DataAnnotations\" />

‎src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
28-
<PackageReference Include="MySqlConnector" Version="1.3.3" />
28+
<PackageReference Include="MySqlConnector" Version="1.3.11" />
2929
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
3030
</ItemGroup>
3131
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
18-
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.9.0" />
18+
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.12.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
22-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.91" />
22+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
1818
<PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
19-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
19+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
2020
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
21-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
21+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
1919
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
20-
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.5" />
20+
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.9" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/ServiceStack.OrmLite.Sqlite.Windows/ServiceStack.OrmLite.Sqlite.Windows.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
17+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
1818
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
1919
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
2020
</ItemGroup>

‎src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
1818
<PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
19-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
19+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
1818
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
19-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
19+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2222
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
23-
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
24-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
25-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
23+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
24+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
25+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
2626
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
2727
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
2828
<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />

‎src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2828
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
29-
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
30-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
31-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
29+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
30+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
31+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
3232
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
3333
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
3434
<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />

‎tests/ServiceStack.OrmLite.MySql.Tests/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<system.data>
1010
<DbProviderFactories>
1111
<remove invariant="MySql.Data.MySqlClient" />
12-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
12+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.26.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
1313
</DbProviderFactories>
1414
</system.data>
1515
</configuration>

‎tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1919
<PackageReference Include="NUnit" Version="3.10.1" />
20-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
20+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎tests/ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1919
<PackageReference Include="ServiceStack" Version="$(Version)" />
20-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
20+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
2121

2222
<ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
2323
<ProjectReference Include="..\..\src\ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.csproj" />

‎tests/ServiceStack.OrmLite.Tests/Async/OrmLiteUpdateOnlyTestsAsync.cs

+33-35
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,39 @@ public OrmLiteUpdateOnlyTestsAsync(DialectContext context) : base(context) {}
1313
[Test]
1414
public async Task Supports_different_ways_to_UpdateOnly()
1515
{
16-
using (var db = OpenDbConnection())
17-
{
18-
db.DropAndCreateTable<Person>();
19-
await db.InsertAsync(new Person
20-
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
21-
22-
await db.UpdateOnlyAsync(() => new Person {FirstName = "UpdatedFirst", Age = 27});
23-
var row = (await db.SelectAsync<Person>()).First();
24-
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
25-
26-
await db.DeleteAllAsync<Person>();
27-
await db.InsertAsync(new Person
28-
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
29-
30-
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, p => p.FirstName);
31-
row = (await db.SelectAsync<Person>()).First();
32-
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 100)));
33-
34-
await db.DeleteAllAsync<Person>();
35-
await db.InsertAsync(new Person
36-
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
37-
38-
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27},
39-
p => new {p.FirstName, p.Age});
40-
row = (await db.SelectAsync<Person>()).First();
41-
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
42-
43-
await db.DeleteAllAsync<Person>();
44-
await db.InsertAsync(new Person
45-
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
46-
47-
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, new[] {"FirstName", "Age"});
48-
row = (await db.SelectAsync<Person>()).First();
49-
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
50-
}
16+
using var db = await OpenDbConnectionAsync();
17+
db.DropAndCreateTable<Person>();
18+
await db.InsertAsync(new Person
19+
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
20+
21+
await db.UpdateOnlyAsync(() => new Person {FirstName = "UpdatedFirst", Age = 27});
22+
var row = (await db.SelectAsync<Person>()).First();
23+
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
24+
25+
await db.DeleteAllAsync<Person>();
26+
await db.InsertAsync(new Person
27+
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
28+
29+
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, p => p.FirstName);
30+
row = (await db.SelectAsync<Person>()).First();
31+
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 100)));
32+
33+
await db.DeleteAllAsync<Person>();
34+
await db.InsertAsync(new Person
35+
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
36+
37+
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27},
38+
p => new {p.FirstName, p.Age});
39+
row = (await db.SelectAsync<Person>()).First();
40+
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
41+
42+
await db.DeleteAllAsync<Person>();
43+
await db.InsertAsync(new Person
44+
{Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
45+
46+
await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, new[] {"FirstName", "Age"});
47+
row = (await db.SelectAsync<Person>()).First();
48+
Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
5149
}
5250
}
5351
}

‎tests/ServiceStack.OrmLite.Tests/ConverterTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public static AllTypes Create(int i)
235235
DateTimeOffset = new DateTimeOffset(new DateTime(2000 + i, (i + 1) % 12, (i + 1) % 28)),
236236
Guid = Guid.NewGuid(),
237237
Bool = i % 2 == 0,
238-
Char = (char)(i + 1), //TODO: NPGSQL fails on \0
238+
Char = (char)(i + 65), //TODO: NPGSQL fails on \0
239239
NullableDateTime = new DateTime(2000 + i, (i + 1) % 12, (i + 1) % 28),
240240
NullableTimeSpan = new TimeSpan(i, i, i, i, i),
241241
ByteArray = new[] { (byte)i, (byte)(i + 1) },

‎tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1515
<PackageReference Include="ServiceStack" Version="$(Version)" />
16-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
16+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
1717

1818
<ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
1919
<ProjectReference Include="..\..\src\ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.csproj" />

0 commit comments

Comments
 (0)