Fix .NET Core Tests

Author: mythz

lib/netstandard2.0/ServiceStack.Client.deps.json

@@ -863,6 +863,9 @@
           "System.Security.Cryptography.Primitives": "4.3.0",
           "System.Text.Encoding": "4.3.0",
           "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.6/System.Security.Cryptography.OpenSsl.dll": {}
         }
       },
       "System.Security.Cryptography.Primitives/4.3.0": {
@@ -1791,7 +1794,7 @@
     "System.Xml.XmlSerializer/4.3.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==",
+      "sha512": "sha512-pXIz8nVP9y1uc3WCyTdl5LDesu2M6BDlMF7+JZS72oqKSZHXd2Q9PwepKFsFryWDMQEAjkjmyDEFu4FISdYfCw==",
       "path": "system.xml.xmlserializer/4.3.0",
       "hashPath": "system.xml.xmlserializer.4.3.0.nupkg.sha512"
     },

src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs

@@ -90,9 +90,15 @@ public override object ToDbValue(Type fieldType, object value)
             if (DateStyle == DateTimeKind.Utc)
             {
                 if (dateTime.Kind == DateTimeKind.Local)
+                {
                     dateTime = dateTime.ToUniversalTime();
+                }
                 else if (dateTime.Kind == DateTimeKind.Unspecified)
+                {
+#if !NETSTANDARD2_0
                     dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
+#endif
+                }
             }
             else if (DateStyle == DateTimeKind.Local && dateTime.Kind != DateTimeKind.Local)
             {
@@ -113,7 +119,14 @@ public override object FromDbValue(Type fieldType, object value)
             var dateTime = (DateTime)value;
 
             if (DateStyle == DateTimeKind.Utc)
+            {
+#if NETSTANDARD2_0
+                //.NET Core returns correct UTC time but as Unspecified so just change to Utc
+                dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
+#else
                 dateTime = dateTime.ToUniversalTime();
+#endif
+            }
 
             if (DateStyle == DateTimeKind.Local && dateTime.Kind != DateTimeKind.Local)
             {

tests/ServiceStack.OrmLite.Tests/DateTimeTests.cs

@@ -106,33 +106,33 @@ public void Does_return_UTC_Dates_with_UTC_DateStyle()
 
                 dateTime = new DateTime(2012, 1, 1, 1, 1, 1, DateTimeKind.Local);
                 x = InsertAndSelectDateTime(db, dateTime);
-                Assert.AreEqual(DateTimeKind.Utc, x.Test.Kind);
-                Assert.AreEqual(DateTimeKind.Utc, x.TestNullable.Value.Kind);
-                Assert.AreEqual(x.Test, x.TestNullable.Value);
-                Assert.AreEqual(x.Test.ToUniversalTime(), dateTime.ToUniversalTime());
-                Assert.AreEqual(x.Test.ToLocalTime(), dateTime.ToLocalTime());
+                Assert.That(x.Test.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.TestNullable.Value.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.Test, Is.EqualTo(x.TestNullable.Value));
+                Assert.That(x.Test.ToUniversalTime(), Is.EqualTo(dateTime.ToUniversalTime()));
+                Assert.That(x.Test.ToLocalTime(), Is.EqualTo(dateTime.ToLocalTime()));
                 x = db.Select<DateTimeObject>(d => d.Test == dateTime).FirstOrDefault();
-                Assert.IsNotNull(x);
+                Assert.That(x, Is.Not.Null);
 
                 dateTime = new DateTime(2012, 1, 1, 1, 1, 1, DateTimeKind.Utc);
                 x = InsertAndSelectDateTime(db, dateTime);
-                Assert.AreEqual(DateTimeKind.Utc, x.Test.Kind);
-                Assert.AreEqual(DateTimeKind.Utc, x.TestNullable.Value.Kind);
-                Assert.AreEqual(x.Test, x.TestNullable.Value);
-                Assert.AreEqual(x.Test.ToUniversalTime(), dateTime.ToUniversalTime());
-                Assert.AreEqual(x.Test.ToLocalTime(), dateTime.ToLocalTime());
+                Assert.That(x.Test.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.TestNullable.Value.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.Test, Is.EqualTo(x.TestNullable.Value));
+                Assert.That(x.Test.ToUniversalTime(), Is.EqualTo(dateTime.ToUniversalTime()));
+                Assert.That(x.Test.ToLocalTime(), Is.EqualTo(dateTime.ToLocalTime()));
                 x = db.Select<DateTimeObject>(d => d.Test == dateTime).FirstOrDefault();
-                Assert.IsNotNull(x);
+                Assert.That(x, Is.Not.Null);
 
                 dateTime = new DateTime(2012, 1, 1, 1, 1, 1, DateTimeKind.Unspecified);
                 x = InsertAndSelectDateTime(db, dateTime);
-                Assert.AreEqual(DateTimeKind.Utc, x.Test.Kind);
-                Assert.AreEqual(DateTimeKind.Utc, x.TestNullable.Value.Kind);
-                Assert.AreEqual(x.Test, x.TestNullable.Value);
-                Assert.AreEqual(x.Test.ToUniversalTime(), dateTime);
-                Assert.AreEqual(x.Test.ToLocalTime(), dateTime.ToLocalTime());
+                Assert.That(x.Test.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.TestNullable.Value.Kind, Is.EqualTo(DateTimeKind.Utc));
+                Assert.That(x.Test, Is.EqualTo(x.TestNullable.Value));
+                Assert.That(x.Test.ToUniversalTime(), Is.EqualTo(dateTime));
+                Assert.That(x.Test.ToLocalTime(), Is.EqualTo(dateTime.ToLocalTime()));
                 x = db.Select<DateTimeObject>(d => d.Test == dateTime).FirstOrDefault();
-                Assert.IsNotNull(x);
+                Assert.That(x, Is.Not.Null);
 
                 dialectProvider.GetDateTimeConverter().DateStyle = hold;
             }

tests/ServiceStack.OrmLite.Tests/Issues/LoadReferencesNullReferenceIssue.cs

@@ -32,6 +32,7 @@ public void Does_not_load_references_when_RefId_is_null()
             using (var db = OpenDbConnection())
             {
                 //db.DropAndCreateTable<UserAuth>(); //This test shouldn't query this table
+                db.DropAndCreateTable<UserAuth>();
                 db.DropAndCreateTable<DepartmentEntity>();
 
                 db.Insert(new DepartmentEntity { Name = "Dept A", Email = "[email protected]" });