Merge remote-tracking branch 'jazzdelightsme/personal/danthom/WhatIfNoRepo_103' into fix103

AArnott · AArnott · commit 4d95d36dcd87 · 2016-12-30T18:48:15.000-08:00
diff --git a/src/NerdBank.GitVersioning/VersionOracle.cs b/src/NerdBank.GitVersioning/VersionOracle.cs
@@ -278,6 +278,9 @@ private static LibGit2Sharp.Repository OpenGitRepo(string repoRoot)
 
         private static Version GetAssemblyVersion(Version version, VersionOptions versionOptions)
         {
+            // If there is no repo, "version" could have uninitialized components (-1).
+            version = version.EnsureNonNegativeComponents();
+
             var assemblyVersion = versionOptions?.AssemblyVersion?.Version ?? new System.Version(version.Major, version.Minor);
             assemblyVersion = new System.Version(
                 assemblyVersion.Major,

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,9 @@ private static LibGit2Sharp.Repository OpenGitRepo(string repoRoot)`
`278`	`278`
`279`	`279`	`private static Version GetAssemblyVersion(Version version, VersionOptions versionOptions)`
`280`	`280`	`{`
	`281`	`+ // If there is no repo, "version" could have uninitialized components (-1).`
	`282`	`+ version = version.EnsureNonNegativeComponents();`
	`283`	`+`
`281`	`284`	`var assemblyVersion = versionOptions?.AssemblyVersion?.Version ?? new System.Version(version.Major, version.Minor);`
`282`	`285`	`assemblyVersion = new System.Version(`
`283`	`286`	`assemblyVersion.Major,`