Merge branch 'hotfix/0.10.1'

nbuildkit · Jul 17, 2017 · 989573d · 989573d
2 parents d9d83fb + 28e4084
commit 989573d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/deploy.settings.props b/deploy.settings.props
@@ -342,7 +342,6 @@
             </PostSteps>
         </DeployStepsToExecute>
 
-        <!--
         <DeployStepsToExecute Include="$(DeployStepsPrepareReleaseNotes)">
             <Properties>
             </Properties>
@@ -356,7 +355,6 @@
             <PostSteps>
             </PostSteps>
         </DeployStepsToExecute>
-        -->
         <!--
         <DeployStepsToExecute Include="$(DeployStepsPrepareTagVcs)">
             <Properties>
@@ -535,7 +533,6 @@
         <!--
             The last step is pushing to NuGet because we can't remove packages from NuGet
         -->
-        <!--
         <DeployStepsToExecute
             Condition=" '$(IsMasterBranch)' == 'true' "
             Include="$(DeployStepsPushToNuget)">
@@ -552,7 +549,6 @@
             <PostSteps>
             </PostSteps>
         </DeployStepsToExecute>
-        -->
     </ItemGroup>
 
     <!--

diff --git a/...dkit/tasks/nBuildKit.MsBuild.Tasks/VersionControl/ExtractIssueIdsFromGitCommitMessages.cs b/...dkit/tasks/nBuildKit.MsBuild.Tasks/VersionControl/ExtractIssueIdsFromGitCommitMessages.cs
@@ -141,7 +141,11 @@ private string[] UnmergedCommits()
                 {
                     string.Format(CultureInfo.InvariantCulture, "cherry {0}", MergeTargetBranch)
                 });
-            return gitOutput.Replace("+ ", Environment.NewLine).Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            return gitOutput
+                .Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
+                .Where(l => l.StartsWith("+ ", StringComparison.OrdinalIgnoreCase))
+                .Select(l => l.Replace("+ ", string.Empty))
+                .ToArray();
         }
     }
 }