upgrade deps

mythz · mythz · commit eaede0eec07f · 2021-08-15T20:42:46.000+08:00
diff --git a/src/ServiceStack.OrmLite.MySql/MySqlDialectProviderBase.cs b/src/ServiceStack.OrmLite.MySql/MySqlDialectProviderBase.cs
@@ -42,7 +42,7 @@ public MySqlDialectProviderBase()
 
             this.Variables = new Dictionary<string, string>
             {
-                { OrmLiteVariables.SystemUtc, "UTC_TIMESTAMP" },
+                { OrmLiteVariables.SystemUtc, "CURRENT_TIMESTAMP" },
                 { OrmLiteVariables.MaxText, "LONGTEXT" },
                 { OrmLiteVariables.MaxTextUnicode, "LONGTEXT" },
                 { OrmLiteVariables.True, SqlBool(true) },                
diff --git a/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.Core.csproj b/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.Core.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
     <PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
-    <PackageReference Include="Mysql.Data" Version="8.0.21" />
+    <PackageReference Include="Mysql.Data" Version="8.0.26" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj b/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
-    <PackageReference Include="Mysql.Data" Version="8.0.21" />
+    <PackageReference Include="Mysql.Data" Version="8.0.26" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
   </ItemGroup>
 
diff --git a/src/ServiceStack.OrmLite.MySql/app.config b/src/ServiceStack.OrmLite.MySql/app.config
@@ -4,6 +4,6 @@
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
     <DbProviderFactories>
       <remove invariant="MySql.Data.MySqlClient" />
-      <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" />
+      <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" />
     </DbProviderFactories>
   </system.data></configuration>
diff --git a/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.Core.csproj b/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.Core.csproj
@@ -27,7 +27,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
     <PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
-    <PackageReference Include="MySqlConnector" Version="1.3.3" />
+    <PackageReference Include="MySqlConnector" Version="1.3.11" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DataAnnotations\" />
diff --git a/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj b/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
-    <PackageReference Include="MySqlConnector" Version="1.3.3" />
+    <PackageReference Include="MySqlConnector" Version="1.3.11" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
diff --git a/src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj b/src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj
@@ -15,11 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="Oracle.ManagedDataAccess" Version="19.9.0" />
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="19.12.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.91" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.Core.csproj b/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.Core.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
     <PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj b/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj b/src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.5" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.OrmLite.Sqlite.Windows/ServiceStack.OrmLite.Sqlite.Windows.csproj b/src/ServiceStack.OrmLite.Sqlite.Windows/ServiceStack.OrmLite.Sqlite.Windows.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
   </ItemGroup>
diff --git a/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.Core.csproj b/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.Core.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.Core.csproj" />
     <PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
-	<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+	<PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj b/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj b/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj
@@ -20,9 +20,9 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
diff --git a/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj b/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj
@@ -26,9 +26,9 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
diff --git a/tests/ServiceStack.OrmLite.MySql.Tests/app.config b/tests/ServiceStack.OrmLite.MySql.Tests/app.config
@@ -9,7 +9,7 @@
   <system.data>
     <DbProviderFactories>
       <remove invariant="MySql.Data.MySqlClient" />
-      <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" />
+      <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" />
     </DbProviderFactories>
   </system.data>
 </configuration>
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj b/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj b/tests/ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj
@@ -17,7 +17,7 @@
         <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
         <PackageReference Include="ServiceStack" Version="$(Version)" />
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
 
         <ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
         <ProjectReference Include="..\..\src\ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.csproj" />
diff --git a/tests/ServiceStack.OrmLite.Tests/Async/OrmLiteUpdateOnlyTestsAsync.cs b/tests/ServiceStack.OrmLite.Tests/Async/OrmLiteUpdateOnlyTestsAsync.cs
@@ -13,41 +13,39 @@ public OrmLiteUpdateOnlyTestsAsync(DialectContext context) : base(context) {}
         [Test]
         public async Task Supports_different_ways_to_UpdateOnly()
         {
-            using (var db = OpenDbConnection())
-            {
-                db.DropAndCreateTable<Person>();
-                await db.InsertAsync(new Person
-                    {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
-
-                await db.UpdateOnlyAsync(() => new Person {FirstName = "UpdatedFirst", Age = 27});
-                var row = (await db.SelectAsync<Person>()).First();
-                Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
-
-                await db.DeleteAllAsync<Person>();
-                await db.InsertAsync(new Person
-                    {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
-
-                await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, p => p.FirstName);
-                row = (await db.SelectAsync<Person>()).First();
-                Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 100)));
-
-                await db.DeleteAllAsync<Person>();
-                await db.InsertAsync(new Person
-                    {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
-
-                await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27},
-                    p => new {p.FirstName, p.Age});
-                row = (await db.SelectAsync<Person>()).First();
-                Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
-
-                await db.DeleteAllAsync<Person>();
-                await db.InsertAsync(new Person
-                    {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
-
-                await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, new[] {"FirstName", "Age"});
-                row = (await db.SelectAsync<Person>()).First();
-                Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
-            }
+            using var db = await OpenDbConnectionAsync();
+            db.DropAndCreateTable<Person>();
+            await db.InsertAsync(new Person
+                {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
+
+            await db.UpdateOnlyAsync(() => new Person {FirstName = "UpdatedFirst", Age = 27});
+            var row = (await db.SelectAsync<Person>()).First();
+            Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
+
+            await db.DeleteAllAsync<Person>();
+            await db.InsertAsync(new Person
+                {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
+
+            await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, p => p.FirstName);
+            row = (await db.SelectAsync<Person>()).First();
+            Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 100)));
+
+            await db.DeleteAllAsync<Person>();
+            await db.InsertAsync(new Person
+                {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
+
+            await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27},
+                p => new {p.FirstName, p.Age});
+            row = (await db.SelectAsync<Person>()).First();
+            Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
+
+            await db.DeleteAllAsync<Person>();
+            await db.InsertAsync(new Person
+                {Id = 1, FirstName = "OriginalFirst", LastName = "OriginalLast", Age = 100});
+
+            await db.UpdateOnlyAsync(new Person {FirstName = "UpdatedFirst", Age = 27}, new[] {"FirstName", "Age"});
+            row = (await db.SelectAsync<Person>()).First();
+            Assert.That(row, Is.EqualTo(new Person(1, "UpdatedFirst", "OriginalLast", 27)));
         }
     }
 }
