Remove XmlDependencies.fileRegularExpressions

Internally, only Dependencies.xml files are matched, so we can use the more performant file-matching pattern here.

The public API remains unchanged and only supports regex for now.

Author: chrisyarbrough

source/AndroidResolver/AndroidResolver.csproj

@@ -59,6 +59,7 @@
     <Compile Include="src\CommandLine.cs" />
     <Compile Include="src\CommandLineDialog.cs" />
     <Compile Include="src\EmbeddedResource.cs" />
+    <Compile Include="src\FileMatchPattern.cs" />
     <Compile Include="src\GradleResolver.cs" />
     <Compile Include="src\GradleTemplateResolver.cs" />
     <Compile Include="src\GradleWrapper.cs" />

source/AndroidResolver/src/FileMatchPattern.cs

@@ -0,0 +1,3 @@
+namespace GooglePlayServices {
+	public delegate bool FileMatchPattern(string filename);
+}

source/AndroidResolver/src/PlayServicesResolver.cs

@@ -18,6 +18,7 @@ namespace GooglePlayServices {
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Linq;
     using System.Text.RegularExpressions;
     using System.Threading;
     using System.Xml;
@@ -985,7 +986,7 @@ private static bool Initialize() {
             }
 
             // Monitor Android dependency XML files to perform auto-resolution.
-            AddAutoResolutionFilePatterns(xmlDependencies.fileRegularExpressions);
+            autoResolveFilePatterns.Add(XmlDependencies.IsDependenciesFile);
 
             svcSupport = PlayServicesSupport.CreateInstance(
                 "PlayServicesResolver",
@@ -1072,15 +1073,16 @@ internal static void Log(string message, Google.LogLevel level = LogLevel.Info)
         /// <summary>
         /// Patterns of files that are monitored to trigger auto resolution.
         /// </summary>
-        private static HashSet<Regex> autoResolveFilePatterns = new HashSet<Regex>();
+        private static HashSet<FileMatchPattern> autoResolveFilePatterns = new HashSet<FileMatchPattern>();
 
         /// <summary>
         /// Add file patterns to monitor to trigger auto resolution.
         /// </summary>
         /// <param name="patterns">Set of file patterns to monitor to trigger auto
         /// resolution.</param>
         public static void AddAutoResolutionFilePatterns(IEnumerable<Regex> patterns) {
-            autoResolveFilePatterns.UnionWith(patterns);
+            // Only regex patterns are supported in the public API, but a more performant default is used internally.
+            autoResolveFilePatterns.UnionWith(patterns.Select<Regex, FileMatchPattern>(p => p.IsMatch));
         }
 
         /// <summary>
@@ -1092,7 +1094,7 @@ private static bool CheckFilesForAutoResolution(HashSet<string> filesToCheck) {
             bool resolve = false;
             foreach (var asset in filesToCheck) {
                 foreach (var pattern in autoResolveFilePatterns) {
-                    if (pattern.Match(asset).Success) {
+                    if (pattern.Invoke(asset)) {
                         Log(String.Format("Found asset {0} matching {1}, attempting " +
                                           "auto-resolution.",
                                           asset, pattern.ToString()),

source/AndroidResolver/src/XmlDependencies.cs

@@ -28,14 +28,6 @@ namespace GooglePlayServices {
     /// </summary>
     internal class XmlDependencies {
 
-        /// <summary>
-        /// Set of regular expressions that match files which contain dependency
-        /// specifications.
-        /// </summary>
-        internal HashSet<Regex> fileRegularExpressions = new HashSet<Regex> {
-            new Regex(@".*[/\\]Editor[/\\].*Dependencies\.xml$")
-        };
-
         /// <summary>
         /// Human readable name for dependency files managed by this class.
         /// </summary>

source/IOSResolver/src/IOSResolver.cs

@@ -1938,7 +1938,7 @@ private static void OnPostprocessAllAssets(string[] importedAssets,
         var changedAssets = new List<string>(importedAssets);
         changedAssets.AddRange(deletedAssets);
         foreach (var asset in changedAssets) {
-            dependencyFileChanged = xmlDependencies.IsDependenciesFile(asset);
+            dependencyFileChanged = XmlDependencies.IsDependenciesFile(asset);
             if (dependencyFileChanged) break;
         }
         if (dependencyFileChanged) RefreshXmlDependencies();