Merge branch 'master' into dotnetCore

AArnott · AArnott · commit e7d29b37818b · 2017-02-18T08:00:55.000-08:00
diff --git a/src/NerdBank.GitVersioning.Tests/GitExtensionsTests.cs b/src/NerdBank.GitVersioning.Tests/GitExtensionsTests.cs
@@ -118,7 +118,7 @@ public void GetVersionHeight_VersionJsonHasParsingErrorsInHistory()
         Assert.Equal(1, this.Repo.GetVersionHeight());
 
         // And emulate fixing it without having checked in yet.
-        this.Repo.Reset(ResetMode.Mixed, this.Repo.Head.Commits.Skip(1).First());
+        this.Repo.Reset(ResetMode.Mixed, this.Repo.Head.Tip.Parents.Single());
         Assert.Equal(0, this.Repo.GetVersionHeight());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void GetVersionHeight_VersionJsonHasParsingErrorsInHistory()`
`118`	`118`	`Assert.Equal(1, this.Repo.GetVersionHeight());`
`119`	`119`
`120`	`120`	`// And emulate fixing it without having checked in yet.`
`121`		`- this.Repo.Reset(ResetMode.Mixed, this.Repo.Head.Commits.Skip(1).First());`
	`121`	`+ this.Repo.Reset(ResetMode.Mixed, this.Repo.Head.Tip.Parents.Single());`
`122`	`122`	`Assert.Equal(0, this.Repo.GetVersionHeight());`
`123`	`123`	`}`
`124`	`124`