Merge pull request #220 from vlef/fix-merge-results-creates-file

tonerdo · web-flow · commit b54c93cf7ce1 · 2018-10-22T04:07:49.000+01:00
Merging should not fail if file doesn't exist
diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs
@@ -151,7 +151,7 @@ public CoverageResult GetCoverageResult()
             }
 
             var coverageResult = new CoverageResult { Identifier = _identifier, Modules = modules };
-            if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith))
+            if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith) && File.Exists(_mergeWith))
             {
                 string json = File.ReadAllText(_mergeWith);
                 coverageResult.Merge(JsonConvert.DeserializeObject<Modules>(json));

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public CoverageResult GetCoverageResult()`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`var coverageResult = new CoverageResult { Identifier = _identifier, Modules = modules };`
`154`		`- if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith))`
	`154`	`+ if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith) && File.Exists(_mergeWith))`
`155`	`155`	`{`
`156`	`156`	`string json = File.ReadAllText(_mergeWith);`
`157`	`157`	`coverageResult.Merge(JsonConvert.DeserializeObject<Modules>(json));`