Merge pull request #1324 from microsoft/develop

merge DEVELOP to MASTER (prep 2.12-Beta4)

Author: Timothy Mothra

.props/_GlobalStaticVersion.props

@@ -13,7 +13,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>12</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta3</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone>beta4</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
     <!-- 
       Date when Semantic Version was changed. 
       Update for every MINOR release.

.scripts/release_GenerateReleaseMetadata.ps1

@@ -127,7 +127,9 @@ Function Get-ChangelogText ([string]$sourcePath, [string]$versionName) {
     $readFile = $true
 
     $changelogPath = Get-ChildItem -Path $sourcePath -Recurse -Filter changelog.md | Select-Object -First 1
-    Write-Verbose "Changelog Found: $changelogPath"
+    Write-Verbose "Changelog Found: $($changelogPath.FullName)"
+	Write-Verbose "Searching for: $versionName";
+
     Get-Content -Path $changelogPath.FullName | ForEach-Object {
 
         if($readFile) {
@@ -142,10 +144,14 @@ Function Get-ChangelogText ([string]$sourcePath, [string]$versionName) {
                     [void]$sb.AppendLine($_)
                 }
             } else {
-                if(($_ -like "##*") -and ($_ -match $versionName)) {
-                    $saveLines = $true
-                    Write-Verbose "START at $_"
-                }
+				if($_ -like "##*")  {
+					Write-Verbose "Inspecting $_"
+				
+					if ($_ -match $versionName) {
+						$saveLines = $true
+						Write-Verbose "START at $_"
+					}
+				}
             }
         }