diff --git a/tests/ServiceStack.OrmLite.Tests/ConverterTests.cs b/tests/ServiceStack.OrmLite.Tests/ConverterTests.cs
@@ -235,7 +235,7 @@ public static AllTypes Create(int i)
                 DateTimeOffset = new DateTimeOffset(new DateTime(2000 + i, (i + 1) % 12, (i + 1) % 28)),
                 Guid = Guid.NewGuid(),
                 Bool = i % 2 == 0,
-                Char = (char)(i + 1), //TODO: NPGSQL fails on \0
+                Char = (char)(i + 65), //TODO: NPGSQL fails on \0
                 NullableDateTime = new DateTime(2000 + i, (i + 1) % 12, (i + 1) % 28),
                 NullableTimeSpan = new TimeSpan(i, i, i, i, i),
                 ByteArray = new[] { (byte)i, (byte)(i + 1) },
diff --git a/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj b/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="ServiceStack" Version="$(Version)" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
 
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite.MySql\ServiceStack.OrmLite.MySql.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public MySqlDialectProviderBase()`
`42`	`42`
`43`	`43`	`this.Variables = new Dictionary<string, string>`
`44`	`44`	`{`
`45`		`- { OrmLiteVariables.SystemUtc, "UTC_TIMESTAMP" },`
	`45`	`+ { OrmLiteVariables.SystemUtc, "CURRENT_TIMESTAMP" },`
`46`	`46`	`{ OrmLiteVariables.MaxText, "LONGTEXT" },`
`47`	`47`	`{ OrmLiteVariables.MaxTextUnicode, "LONGTEXT" },`
`48`	`48`	`{ OrmLiteVariables.True, SqlBool(true) },`