Task.Factory.StartNew() が使われている箇所を Task.Run() に置き換え

 * Task.Run() はデフォルトで TaskScheduler.Default 指定
\r * Unwrap() が必要な箇所は Task.Run() 側で展開される

diff --git a/OpenTween.Tests/TweetThumbnailTest.cs b/OpenTween.Tests/TweetThumbnailTest.cs
index fa6c17d..c38793e 100644 (file)
--- a/OpenTween.Tests/TweetThumbnailTest.cs
+++ b/OpenTween.Tests/TweetThumbnailTest.cs
@@ -70,7 +70,7 @@ namespace OpenTween
             {
                 public override Task<MemoryImage> LoadThumbnailImageAsync(CancellationToken token)
                 {
-                    return Task.Factory.StartNew(() => MemoryImage.CopyFromBytes(File.ReadAllBytes("Resources/" + this.ThumbnailUrl)), token);
+                    return Task.Run(() => MemoryImage.CopyFromBytes(File.ReadAllBytes("Resources/" + this.ThumbnailUrl)), token);
                 }
             }
         }

diff --git a/OpenTween/ImageCache.cs b/OpenTween/ImageCache.cs
index 40690af..59b8197 100644 (file)
--- a/OpenTween/ImageCache.cs
+++ b/OpenTween/ImageCache.cs
@@ -92,7 +92,7 @@ namespace OpenTween
         {
             var cancelToken = this.cancelTokenSource.Token;
 
-            return Task.Factory.StartNew(() =>
+            return Task.Run(() =>
             {
                 Task<MemoryImage> cachedImageTask = null;
                 lock (this.lockObject)
@@ -125,7 +125,7 @@ namespace OpenTween
                         return imageTask;
                     }
                 }
-            }, cancelToken, TaskCreationOptions.None, TaskScheduler.Default).Unwrap();
+            }, cancelToken);
         }
 
         public MemoryImage TryGetFromCache(string address)

diff --git a/OpenTween/ImageListViewItem.cs b/OpenTween/ImageListViewItem.cs
index ca24578..e4380f9 100644 (file)
--- a/OpenTween/ImageListViewItem.cs
+++ b/OpenTween/ImageListViewItem.cs
@@ -66,7 +66,7 @@ namespace OpenTween
         private Task GetImageAsync(bool force = false)
         {
             if (string.IsNullOrEmpty(this.imageUrl))
-                return Task.Factory.StartNew(() => { });
+                return Task.FromResult(0);
 
             var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 

diff --git a/OpenTween/Thumbnail/Services/TonTwitterCom.cs b/OpenTween/Thumbnail/Services/TonTwitterCom.cs
index e70cba2..44d7e1c 100644 (file)
--- a/OpenTween/Thumbnail/Services/TonTwitterCom.cs
+++ b/OpenTween/Thumbnail/Services/TonTwitterCom.cs
@@ -61,7 +61,7 @@ namespace OpenTween.Thumbnail.Services
         {
             public override Task<MemoryImage> LoadThumbnailImageAsync(CancellationToken token)
             {
-                return Task.Factory.StartNew(() =>
+                return Task.Run(() =>
                 {
                     var oauth = new HttpOAuthApiProxy();
                     TonTwitterCom.InitializeOAuthToken(oauth);
@@ -76,8 +76,7 @@ namespace OpenTween.Thumbnail.Services
                         else
                             throw new WebException(statusCode.ToString(), WebExceptionStatus.ProtocolError);
                     }
-                },
-                token, TaskCreationOptions.None, TaskScheduler.Default); // 明示しないと TaskScheduler.Current になり UI スレッド上で実行されてしまう
+                }, token);
             }
         }
     }

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 95353cc..142335d 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -7898,7 +7898,7 @@ namespace OpenTween
             var statusId = long.Parse(match.Groups["StatusId"].Value);
             var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
-            Task.Factory.StartNew(() =>
+            Task.Run(() =>
                 {
                     var post = this._statuses[statusId];
                     if (post == null)
@@ -7908,7 +7908,7 @@ namespace OpenTween
                             throw new WebApiException(err);
                     }
                     return post;
-                }, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default)
+                })
                 .ContinueWith(t =>
                 {
                     if (t.IsFaulted)
@@ -10620,7 +10620,7 @@ namespace OpenTween
 
         public Task OpenUriAsync(string UriString)
         {
-            return Task.Factory.StartNew(() =>
+            return Task.Run(() =>
             {
                 string myPath = UriString;
 

diff --git a/OpenTween/TweetThumbnail.cs b/OpenTween/TweetThumbnail.cs
index 2f582e6..bb12b4a 100644 (file)
--- a/OpenTween/TweetThumbnail.cs
+++ b/OpenTween/TweetThumbnail.cs
@@ -69,7 +69,7 @@ namespace OpenTween
             var cancelToken = this.cancelTokenSource.Token;
             var uiScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
-            this.task = Task.Factory.StartNew(() => this.GetThumbailInfo(post), cancelToken, TaskCreationOptions.None, TaskScheduler.Default)
+            this.task = Task.Run(() => this.GetThumbailInfo(post), cancelToken)
                 .ContinueWith(t => /* await使いたい */
                 {
                     var thumbnails = t.Result;