Fixes for PublishedModules

ogail · ogail · commit 43e30af9236d · 2015-09-30T16:23:27.000-07:00
- Remove fake error thrown upon publishing AzureRM module
- Include AzureRM module in All scope
diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1
@@ -76,7 +76,7 @@ if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) {
     Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName
 } 
 
-if ($scope -eq 'AzureRM') {
+if (($scope -eq 'All') -or ($scope -eq 'AzureRM')) {
     # Publish AzureRM module    
     $modulePath = "$PSScriptRoot\AzureRM"
     Write-Host "Publishing AzureRM module from $modulePath"
@@ -96,7 +96,7 @@ if ($scope -eq 'All') {
             Write-Host "Published $module module"
         }
     }
-} else {
+} elseif ($scope -ne 'AzureRM') {
     $modulePath = Join-Path $resourceManagerRootFolder "AzureRM.$scope"
     if (Test-Path $modulePath) {
         Write-Host "Publishing $scope module from $modulePath"

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) {`
`76`	`76`	`Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName`
`77`	`77`	`}`
`78`	`78`
`79`		`-if ($scope -eq 'AzureRM') {`
	`79`	`+if (($scope -eq 'All') -or ($scope -eq 'AzureRM')) {`
`80`	`80`	`# Publish AzureRM module`
`81`	`81`	`$modulePath = "$PSScriptRoot\AzureRM"`
`82`	`82`	`Write-Host "Publishing AzureRM module from $modulePath"`
`@@ -96,7 +96,7 @@ if ($scope -eq 'All') {`
`96`	`96`	`Write-Host "Published $module module"`
`97`	`97`	`}`
`98`	`98`	`}`
`99`		`-} else {`
	`99`	`+} elseif ($scope -ne 'AzureRM') {`
`100`	`100`	`$modulePath = Join-Path $resourceManagerRootFolder "AzureRM.$scope"`
`101`	`101`	`if (Test-Path $modulePath) {`
`102`	`102`	`Write-Host "Publishing $scope module from $modulePath"`