Merge pull request Azure#4539 from cormacpayne/demand-fix

Fix failure in on-demand build caused by HelpGeneration script

Author: cormacpayne

setup/azurecmdfiles.wxi

@@ -1556,9 +1556,6 @@
                         <Component Id="cmpC67F14F377421F1BCD74EC5A579D43CB" Guid="*">
                             <File Id="filE9553CEC1D67AB3D4B77759239D60B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll-Help.xml" />
                         </Component>
-                        <Component Id="cmpD844DA64698210481D550B5CD8799D26" Guid="*">
-                            <File Id="filA23D9B350E9B87D17B90B2181AE71E4B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.format.ps1xml" />
-                        </Component>
                         <Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
                             <File Id="filB571C170B96736E7EE17BBF869A203A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -5842,7 +5839,6 @@
             <ComponentRef Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" />
             <ComponentRef Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" />
             <ComponentRef Id="cmpC67F14F377421F1BCD74EC5A579D43CB" />
-            <ComponentRef Id="cmpD844DA64698210481D550B5CD8799D26" />
             <ComponentRef Id="cmp31610C192ED2776279BBDA3D9905552E" />
             <ComponentRef Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" />
             <ComponentRef Id="cmpB2620706D83DB49D3434BB39A5495055" />

tools/HelpGeneration/HelpGeneration.psm1

@@ -118,6 +118,11 @@ function Validate-MarkdownHelp
                             if ($content[$idx+1] -notcontains "## SYNTAX")
                             {
                                 $idx++
+                                if ($idx -ge $content.Length)
+                                {
+                                    Write-Error "Could not find SYNTAX header in file $($file.Name)"
+                                    return
+                                }
                             }
                             elseif ($content[$idx] -contains "{{Fill in the Synopsis}}")
                             {
@@ -147,6 +152,11 @@ function Validate-MarkdownHelp
                             if ($content[$idx+1] -notcontains "## EXAMPLES")
                             {
                                 $idx++
+                                if ($idx -ge $content.Length)
+                                {
+                                    Write-Error "Could not find EXAMPLES header in file $($file.Name)"
+                                    return
+                                }
                             }
                             elseif ($content[$idx] -contains "{{Fill in the Description}}")
                             {
@@ -167,9 +177,14 @@ function Validate-MarkdownHelp
                     "## EXAMPLES"
                     {
                         # Move the index to the start of the PowerShell code
-                        while ($content[$idx] -notcontains "``````")
+                        while ($content[$idx] -notcontains "``````" -and $content[$idx] -notcontains "``````powershell")
                         {
                             $idx++
+                            if ($idx -ge $content.Length)
+                            {
+                                Write-Error "Could not find start of PowerShell example in file $($file.Name)"
+                                return
+                            }
                         }
 
                         # Check for the platyPS example template