Merge pull request #62 from petabridge/dev

v0.1.6 Release Notes

Author: Aaronontheweb

RELEASE_NOTES.md

@@ -1,6 +1,8 @@
-#### 0.1.5 August 30 2019 ####
-Bugfix release for Incrementalist v0.1.4
+#### 0.1.6 August 30 2019 ####
+Bugfix release for Incrementalist v0.1.4-v0.1.5
 
 Fixed [Bug: doesn't detect that project has changed when embedded resource has been modified](https://github.com/petabridge/Incrementalist/issues/56).
 
-As it turns out, Roslyn isn't able to detect non-code files embedded as resources into projects - so we search to see if any modified files are contained in the same folder as solution projects and we'll now mark the project as updated in the event that it contains a modified file.
+As it turns out, Roslyn isn't able to detect non-code files embedded as resources into projects - so we search to see if any modified files are contained in the same folder as solution projects and we'll now mark the project as updated in the event that it contains a modified file.
+
+Fixed [issue with detecting transitive dependencies in multi-targeted builds](https://github.com/petabridge/Incrementalist/issues/55).

src/Incrementalist/ProjectSystem/Cmds/ComputeDependencyGraphCmd.cs

@@ -35,6 +35,19 @@ protected override async Task<Dictionary<string, ICollection<string>>> ProcessIm
             if (affectedSlnFiles.Count == 0)
                 return new Dictionary<string, ICollection<string>>();
 
+            /*
+             * Special case: in instances where the project files themselves are modified,
+             * we there might be multiple ProjectIds in the case of a multi-targeted solution.
+             * 
+             * We have to gather up each unique project file separately in this case.
+             */
+            var additionalProjectIds = new List<ProjectId>();
+            if(affectedSlnFiles.Any(x => x.Value.FileType == FileType.Project))
+            {
+                foreach(var proj in affectedSlnFiles.Where(x => x.Value.FileType == FileType.Project))
+                    additionalProjectIds.AddRange(_solution.Projects.Where(x => x.FilePath.Equals(proj.Key)).Select(x => x.Id));
+            }
+
             var ds = _solution.GetProjectDependencyGraph();
 
             // Special case: if the solution itself is modified, return all projects
@@ -48,7 +61,7 @@ string GetProjectFilePath(ProjectId project)
                 return _solution.GetProject(project).FilePath;
             }
 
-            var uniqueProjectIds = affectedSlnFiles.Select(x => x.Value.ProjectId).Distinct().ToList();
+            var uniqueProjectIds = affectedSlnFiles.Select(x => x.Value.ProjectId).Concat(additionalProjectIds).Distinct().ToList();
             var graphs = uniqueProjectIds.ToDictionary(x => x,
                 v => ds.GetProjectsThatTransitivelyDependOnThisProject(v).ToList());
 

src/common.props

@@ -2,10 +2,11 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2019 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>0.1.5</VersionPrefix>
-    <PackageReleaseNotes>Bugfix release for Incrementalist v0.1.4
+    <VersionPrefix>0.1.6</VersionPrefix>
+    <PackageReleaseNotes>Bugfix release for Incrementalist v0.1.4-v0.1.5
 Fixed [Bug: doesn't detect that project has changed when embedded resource has been modified](https://github.com/petabridge/Incrementalist/issues/56).
-As it turns out, Roslyn isn't able to detect non-code files embedded as resources into projects - so we search to see if any modified files are contained in the same folder as solution projects and we'll now mark the project as updated in the event that it contains a modified file.</PackageReleaseNotes>
+As it turns out, Roslyn isn't able to detect non-code files embedded as resources into projects - so we search to see if any modified files are contained in the same folder as solution projects and we'll now mark the project as updated in the event that it contains a modified file.
+Fixed [issue with detecting transitive dependencies in multi-targeted builds](https://github.com/petabridge/Incrementalist/issues/55).</PackageReleaseNotes>
     <tags>build, msbuild, incremental build, roslyn, git</tags>
     <PackageIconUrl>
       https://petabridge.com/images/logo.png