AppliStation-all,NaGetTaskクラスをTaskクラスに改名他

[applistation/AppliStation.git] / na-get-lib / NaGet.SubCommands / NaGetInstall.cs

diff --git a/na-get-lib/NaGet.SubCommands/NaGetInstall.cs b/na-get-lib/NaGet.SubCommands/NaGetInstall.cs
index 9c6ffdf..83285c0 100644 (file)
--- a/na-get-lib/NaGet.SubCommands/NaGetInstall.cs
+++ b/na-get-lib/NaGet.SubCommands/NaGetInstall.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using NaGet.Packages.Install;\r
 using NaGet.Packages;\r
 using NaGet.Net;\r
+using NaGet.Tasks;\r
 \r
 namespace NaGet.SubCommands\r
 {\r
@@ -22,8 +23,8 @@ namespace NaGet.SubCommands
                                if (downloader == null) {\r
                                        downloader = new Downloader();\r
                                        downloader.DownloadEventRaised += delegate(object sender, DownloadEventArgs e) {\r
-                                               if (e.Type == DownloadEventType.DOWNLOADING && e.TaskProgressPercent > 0) {\r
-                                                       RaiseTaskSetEvent(NaGetTaskSetEventType.PING, string.Empty, GetProgressPercent(NaGetTaskSetEventType.PING, e.TaskProgressPercent));\r
+                                               if (e.Type == DownloadEventType.DOWNLOADING && e.ProgressPercent > 0) {\r
+                                                       RaiseTaskSetEvent(NaGetTaskSetEventType.PING, string.Empty, GetProgressPercent(NaGetTaskSetEventType.PING, e.ProgressPercent));\r
                                                }\r
                                        };\r
                                }\r
@@ -213,7 +214,7 @@ namespace NaGet.SubCommands
                                        if (! inst.Downloaded) {\r
                                                try {\r
                                                        inst.Download(Downloader);\r
-                                               } catch (NaGetTaskCanceledException) {\r
+                                               } catch (TaskCanceledException) {\r
                                                        RaiseTaskSetEvent(NaGetTaskSetEventType.CANCELED, "インストーラーのダウンロード処理がキャンセルされました");\r
                                                        done = true;\r
                                                        return;\r