Merge pull request #169 from AArnott/user/benmer/NewGetBuildVersionParameterForGitProjectRelativePath

AArnott · web-flow · commit 39ac76891c8e · 2018-02-12T10:20:30.000-08:00
Fix Requires logic in msbuild task
diff --git a/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs b/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs
@@ -177,7 +177,7 @@ protected override bool ExecuteInner()
             {
                 if (!string.IsNullOrEmpty(this.ProjectPathRelativeToGitRepoRoot))
                 {
-                    Requires.Argument(Path.IsPathRooted(this.ProjectPathRelativeToGitRepoRoot), nameof(this.ProjectPathRelativeToGitRepoRoot), "Path must be relative.");
+                    Requires.Argument(!Path.IsPathRooted(this.ProjectPathRelativeToGitRepoRoot), nameof(this.ProjectPathRelativeToGitRepoRoot), "Path must be relative.");
                     Requires.Argument(!(
                         this.ProjectPathRelativeToGitRepoRoot.Contains(".." + Path.DirectorySeparatorChar) || 
                         this.ProjectPathRelativeToGitRepoRoot.Contains(".." + Path.AltDirectorySeparatorChar)),

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ protected override bool ExecuteInner()`
`177`	`177`	`{`
`178`	`178`	`if (!string.IsNullOrEmpty(this.ProjectPathRelativeToGitRepoRoot))`
`179`	`179`	`{`
`180`		`- Requires.Argument(Path.IsPathRooted(this.ProjectPathRelativeToGitRepoRoot), nameof(this.ProjectPathRelativeToGitRepoRoot), "Path must be relative.");`
	`180`	`+ Requires.Argument(!Path.IsPathRooted(this.ProjectPathRelativeToGitRepoRoot), nameof(this.ProjectPathRelativeToGitRepoRoot), "Path must be relative.");`
`181`	`181`	`Requires.Argument(!(`
`182`	`182`	`this.ProjectPathRelativeToGitRepoRoot.Contains(".." + Path.DirectorySeparatorChar) \|\|`
`183`	`183`	`this.ProjectPathRelativeToGitRepoRoot.Contains(".." + Path.AltDirectorySeparatorChar)),`