Merge branch 'master' of github.com:ServiceStack/ServiceStack.Text

Author: mythz

.vscode/launch.json

@@ -6,8 +6,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/tests/ServiceStack.Text.Tests/bin/Debug/netcoreapp1.0/ServiceStack.Text.Tests.dll",
-            //"args": ["--test=ServiceStack.Text.Tests.AutoMappingTests.Can_create_Dictionary_default_value"],
+            "program": "${workspaceRoot}/tests/ServiceStack.Text.Tests/bin/Debug/netcoreapp1.1/ServiceStack.Text.Tests.dll",
+            //"args": ["--test=ServiceStack.Text.Tests.ReflectionExtensionTests", "--labels=All"],
+            "args": ["--labels=All"],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
             "externalConsole": false

src/.nuget/NuGet.exe

@@ -795,7 +795,19 @@ public static MethodInfo GetStaticMethod(this Type type, string methodName, Type
         public static MethodInfo GetMethodInfo(this Type type, string methodName, Type[] types = null)
         {
 #if (NETFX_CORE || PCL || NETSTANDARD1_1)
-            return type.GetRuntimeMethods().FirstOrDefault(p => p.Name.Equals(methodName));
+            if (types == null) 
+                return type.GetRuntimeMethods().FirstOrDefault(p => p.Name.Equals(methodName));
+
+            foreach(var mi in type.GetRuntimeMethods().Where(p => p.Name.Equals(methodName)))
+            {
+                var methodParams = mi.GetParameters().Select(p => p.ParameterType);
+                if (methodParams.SequenceEqual(types))
+                {
+                    return mi;
+                }
+            }
+
+            return null;
 #else
             return types == null
                 ? type.GetMethod(methodName)

src/ServiceStack.Text/PlatformExtensions.cs

@@ -16,13 +16,13 @@ static CsvSerializerTests()
             NorthwindData.LoadData(false);
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsConfig.SkipDateTimeConversion = true;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();
@@ -150,7 +150,7 @@ public void Does_serialize_partial_DTO_in_order_of_Headers()
             var csv = CsvSerializer.SerializeToString(subMovies);
 
             csv.Print();
-            Assert.That(csv, Is.StringStarting("ReleaseDate,Title,Rating,ImdbId\r\n"));
+            Assert.That(csv, Does.StartWith("ReleaseDate,Title,Rating,ImdbId\r\n"));
 
             var movies = csv.FromCsv<List<Movie>>();
 

tests/ServiceStack.Text.Tests/CsvSerializerTests.cs

@@ -8,7 +8,7 @@ namespace ServiceStack.Text.Tests.CsvTests
 	[TestFixture]
 	public class CustomHeaderTests
 	{
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 			CsvConfig<TableItem>.Reset();

tests/ServiceStack.Text.Tests/CsvTests/CustomHeaderTests.cs

@@ -13,7 +13,7 @@ public class CultureInfoTests
 
 		private CultureInfo previousCulture = CultureInfo.InvariantCulture;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 #if NETCORE
@@ -27,7 +27,7 @@ public void TestFixtureSetUp()
 #endif
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 #if NETCORE
@@ -104,9 +104,9 @@ public void Does_use_invariant_culture_for_numbers()
             dto.ToJsv().Print();
             dto.ToCsv().Print();
 
-            Assert.That(dto.ToJson(), Is.Not.StringContaining("1000,9"));
-            Assert.That(dto.ToJsv(), Is.Not.StringContaining("1000,9"));
-            Assert.That(dto.ToCsv(), Is.Not.StringContaining("1000,9"));
+            Assert.That(dto.ToJson(), Does.Not.Contain("1000,9"));
+            Assert.That(dto.ToJsv(), Does.Not.Contain("1000,9"));
+            Assert.That(dto.ToCsv(), Does.Not.Contain("1000,9"));
 	    }
 
 	}

tests/ServiceStack.Text.Tests/CultureInfoTests.cs

@@ -29,9 +29,9 @@ public void Does_not_use_custom_decimal()
             num.ToJsv().Print();
             num.ToCsv().Print();
 
-            Assert.That(num.ToJson(), Is.StringContaining("4444.4444"));
-            Assert.That(num.ToJsv(), Is.StringContaining("4444.4444"));
-            Assert.That(num.ToCsv(), Is.StringContaining("4444,4444"));
+            Assert.That(num.ToJson(), Does.Contain("4444.4444"));
+            Assert.That(num.ToJsv(), Does.Contain("4444.4444"));
+            Assert.That(num.ToCsv(), Does.Contain("4444,4444"));
 
             CsvConfig.RealNumberCultureInfo = null;
         }

tests/ServiceStack.Text.Tests/CustomCultureInfoTests.cs

@@ -10,13 +10,13 @@ namespace ServiceStack.Text.Tests
     public class DateTimeOffsetAndTimeSpanTests : TestBase
     {
 #if !IOS && !NETCORE_SUPPORT
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsonDataContractSerializer.Instance.UseBcl = true;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsonDataContractSerializer.Instance.UseBcl = false;            
@@ -33,7 +33,7 @@ public void Can_Serializable_DateTimeOffset_Field()
             //DataContractSerializer.Instance.Parse(model).Print();
 
             var json = JsonSerializer.SerializeToString(model);
-            Assert.That(json, Is.StringContaining("\"TimeSpan\":\"PT0S\""));
+            Assert.That(json, Does.Contain("\"TimeSpan\":\"PT0S\""));
 
             var fromJson = json.FromJson<SampleModel>();
 
@@ -52,7 +52,7 @@ public void Can_serialize_TimeSpan_field()
 
             var model = new SampleModel { Id = 1, TimeSpan = period };
             var json = JsonSerializer.SerializeToString(model);
-            Assert.That(json, Is.StringContaining("\"TimeSpan\":\"P3652D\""));
+            Assert.That(json, Does.Contain("\"TimeSpan\":\"P3652D\""));
 
             //Behaviour of .NET's BCL classes
             //JsonDataContractSerializer.Instance.SerializeToString(model).Print();
@@ -70,7 +70,7 @@ public void Can_serialize_TimeSpan_field_with_StandardTimeSpanFormat()
 
                 var model = new SampleModel { Id = 1, TimeSpan = period };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
+                Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
             }
         }
 
@@ -83,7 +83,7 @@ public void Can_serialize_NullableTimeSpan_field_with_StandardTimeSpanFormat()
 
                 var model = new NullableSampleModel { Id = 1, TimeSpan = period };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
+                Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
             }
         }
 
@@ -94,7 +94,7 @@ public void Can_serialize_NullTimeSpan_field_with_StandardTimeSpanFormat()
             {
                 var model = new NullableSampleModel { Id = 1 };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.Not.StringContaining("\"TimeSpan\""));
+                Assert.That(json, Does.Not.Contain("\"TimeSpan\""));
             }
         }
 

tests/ServiceStack.Text.Tests/DateTimeOffsetAndTimeSpanTests.cs

@@ -11,7 +11,7 @@ namespace ServiceStack.Text.Tests
     public class DictionaryTests
         : TestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
 #if IOS

tests/ServiceStack.Text.Tests/DictionaryTests.cs

@@ -7,14 +7,14 @@ namespace ServiceStack.Text.Tests
     [TestFixture]
     public class JsConfigTests
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsConfig.EmitLowercaseUnderscoreNames = true;
             JsConfig<Bar>.EmitLowercaseUnderscoreNames = false;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();