na-get-lib,all-get,インストール除外リストの設定を追加。all-get.exeのcheckupgrade表示への反映

diff --git a/all-get/Main.cs b/all-get/Main.cs
index 2989c34..92af7f3 100644 (file)
--- a/all-get/Main.cs
+++ b/all-get/Main.cs
@@ -127,28 +127,32 @@ namespace AllGet
                public void CheckUpgrade()\r
                {\r
                        PackageList<Package> packageList = pkgListMan.AvailablePkgList;\r
+                       string[] exclude = NaGet.Env.ExcludeUpdatePackageNames;\r
                        \r
                        VersionComparetor verComp = new VersionComparetor();\r
                        \r
                        foreach (InstalledPackage pkg in pkgListMan.InstalledPkgList) {\r
-                               Package avaiablePkg = packageList.GetPackageForName(pkg.Name);\r
-                               \r
-                               if (avaiablePkg != null) {\r
-                                       if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
-                                           pkgListMan.InstalledPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
-                                               \r
-                                               Console.WriteLine("{0} ({1}) => ({2})", pkg.Name, pkg.Version, avaiablePkg.Version);\r
+                               if (Array.IndexOf(exclude ?? new string[0], pkg.Name) < 0) {\r
+                                       Package avaiablePkg = packageList.GetPackageForName(pkg.Name);\r
+                                       if (avaiablePkg != null) {\r
+                                               if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
+                                                   pkgListMan.InstalledPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
+                                                       \r
+                                                       Console.WriteLine("{0} ({1}) => ({2})", pkg.Name, pkg.Version, avaiablePkg.Version);\r
+                                               }\r
                                        }\r
                                }\r
                        }\r
                        foreach (InstalledPackage pkg in pkgListMan.SystemInstalledPkgList) {\r
-                               Package avaiablePkg = packageList.GetPackageForName(pkg.Name);\r
-                               \r
-                               if (avaiablePkg != null) {\r
-                                       if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
-                                           pkgListMan.SystemInstalledPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
-                                               \r
-                                               Console.WriteLine("{0} ({1})@sys => ({2})", pkg.Name, pkg.Version, avaiablePkg.Version);\r
+                               if (Array.IndexOf(exclude ?? new string[0], pkg.Name) < 0) {\r
+                                       Package avaiablePkg = packageList.GetPackageForName(pkg.Name);\r
+                                       \r
+                                       if (avaiablePkg != null) {\r
+                                               if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
+                                                   pkgListMan.SystemInstalledPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
+                                                       \r
+                                                       Console.WriteLine("{0} ({1})@sys => ({2})", pkg.Name, pkg.Version, avaiablePkg.Version);\r
+                                               }\r
                                        }\r
                                }\r
                        }\r

diff --git a/na-get-lib/NaGet/Env.cs b/na-get-lib/NaGet/Env.cs
index 2f799d2..f2fc17b 100644 (file)
--- a/na-get-lib/NaGet/Env.cs
+++ b/na-get-lib/NaGet/Env.cs
@@ -227,6 +227,19 @@ namespace NaGet
                        }\r
                }\r
                \r
+               /// <summary>\r
+               /// アップデートから除外するパッケージの名前\r
+               /// </summary>\r
+               public static string[] ExcludeUpdatePackageNames {\r
+                       get {\r
+                               if (pref == null) LoadPref();\r
+                               return pref.ExcludeUpdatePackageNames;\r
+                       }\r
+                       set {\r
+                               if (pref == null) LoadPref();\r
+                               pref.ExcludeUpdatePackageNames = value;\r
+                       }\r
+               }\r
                \r
                #endregion\r
                \r

diff --git a/na-get-lib/NaGet/NaGetLibPref.cs b/na-get-lib/NaGet/NaGetLibPref.cs
index 78d3893..ed08a0f 100644 (file)
--- a/na-get-lib/NaGet/NaGetLibPref.cs
+++ b/na-get-lib/NaGet/NaGetLibPref.cs
@@ -48,5 +48,12 @@ namespace NaGet
                [XmlElement]\r
                [DefaultValue(true)]\r
                public bool InstallOnBackground = true;\r
+               \r
+               /// <summary>\r
+               /// アップデートから除外するパッケージ名\r
+               /// </summary>\r
+               [XmlElement("ExcludeUpdatePackageName")]\r
+               [DefaultValue(null)]\r
+               public string[] ExcludeUpdatePackageNames = null;\r
        }\r
 }\r