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

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -205,7 +205,7 @@ private static string RepairXsdTimeSeparator(string dateTimeStr)
                 var dateTime = new DateTime(int.Parse(dateParts[0]), int.Parse(dateParts[1]), int.Parse(dateParts[2]), hh, min, ss, ms, dateKind);
                 if (subMs != 0)
                 {
-                    dateTime.AddMilliseconds(subMs);
+                    dateTime=dateTime.AddMilliseconds(subMs);
                 }
 
                 if (offsetMultiplier != 0 && timeOffset != null)
@@ -546,4 +546,4 @@ public static string ToWcfJsonDateTimeOffset(DateTimeOffset dateTimeOffset)
             }
         }
     }
-}
+}

tests/ServiceStack.Text.Tests/HttpUtilsMockTests.cs

@@ -52,7 +52,7 @@ public void Can_Mock_Bytes_Api_responses()
         [Test]
         public void Can_Mock_UploadFile()
         {
-            const string tempTextPath = @"c:\Windows\Temp\test.txt";
+            string tempTextPath = Path.Combine (Path.GetTempPath (), "test.txt");
             using (File.CreateText(tempTextPath)){}
 
             var fileNamesUploaded = new List<string>();
@@ -114,4 +114,4 @@ public void Can_Mock_BytesFn_Api_responses()
         }
 
     }
-}
+}

tests/ServiceStack.Text.Tests/ReportedIssues.cs

@@ -203,7 +203,7 @@ public class TextTags
 		[Test]
 		public void Can_serialize_sweedish_chars()
 		{
-			var dto = new TextTags { Text = "Olle är en ÖL ål", Tags = new[] { "öl", "ål", "mål" } };
+			var dto = new TextTags { Text = "Olle är en ÖL ål", Tags = new[] { "öl", "ål", "mål" } };
 			Serialize(dto);
 		}
 
@@ -246,8 +246,9 @@ public void Comma_In_String_Does_Not_Cause_NewLine()
 			var test = new Test { TestString = "$100,000" };
 
 			var serialized = test.Dump();
+			var lf = Environment.NewLine;
 
-			Assert.That(serialized, Is.EqualTo("{\r\n\tTestString: \"$100,000\"\r\n}"));
+			Assert.That(serialized, Is.EqualTo("{"+lf+"\tTestString: \"$100,000\""+lf+"}"));
 		}
 
 		[Test]
@@ -260,8 +261,9 @@ public void Literal_Quote_In_String_Does_Not_Ignore_Comma()
 			};
 
 			var serialized = test.Dump();
+			var lf = Environment.NewLine;
 
-			Assert.That(serialized, Is.EqualTo("{\r\n\tTestString: \"test\"\"\",\r\n\tOtherString: \"$100,000\"\r\n}"));
+			Assert.That(serialized, Is.EqualTo("{"+lf+"\tTestString: \"test\"\"\","+lf+"\tOtherString: \"$100,000\""+lf+"}"));
 		}
 
 		[Test]
@@ -337,4 +339,4 @@ public class TestMappedList
 
         public List<int?> IntArrayProp { get; set; }
     }
-}
+}