added IGlobbingResolver class

Author: arturcic

src/GitVersionExe/ArgumentParser.cs

@@ -16,11 +16,13 @@ public class ArgumentParser : IArgumentParser
         private readonly IEnvironment environment;
         private readonly ICurrentBuildAgent buildAgent;
         private readonly IConsole console;
+        private readonly IGlobbingResolver globbingResolver;
 
-        public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console)
+        public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
         {
             this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
             this.console = console ?? throw new ArgumentNullException(nameof(console));
+            this.globbingResolver = globbingResolver ?? throw new ArgumentNullException(nameof(globbingResolver));
             this.buildAgent = buildAgent;
         }
 
@@ -87,6 +89,8 @@ public Arguments ParseArguments(string[] commandLineArguments)
                 ? System.Environment.CurrentDirectory
                 : firstArgument;
 
+            arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');
+            arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
             arguments.NoFetch = arguments.NoFetch || buildAgent != null && buildAgent.PreventFetch();
 
             return arguments;
@@ -234,7 +238,6 @@ private void ParseArguments(Arguments arguments, NameValueCollection switchesAnd
             if (name.IsSwitch("showConfig"))
             {
                 ParseShowConfig(value, arguments);
-
                 return;
             }
 
@@ -311,6 +314,21 @@ private void ParseArguments(Arguments arguments, NameValueCollection switchesAnd
             throw new WarningException(couldNotParseMessage);
         }
 
+        private void AddAuthentication(Arguments arguments)
+        {
+            var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
+            if (!string.IsNullOrWhiteSpace(username))
+            {
+                arguments.Authentication.Username = username;
+            }
+
+            var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
+            if (!string.IsNullOrWhiteSpace(password))
+            {
+                arguments.Authentication.Username = password;
+            }
+        }
+
         private static void ParseShowConfig(string value, Arguments arguments)
         {
             if (value.IsTrue())
@@ -456,18 +474,18 @@ private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, s
             }
         }
 
-        private void AddAuthentication(Arguments arguments)
+        private IEnumerable<string> ResolveFiles(string workingDirectory, ISet<string> assemblyInfoFiles)
         {
-            var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
-            if (!string.IsNullOrWhiteSpace(username))
-            {
-                arguments.Authentication.Username = username;
-            }
+            if (assemblyInfoFiles == null) yield break;
 
-            var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
-            if (!string.IsNullOrWhiteSpace(password))
+            foreach (var file in assemblyInfoFiles)
             {
-                arguments.Authentication.Username = password;
+                var paths = globbingResolver.Resolve(workingDirectory, file);
+
+                foreach (var path in paths)
+                {
+                    yield return Path.GetFullPath(Path.Combine(workingDirectory, path));
+                }
             }
         }
 

src/GitVersionExe/Arguments.cs

@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitVersion.Logging;
 using GitVersion.Model;
 using GitVersion.Model.Configuration;
-using Microsoft.Extensions.FileSystemGlobbing;
-using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
 namespace GitVersion
 {
@@ -66,7 +62,7 @@ public GitVersionOptions ToOptions()
                 {
                     ShouldUpdate = UpdateAssemblyInfo,
                     EnsureAssemblyInfo = EnsureAssemblyInfo,
-                    Files = ResolveFiles(workingDirectory).ToHashSet()
+                    Files = UpdateAssemblyInfoFileName
                 },
 
                 Authentication =
@@ -121,21 +117,6 @@ public GitVersionOptions ToOptions()
             };
         }
 
-        private IEnumerable<string> ResolveFiles(string workingDirectory)
-        {
-            if (UpdateAssemblyInfoFileName == null) yield break;
-            var matcher = new Matcher(StringComparison.OrdinalIgnoreCase);
-
-            foreach (var file in UpdateAssemblyInfoFileName)
-            {
-                matcher.AddInclude(file);
-                var results = matcher.Execute(new DirectoryInfoWrapper(new DirectoryInfo(workingDirectory)));
 
-                foreach (var result in results.Files)
-                {
-                    yield return Path.GetFullPath(Path.Combine(workingDirectory, result.Path));
-                }
-            }
-        }
     }
 }

src/GitVersionExe/GitVersionExeModule.cs

@@ -7,6 +7,8 @@ public class GitVersionExeModule : IGitVersionModule
         public void RegisterTypes(IServiceCollection services)
         {
             services.AddSingleton<IArgumentParser, ArgumentParser>();
+            services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
+
             services.AddSingleton<IHelpWriter, HelpWriter>();
             services.AddSingleton<IVersionWriter, VersionWriter>();
             services.AddSingleton<IGitVersionExecutor, GitVersionExecutor>();

src/GitVersionExe/GlobbingResolver.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+
+namespace GitVersion
+{
+    public class GlobbingResolver : IGlobbingResolver
+    {
+        private Matcher matcher = new Matcher(StringComparison.OrdinalIgnoreCase);
+
+        public IEnumerable<string> Resolve(string workingDirectory, string pattern)
+        {
+            matcher.AddInclude(pattern);
+            return matcher.Execute(GetDirectoryInfoWrapper(workingDirectory)).Files.Select(file => file.Path);
+        }
+
+        protected virtual DirectoryInfoBase GetDirectoryInfoWrapper(string workingDirectory) => new DirectoryInfoWrapper(new DirectoryInfo(workingDirectory));
+    }
+}

src/GitVersionExe/IGlobbingResolver.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace GitVersion
+{
+    public interface IGlobbingResolver
+    {
+        public IEnumerable<string> Resolve(string workingDirectory, string pattern);
+    }
+}