Merge pull request #93 from petabridge/dev

Aaronontheweb · web-flow · commit 8437e5ba3d4f · 2019-11-18T14:58:39.000-06:00
v0.2.1 Release
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,4 @@
-#### 0.2.0 October 28 2019 ####
-Feature release: Incrementalist v0.2.0
+#### 0.2.1 November 18 2019 ####
+Maintenance release: Incrementalist v0.2.1
 
-* [Added .NET Core 3.0 global tool support](https://github.com/petabridge/Incrementalist/issues/70)
-* [Added F# project support](https://github.com/petabridge/Incrementalist/issues/69)
-* [Bugfix: Need to be able to detect changes in `.props` files referenced by projects](https://github.com/petabridge/Incrementalist/issues/68)
-* [Added configurable timeout to commandline options](https://github.com/petabridge/Incrementalist/pull/86)
+* [Fixed: NRE during Incrementalist.ProjectSystem.Cmds.FilterAffectedProjectFilesCmd](https://github.com/petabridge/Incrementalist/issues/70)
diff --git a/src/Incrementalist.Tests/Dependencies/ProjectImportsTrackingSpecs.cs b/src/Incrementalist.Tests/Dependencies/ProjectImportsTrackingSpecs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -45,7 +46,7 @@ public void ImportedFilePathIsFound()
             var projectFile = new SlnFileWithPath(projectFilePath, new SlnFile(FileType.Project, ProjectId.CreateNewId())) ;
             var imports = ProjectImportsFinder.FindProjectImports(new[] { projectFile });
             
-            imports.Values.Should().BeEquivalentTo(new ImportedFile(importedPropsFilePath, new[] { projectFile }.ToList()));
+            imports.Values.Should().BeEquivalentTo(new ImportedFile(importedPropsFilePath, new[] { projectFile }.ToImmutableList()));
         }
 
         [Fact(DisplayName = "When project imported file is changed, the project should be marked as affected")]
diff --git a/src/Incrementalist/ProjectSystem/Cmds/FilterAffectedProjectFilesCmd.cs b/src/Incrementalist/ProjectSystem/Cmds/FilterAffectedProjectFilesCmd.cs
@@ -92,7 +92,10 @@ protected override async Task<Dictionary<string, SlnFile>> ProcessImpl(
                 if (projectImports.ContainsKey(file))
                 { 
                     // Mark all dependant as affected
-                    projectImports[file].DependantProjects.ForEach(dependentProject => newDict[dependentProject.Path] = dependentProject.File);
+                    foreach (var dependentProject in projectImports[file].DependantProjects)
+                    {
+                        newDict[dependentProject.Path] = dependentProject.File;
+                    }
                 }
             }
 
diff --git a/src/Incrementalist/ProjectSystem/ProjectImportsFinder.cs b/src/Incrementalist/ProjectSystem/ProjectImportsFinder.cs
@@ -23,7 +23,7 @@ public SlnFileWithPath(string path, SlnFile file)
     
     public sealed class ImportedFile
     {
-        public ImportedFile(string path, List<SlnFileWithPath> dependantProjects)
+        public ImportedFile(string path, IImmutableList<SlnFileWithPath> dependantProjects)
         {
             DependantProjects = dependantProjects;
             Path = path;
@@ -32,7 +32,7 @@ public ImportedFile(string path, List<SlnFileWithPath> dependantProjects)
         /// <summary>
         /// List of project files that are importing this file
         /// </summary>
-        public List<SlnFileWithPath> DependantProjects { get; }
+        public IImmutableList<SlnFileWithPath> DependantProjects { get; }
         /// <summary>
         /// File path
         /// </summary>
@@ -51,7 +51,7 @@ public static class ProjectImportsFinder
         /// <returns>Doctionary of imported files with their paths</returns>
         public static Dictionary<string, ImportedFile> FindProjectImports(IEnumerable<SlnFileWithPath> projectFiles)
         {
-            var imports = new ConcurrentDictionary<string, HashSet<SlnFileWithPath>>();
+            var imports = new ConcurrentDictionary<string, IImmutableList<SlnFileWithPath>>();
             
             Parallel.ForEach(projectFiles, projectFile =>
             {
@@ -71,19 +71,13 @@ public static Dictionary<string, ImportedFile> FindProjectImports(IEnumerable<Sl
                         continue;
                     
                     var importedFileFillPath = Path.GetFullPath(Path.Combine(projectDir, importedFilePath));
-                    var dependentProjectId = projectFile.File.ProjectId;
-
                     imports.AddOrUpdate(importedFileFillPath,
-                        addValue: new HashSet<SlnFileWithPath>() { projectFile },
-                        updateValueFactory: (_, dependentProjects) =>
-                        {
-                            dependentProjects.Add(projectFile);
-                            return dependentProjects;
-                        });
+                        addValue: ImmutableList<SlnFileWithPath>.Empty.Add(projectFile), 
+                        updateValueFactory: (_, dependentProjects) => dependentProjects.Add(projectFile));
                 }
             });
 
-            return imports.ToDictionary(pair => pair.Key, pair => new ImportedFile(pair.Key, pair.Value.ToList()));
+            return imports.ToDictionary(pair => pair.Key, pair => new ImportedFile(pair.Key, pair.Value));
         }
 
         private static XmlDocument ParseXmlDocument(string projectFilePath)
diff --git a/src/common.props b/src/common.props
@@ -2,12 +2,9 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2019 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>0.2.0</VersionPrefix>
-    <PackageReleaseNotes>Feature release: Incrementalist v0.2.0
-[Added .NET Core 3.0 global tool support](https://github.com/petabridge/Incrementalist/issues/70)
-[Added F# project support](https://github.com/petabridge/Incrementalist/issues/69)
-[Bugfix: Need to be able to detect changes in `.props` files referenced by projects](https://github.com/petabridge/Incrementalist/issues/68)
-[Added configurable timeout to commandline options](https://github.com/petabridge/Incrementalist/pull/86)</PackageReleaseNotes>
+    <VersionPrefix>0.2.1</VersionPrefix>
+    <PackageReleaseNotes>Maintenance release: Incrementalist v0.2.1
+[Fixed: NRE during Incrementalist.ProjectSystem.Cmds.FilterAffectedProjectFilesCmd](https://github.com/petabridge/Incrementalist/issues/70)</PackageReleaseNotes>
     <tags>build, msbuild, incremental build, roslyn, git</tags>
     <PackageIconUrl>
       https://petabridge.com/images/logo.png
@@ -224,7 +221,7 @@
   <PropertyGroup>
     <NBenchVersion>1.2.2</NBenchVersion>
     <XunitVersion>2.4.1</XunitVersion>
-    <TestSdkVersion>16.3.0</TestSdkVersion>
+    <TestSdkVersion>16.4.0</TestSdkVersion>
     <RoslynVersion>3.3.1</RoslynVersion>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,10 @@ protected override async Task<Dictionary<string, SlnFile>> ProcessImpl(`
`92`	`92`	`if (projectImports.ContainsKey(file))`
`93`	`93`	`{`
`94`	`94`	`// Mark all dependant as affected`
`95`		`- projectImports[file].DependantProjects.ForEach(dependentProject => newDict[dependentProject.Path] = dependentProject.File);`
	`95`	`+ foreach (var dependentProject in projectImports[file].DependantProjects)`
	`96`	`+ {`
	`97`	`+ newDict[dependentProject.Path] = dependentProject.File;`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`	`}`
`98`	`101`