Merge branch 'master' into patch-1

asbjornu · web-flow · commit 02c897830cf6 · 2020-01-03T15:21:43.000+01:00
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -2,29 +2,29 @@
   "Major":1,
   "Minor":2,
   "Patch":3,
-  "PreReleaseTag":"unstable.5",
-  "PreReleaseTagWithDash":"-unstable.5",
+  "PreReleaseTag":"unstable.8",
+  "PreReleaseTagWithDash":"-unstable.8",
   "PreReleaseLabel":"unstable",
-  "PreReleaseNumber":5,
-  "WeightedPreReleaseNumber":5,
+  "PreReleaseNumber":8,
+  "WeightedPreReleaseNumber":8,
   "BuildMetaData":"",
   "BuildMetaDataPadded":"",
   "FullBuildMetaData":"Branch.develop.Sha.commitSha",
   "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3-unstable.5",
-  "LegacySemVer":"1.2.3-unstable5",
-  "LegacySemVerPadded":"1.2.3-unstable0005",
+  "SemVer":"1.2.3-unstable.8",
+  "LegacySemVer":"1.2.3-unstable8",
+  "LegacySemVerPadded":"1.2.3-unstable0008",
   "AssemblySemVer":"1.2.3.0",
   "AssemblySemFileVer":"1.2.3.0",
-  "FullSemVer":"1.2.3-unstable.5",
-  "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
+  "FullSemVer":"1.2.3-unstable.8",
+  "InformationalVersion":"1.2.3-unstable.8+Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
   "ShortSha":"commitShortSha",
-  "NuGetVersionV2":"1.2.3-unstable0005",
-  "NuGetVersion":"1.2.3-unstable0005",
-  "NuGetPreReleaseTagV2":"unstable0005",
-  "NuGetPreReleaseTag":"unstable0005",
+  "NuGetVersionV2":"1.2.3-unstable0008",
+  "NuGetVersion":"1.2.3-unstable0008",
+  "NuGetPreReleaseTagV2":"unstable0008",
+  "NuGetPreReleaseTag":"unstable0008",
   "VersionSourceSha":"versionSourceSha",
   "CommitsSinceVersionSource":5,
   "CommitsSinceVersionSourcePadded":"0005",
diff --git a/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs b/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs
@@ -44,7 +44,7 @@ public void EscapeValues()
             var versionBuilder = new AzurePipelines(environment, log);
             var vsVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
 
-            vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+            vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;isOutput=true]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -273,5 +273,21 @@ public void CommitsSinceVersionSourceShouldNotGoDownUponMergingFeatureOnlyToDeve
             var expectedFullSemVer = "1.3.0-alpha.5";
             fixture.AssertFullSemver(config, expectedFullSemVer);
         }
+
+        [Test]
+        public void PreviousPreReleaseTagShouldBeRespectedWhenCountingCommits()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+
+            fixture.Repository.MakeACommit();
+
+            fixture.BranchTo("develop");
+            fixture.MakeATaggedCommit("1.0.0-alpha.3"); // manual bump version
+
+            fixture.MakeACommit();
+            fixture.MakeACommit();
+
+            fixture.AssertFullSemver("1.0.0-alpha.5");
+        }
     }
 }
diff --git a/src/GitVersionCore/BuildServers/AzurePipelines.cs b/src/GitVersionCore/BuildServers/AzurePipelines.cs
@@ -21,7 +21,7 @@ public override string[] GenerateSetParameterMessage(string name, string value)
         {
             return new[]
             {
-                $"##vso[task.setvariable variable=GitVersion.{name};]{value}"
+                $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"
             };
         }
 
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
-        <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All"></PackageReference>
+        <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.1" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.1" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -102,9 +102,25 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti
         private static void PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVersion)
         {
             // For continuous deployment the commits since tag gets promoted to the pre-release number
-            semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
-            semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag ?? 0;
-            semanticVersion.BuildMetaData.CommitsSinceTag = null;
+            if (!semanticVersion.BuildMetaData.CommitsSinceTag.HasValue)
+            {
+                semanticVersion.PreReleaseTag.Number = null;
+                semanticVersion.BuildMetaData.CommitsSinceVersionSource = 0;
+            }
+            else
+            {
+                // Number of commits since last tag should be added to PreRelease number if given. Remember to deduct automatic version bump.
+                if (semanticVersion.PreReleaseTag.Number.HasValue)
+                {
+                    semanticVersion.PreReleaseTag.Number += semanticVersion.BuildMetaData.CommitsSinceTag - 1;
+                }
+                else
+                {
+                    semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
+                }
+                semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag.Value;
+                semanticVersion.BuildMetaData.CommitsSinceTag = null; // why is this set to null ?
+            }
         }
 
         private static string CheckAndFormatString<T>(string formatString, T source, IEnvironment environment, string defaultValue, string formatVarName)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void EscapeValues()`
`44`	`44`	`var versionBuilder = new AzurePipelines(environment, log);`
`45`	`45`	`var vsVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");`
`46`	`46`
`47`		`- vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");`
	`47`	`+ vsVersion[0].ShouldBe("##vso[task.setvariable variable=GitVersion.Foo;isOutput=true]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public override string[] GenerateSetParameterMessage(string name, string value)`
`21`	`21`	`{`
`22`	`22`	`return new[]`
`23`	`23`	`{`
`24`		`- $"##vso[task.setvariable variable=GitVersion.{name};]{value}"`
	`24`	`+ $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"`
`25`	`25`	`};`
`26`	`26`	`}`
`27`	`27`