From b3369a45cd4da50a06c10f0bb85244d2ab748f2a Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 30 Jan 2014 00:36:23 +1300
Subject: [PATCH] -Fixed compiler warnings -Changed PopulateObjectAsync to be
 obsolete

---
 Src/Newtonsoft.Json.Tests/JsonConvertTest.cs | 16 ++++++++++++++++
 Src/Newtonsoft.Json/JsonConvert.cs           |  1 +
 2 files changed, 17 insertions(+)

diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
index fa08bf0b..34f4d5f2 100644
--- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
+++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
@@ -879,12 +879,16 @@ now brown cow?", '"', true);
         {
             Task<string> task = null;
 
+#pragma warning disable 612,618
             task = JsonConvert.SerializeObjectAsync(42);
+#pragma warning restore 612,618
             task.Wait();
 
             Assert.AreEqual("42", task.Result);
 
+#pragma warning disable 612,618
             task = JsonConvert.SerializeObjectAsync(new[] { 1, 2, 3, 4, 5 }, Formatting.Indented);
+#pragma warning restore 612,618
             task.Wait();
 
             Assert.AreEqual(@"[
@@ -895,23 +899,29 @@ now brown cow?", '"', true);
   5
 ]", task.Result);
 
+#pragma warning disable 612,618
             task = JsonConvert.SerializeObjectAsync(DateTime.MaxValue, Formatting.None, new JsonSerializerSettings
             {
                 DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
             });
+#pragma warning restore 612,618
             task.Wait();
 
             Assert.AreEqual(@"""\/Date(253402300799999)\/""", task.Result);
 
+#pragma warning disable 612,618
             var taskObject = JsonConvert.DeserializeObjectAsync("[]");
+#pragma warning restore 612,618
             taskObject.Wait();
 
             CollectionAssert.AreEquivalent(new JArray(), (JArray)taskObject.Result);
 
+#pragma warning disable 612,618
             Task<object> taskVersionArray = JsonConvert.DeserializeObjectAsync("['2.0']", typeof(Version[]), new JsonSerializerSettings
             {
                 Converters = { new VersionConverter() }
             });
+#pragma warning restore 612,618
             taskVersionArray.Wait();
 
             Version[] versionArray = (Version[])taskVersionArray.Result;
@@ -919,15 +929,19 @@ now brown cow?", '"', true);
             Assert.AreEqual(1, versionArray.Length);
             Assert.AreEqual(2, versionArray[0].Major);
 
+#pragma warning disable 612,618
             Task<int> taskInt = JsonConvert.DeserializeObjectAsync<int>("5");
+#pragma warning restore 612,618
             taskInt.Wait();
 
             Assert.AreEqual(5, taskInt.Result);
 
+#pragma warning disable 612,618
             var taskVersion = JsonConvert.DeserializeObjectAsync<Version>("'2.0'", new JsonSerializerSettings
             {
                 Converters = { new VersionConverter() }
             });
+#pragma warning restore 612,618
             taskVersion.Wait();
 
             Assert.AreEqual(2, taskVersion.Result.Major);
@@ -935,10 +949,12 @@ now brown cow?", '"', true);
             Movie p = new Movie();
             p.Name = "Existing,";
 
+#pragma warning disable 612,618
             Task taskVoid = JsonConvert.PopulateObjectAsync("{'Name':'Appended'}", p, new JsonSerializerSettings
             {
                 Converters = new List<JsonConverter> { new JsonSerializerTest.StringAppenderConverter() }
             });
+#pragma warning restore 612,618
 
             taskVoid.Wait();
 
diff --git a/Src/Newtonsoft.Json/JsonConvert.cs b/Src/Newtonsoft.Json/JsonConvert.cs
index 0da0461e..3090bfd6 100644
--- a/Src/Newtonsoft.Json/JsonConvert.cs
+++ b/Src/Newtonsoft.Json/JsonConvert.cs
@@ -949,6 +949,7 @@ namespace Newtonsoft.Json
         /// <returns>
         /// A task that represents the asynchronous populate operation.
         /// </returns>
+        [ObsoleteAttribute("PopulateObjectAsync is obsolete. Use the Task.Factory.StartNew method to populate an object with JSON values asynchronously: Task.Factory.StartNew(() => PopulateObject(value, target, settings))")]
         public static Task PopulateObjectAsync(string value, object target, JsonSerializerSettings settings)
         {
             return Task.Factory.StartNew(() => PopulateObject(value, target, settings));