OSDN Git Service

na-get-lib,NaGetDownloadScanner and GuidEnumeratorForCategories are on namespace...
authorttp <ttp@users.sourceforge.jp>
Tue, 31 May 2011 15:56:31 +0000 (00:56 +0900)
committerttp <ttp@users.sourceforge.jp>
Tue, 31 May 2011 15:56:31 +0000 (00:56 +0900)
na-get-lib/NaGet.InteropServices/DownloadScannerService.cs [moved from na-get-lib/NaGet.Net/DownloadScanner.cs with 95% similarity]
na-get-lib/NaGet.InteropServices/GuidEnumeratorForCategories.cs [moved from na-get-lib/NaGet.Net/GuidEnumeratorForCategories.cs with 89% similarity]
na-get-lib/NaGet.Packages.Install/Installation.cs
na-get-lib/NaGet.SubCommands/NaGetDownloadToCache.cs
na-get-lib/NaGet.SubCommands/NaGetInstall.cs
na-get-lib/na-get-lib.csproj

@@ -25,7 +25,7 @@ namespace NaGet.Net
        /// <summary>\r
        /// ダウンロードしたファイルをスキャンする\r
        /// </summary>\r
-       public class DownloadScanner : IDisposable\r
+       public class DownloadScannerService : IDisposable\r
        {\r
                #region COMInterop\r
                [Flags()]\r
@@ -77,7 +77,7 @@ namespace NaGet.Net
                /// <summary>\r
                /// コンストラクタ。内部でCOM呼び出し初期化(CoInitialize)されます。\r
                /// </summary>\r
-               public DownloadScanner()\r
+               public DownloadScannerService()\r
                {\r
                        int result = ComDirectAccess.CoInitialize(IntPtr.Zero);\r
                        if (result == 0) {\r
@@ -2,12 +2,12 @@
 using System.Collections.Generic;\r
 using Microsoft.Win32;\r
 \r
-namespace NaGet.Net\r
+namespace NaGet.InteropServices\r
 {\r
        /// <summary>\r
        /// ICatManagerの暫定的かつピュアC#実装。レジストリを舐めてICatManagerと同等の機能を実現する。\r
        /// </summary>\r
-       class GuidEnumeratorForCategories : IEnumerable<Guid>, IDisposable\r
+       internal class GuidEnumeratorForCategories : IEnumerable<Guid>, IDisposable\r
        {\r
                private RegistryKey key;\r
                \r
index 1102ea2..9d3187a 100644 (file)
@@ -213,7 +213,7 @@ namespace NaGet.Packages.Install
                /// <exception cref="ComException">スキャンで意図せぬ動作があったとき</exception>\r
                /// <param name="scanner">スキャナーオブジェクト</param>\r
                /// <returns>スキャン結果</returns>\r
-               public DownloadScannerResult ScanInstallerFile(DownloadScanner scanner)\r
+               public DownloadScannerResult ScanInstallerFile(DownloadScannerService scanner)\r
                {\r
                        DownloadScannerResult result;\r
                        Exception e = null;\r
index ac482b6..462b3ff 100644 (file)
@@ -155,7 +155,7 @@ namespace NaGet.SubCommands
                /// </summary>
                private void runDownloadAndVirusCheckInstallers()
                {
-                       using (DownloadScanner scanner = new DownloadScanner()) {
+                       using (DownloadScannerService scanner = new DownloadScannerService()) {
                                scanner.Init();
                                foreach (Installation inst in Installations) {
                                        RaiseTaskSetEvent(TaskEventType.STARTED_SUBTASK, taskSetNames[currentTaskSetIndex]);
index f76ba07..6fad3e6 100644 (file)
@@ -196,7 +196,7 @@ namespace NaGet.SubCommands
                /// </summary>\r
                private void runDownloadAndVirusCheckInstallers()\r
                {\r
-                       using (DownloadScanner scanner = new DownloadScanner()) {\r
+                       using (DownloadScannerService scanner = new DownloadScannerService()) {\r
                                scanner.Init();\r
                                foreach (Installation inst in Installations) {\r
                                        if (! inst.IsInstallablePackage()) {\r
index 6ed8621..8cd9388 100644 (file)
     <Compile Include="NaGet.InteropServices\CommonArchiverExtracter.cs" />\r
     <Compile Include="NaGet.InteropServices\CreateProcessCaller.cs" />\r
     <Compile Include="NaGet.InteropServices\DllAccess.cs" />\r
+    <Compile Include="NaGet.InteropServices\GuidEnumeratorForCategories.cs" />\r
     <Compile Include="NaGet.InteropServices\PEFileInfoUtils.cs" />\r
     <Compile Include="NaGet.InteropServices\ShellLink.cs" />\r
-    <Compile Include="NaGet.Net\DownloadScanner.cs" />\r
-    <Compile Include="NaGet.Net\GuidEnumeratorForCategories.cs" />\r
+    <Compile Include="NaGet.InteropServices\DownloadScannerService.cs" />\r
     <Compile Include="NaGet.Packages.Install\DependeciesResolver.cs" />\r
     <Compile Include="NaGet.Packages.Install\InstallationLog.cs" />\r
     <Compile Include="NaGet.Packages.Install\UpgradeFinder.cs" />\r