Merge pull request #184 from AArnott/NoWarnOnIntermediateSource

Suppress warning for source files that fall under intermediate output path

src/GitLink/LinkOptions.cs

@@ -25,5 +25,7 @@ public struct LinkOptions
         public string GitWorkingDirectory { get; set; }
 
         public bool IndexAllDepotFiles { get; set; }
+
+        public string IntermediateOutputPath { get; set; }
     }
 }

src/GitLink/Linker.cs

@@ -127,7 +127,9 @@ public static class Linker
                 try
                 {
                     Repository repo = repository.Value;
-                    repoSourceFiles = sourceFiles.ToDictionary(e => e, e => repo.GetNormalizedPath(e));
+                    repoSourceFiles = sourceFiles
+                        .Where(f => !f.StartsWithIgnoreCase(options.IntermediateOutputPath))
+                        .ToDictionary(e => e, e => repo.GetNormalizedPath(e));
                 }
                 catch (RepositoryNotFoundException)
                 {

src/GitLinkTask/LinkPdbToGitRemote.cs

@@ -5,6 +5,7 @@
 namespace GitLinkTask
 {
     using System;
+    using System.IO;
     using Catel.Logging;
     using global::GitLink;
     using Microsoft.Build.Framework;
@@ -31,6 +32,8 @@ public string Method
 
         public string GitWorkingDirectory { get; set; }
 
+        public string IntermediateOutputPath { get; set; }
+
         private LinkMethod MethodEnum { get; set; }
 
         public override bool Execute()
@@ -45,12 +48,20 @@ public override bool Execute()
                 CommitId = GitCommitId,
                 GitWorkingDirectory = GitWorkingDirectory,
                 IndexAllDepotFiles = IndexAllDepotFiles,
+                IntermediateOutputPath = Path.GetFullPath(AddTrailingSlash(IntermediateOutputPath)),
             };
             bool success = Linker.Link(PdbFile.GetMetadata("FullPath"), options);
 
             return success && !Log.HasLoggedErrors;
         }
 
+        private static string AddTrailingSlash(string path)
+        {
+            return path.EndsWith(Path.DirectorySeparatorChar.ToString())
+                ? path
+                : path + Path.DirectorySeparatorChar;
+        }
+
         private class MSBuildListener : LogListenerBase
         {
             private readonly TaskLoggingHelper _log;

src/GitLinkTask/build/GitLink.targets

@@ -17,6 +17,7 @@
         GitRemoteUrl="$(GitLinkGitRemoteUrl)"
         GitWorkingDirectory="$(GitWorkingDirectory)"
         GitCommitId="$(GitCommitId)"
+        IntermediateOutputPath="$(IntermediateOutputPath)"
         ContinueOnError="$(GitLinkContinueOnError)" />
   </Target>
 </Project>