Clean up the logic of hybrid module (#23535)

Author: wyunchi-ms

tools/ExecuteCIStep.ps1

@@ -311,11 +311,7 @@ If ($TestAutorest)
         Write-Warning "There is no test-module.ps1 found in the folder: $AutorestDirectory"
         Return
     }
-    $ModuleName = Split-Path -Path $AutorestDirectory -Leaf
-    If ($ModuleName.EndsWith(".Autorest"))
-    {
-        $ModuleName = Split-Path -Path $AutorestDirectory | Split-Path -Leaf
-    }
+    $ModuleName = Split-Path -Path $AutorestDirectory | Split-Path -Leaf
     $ModuleFolderName = $ModuleName.Split(".")[1]
     If (Test-Path $CIPlanPath)
     {

tools/Gen2Master/MoveFromGeneration2Master.ps1

@@ -177,7 +177,15 @@ Function Move-Generation2Master {
             }
             Import-Module $psd1Path
             Import-Module platyPS
-            Update-MarkdownHelpModule -Path "$DestPath\$ModuleName$Psd1FolderPostfix\help" -RefreshModulePage -AlphabeticParamsOrder -UseFullTypeName -ExcludeDontShow
+            $HelpFolder = "$DestPath\$ModuleName$Psd1FolderPostfix\help"
+            if ((Get-ChildItem $HelpFolder).Length -ne 0)
+            {
+                Update-MarkdownHelpModule -Path $HelpFolder -RefreshModulePage -AlphabeticParamsOrder -UseFullTypeName -ExcludeDontShow
+            }
+            else
+            {
+                New-MarkdownHelp -UseFullTypeName -AlphabeticParamsOrder -Module "Az.$ModuleName" -OutputFolder $HelpFolder
+            }
         } -ArgumentList $ModuleName, $DestPath, $Psd1FolderPostfix
 
         $job | Wait-Job | Receive-Job