diff options
author | Lluis Sanchez <llsan@microsoft.com> | 2018-02-26 21:07:02 +0300 |
---|---|---|
committer | Lluis Sanchez <llsan@microsoft.com> | 2018-02-26 21:07:02 +0300 |
commit | 2a6d1cedbe3d909f2473781246fd8e5093ce92fe (patch) | |
tree | 93855c8454d41ed8e43bb86f202ff84c699d1717 /Mono.Addins/Mono.Addins.Database | |
parent | 8dc3e7af0ba110f9a1832e365d8aa08d1e77ffd8 (diff) |
Fix some bad merges
Diffstat (limited to 'Mono.Addins/Mono.Addins.Database')
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/ScanOptions.cs | 1 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/SetupProcess.cs | 6 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/Util.cs | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Mono.Addins/Mono.Addins.Database/ScanOptions.cs b/Mono.Addins/Mono.Addins.Database/ScanOptions.cs index 50e98fa..1fe94c7 100644 --- a/Mono.Addins/Mono.Addins.Database/ScanOptions.cs +++ b/Mono.Addins/Mono.Addins.Database/ScanOptions.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; using System.Collections.Generic; +using System.IO; namespace Mono.Addins.Database { diff --git a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs index 620cde2..0ae3a33 100644 --- a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs +++ b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs @@ -43,11 +43,7 @@ namespace Mono.Addins.Database { public void Scan (IProgressStatus monitor, AddinRegistry registry, string scanFolder, ScanOptions context) { - List<string> data = new List<string> (); - data.Add (context.FilesToIgnore.Count.ToString ()); - data.AddRange (context.FilesToIgnore); - data.Add (context.AddinCacheDataFileGenerationRootDirs.Count.ToString ()); - data.AddRange (context.AddinCacheDataFileGenerationRootDirs); + var data = new List<string> (context.Write ()); ExecuteCommand (monitor, registry.RegistryPath, registry.StartupDirectory, registry.DefaultAddinsFolder, registry.AddinCachePath, "scan", scanFolder, data); } diff --git a/Mono.Addins/Mono.Addins.Database/Util.cs b/Mono.Addins/Mono.Addins.Database/Util.cs index 967e65c..a44a20f 100644 --- a/Mono.Addins/Mono.Addins.Database/Util.cs +++ b/Mono.Addins/Mono.Addins.Database/Util.cs @@ -34,6 +34,7 @@ using System.Reflection; using Mono.Addins.Description; using Mono.Addins.Serialization; using System.Collections.Generic; +using System.Text; namespace Mono.Addins.Database { |