Add support for file-glob for file-based Import

Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs

@@ -361,6 +361,8 @@ string BuildPackageInternal (IProgressStatus monitor, string targetDirectory, st
 			if (targetDirectory == null)
 				targetDirectory = basePath;
 
+			conf.SetBasePath (basePath);
+
 			// Generate the file name
 
 			string name;

Mono.Addins/Mono.Addins.Description/AddinDescription.cs

@@ -36,6 +36,8 @@
 using Mono.Addins.Serialization;
 using Mono.Addins.Database;
 using System.Text;
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
 namespace Mono.Addins.Description
 {
@@ -381,11 +383,11 @@ public StringCollection AllFiles {
 			get {
 				StringCollection col = new StringCollection ();
 				foreach (string s in MainModule.AllFiles)
-					col.Add (s);
+					AddFileToCollection (col, s);
 
 				foreach (ModuleDescription mod in OptionalModules) {
 					foreach (string s in mod.AllFiles)
-						col.Add (s);
+						AddFileToCollection (col, s);
 				}
 				return col;
 			}
@@ -922,6 +924,7 @@ public static AddinDescription Read (string configFile)
 				config = Read (s, Path.GetDirectoryName (configFile));
 			}
 			config.configFile = configFile;
+			config.SetBasePath (Path.GetDirectoryName (configFile));
 			return config;
 		}
 
@@ -951,6 +954,7 @@ public static AddinDescription Read (Stream stream, string basePath)
 		public static AddinDescription Read (TextReader reader, string basePath)
 		{
 			AddinDescription config = new AddinDescription ();
+			config.SetBasePath (basePath);
 
 			try {
 				config.configDoc = new XmlDocument ();
@@ -1072,6 +1076,21 @@ static bool GetBool (string s, bool defval)
 			else
 				return s == "true" || s == "yes";
 		}
+
+		void AddFileToCollection (StringCollection collection, string file)
+		{
+			bool isSimpleFile = file.IndexOf ('*') == -1;
+			if (isSimpleFile) {
+				collection.Add (file);
+				return;
+			}
+
+			var matcher = new Matcher (StringComparison.OrdinalIgnoreCase);
+			matcher.AddInclude (file);
+			var files = matcher.Execute (new DirectoryInfoWrapper (new DirectoryInfo (BasePath))).Files;
+			foreach (var globbedFile in files)
+				collection.Add (globbedFile.Path);
+		}
 
 		internal static AddinDescription ReadBinary (FileDatabase fdb, string configFile)
 		{

Mono.Addins/Mono.Addins.csproj

@@ -49,6 +49,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <PackageReference Include="NuGet.Build.Packaging" Version="0.1.276" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing">
+      <Version>1.1.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

Test/ImportGlobFileExtension/ImportGlobFileExtension.addin.xml

@@ -0,0 +1,20 @@
+<Addin id          = "ImportGlobFileExtension"
+       namespace   = "SimpleApp"
+       name        = "ImportGlobFileExtension"
+       author      = "Jeremie Laval"
+       copyright   = "GPL"
+       description = "ImportGlobFileExtension"
+	   category    = "SimpleApp/Extensions"
+       version     = "0.1.0">
+
+	<Runtime>
+	  <Import file="file1.txt" />
+	  <Import file="dir1/*.bin" />
+	  <Import file="dir2/**" />
+	</Runtime>
+
+	<Dependencies>
+		<Addin id="Core" version="0.1.0" />
+	</Dependencies>
+
+</Addin>

Test/UnitTests/TestAddinDescription.cs

@@ -186,6 +186,25 @@ public void WriteCorePropertiesAsProps ()
 			XmlDocument doc2 = desc.SaveToXml ();
 			Assert.AreEqual (Util.Infoset (doc1), Util.Infoset (doc2));
 		}
+
+		[Test]
+		public void FileGlobbingTest ()
+		{
+			string pathToTestFolder = Path.Combine ("..", "..", "..", "ImportGlobFileExtension");
+			AddinDescription desc = AddinDescription.Read (Path.Combine (pathToTestFolder, "ImportGlobFileExtension.addin.xml"));
+
+			var allFiles = desc.AllFiles;
+			Assert.IsNotNull (allFiles);
+			CollectionAssert.IsNotEmpty (allFiles);
+			Assert.AreEqual (5, allFiles.Count);
+			CollectionAssert.AreEquivalent (new string [] {
+				"file1.txt",
+				Path.Combine ("dir1", "bar.bin"),
+				Path.Combine ("dir1", "foo.bin"),
+				Path.Combine ("dir2", "subdir", "subfile.txt"),
+				Path.Combine ("dir2", "subdir", "subsubdir", "subsubfile.txt")
+			}, allFiles);
+		}
 	}
 }