diff --git a/src/ResourceManager/Automation/AzureRM.Automation.psd1 b/src/ResourceManager/Automation/AzureRM.Automation.psd1 index 1fa668e4ee6b..7e7f658a4ca9 100644 --- a/src/ResourceManager/Automation/AzureRM.Automation.psd1 +++ b/src/ResourceManager/Automation/AzureRM.Automation.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '.\Microsoft.Azure.Commands.Automation.dll' + '.\Microsoft.Azure.Commands.ResourceManager.Automation.dll' ) # Functions to export from this module diff --git a/tools/AzureRM/AzureRM.psm1-help.xml b/tools/AzureRM/AzureRM.psm1-help.xml new file mode 100644 index 000000000000..8d3ffcca984d --- /dev/null +++ b/tools/AzureRM/AzureRM.psm1-help.xml @@ -0,0 +1,474 @@ + + + + + Import-ModuleWithVersionCheck + + + + + + + Import + ModuleWithVersionCheck + + + + + + + + Import-ModuleWithVersionCheck + + Name + + + + String + + + MinimumVersion + + + + String + + + Repository + + + + String + + + Scope + + + + String + + + + + + Name + + + + String + + String + + + + + + MinimumVersion + + + + String + + String + + + + + + Repository + + + + String + + String + + + + + + Scope + + + + String + + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Uninstall-AzureRM + + Remove Azure Resource Manager cmdlet modules + + + + + Uninstall + AzureRM + + + + Removes all installed Azure Resource Manager cmdlet modules. + + + + Uninstall-AzureRM + + Repository + + + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + + + Repository + + + + String + + String + + + + + + InformationAction + + + + ActionPreference + + ActionPreference + + + + + + InformationVariable + + + + String + + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Update-AzureRM + + Install Azure Resource Manager cmdlet modules + + + + + Update + AzureRM + + + + Installs all the available Azure Resource Manager cmdlet modules. + + + + Update-AzureRM + + Repository + + Limit the search for "AzureRM" cmdlets in a specific repository. + + String + + + Scope + + Specifies the parameter scope. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + + + Repository + + Limit the search for "AzureRM" cmdlets in a specific repository. + + String + + String + + + + + + Scope + + Specifies the parameter scope. + + String + + String + + + + + + InformationAction + + + + ActionPreference + + ActionPreference + + + + + + InformationVariable + + + + String + + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Validate-AdminRights + + Validate this session is running as Administrator + + + + + Validate + AdminRights + + + + Validate this session is running as Administrator to ensure Install-Module, Update-Module and Uninstall module will function properly for the given run scope of the AzureRM PowerShellGet commands. + + + + Validate-AdminRights + + Scope + + + + String + + + + + + Scope + + + + String + + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 index cb36ae2468db..d4f54cd3a50b 100644 --- a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 +++ b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 @@ -382,11 +382,6 @@ function Get-AllBuildServerCommands { $OutputPath = $OutputPath.Substring(0,$OutputPath.Length - 1) } - - #Get Folder Date - $Date = Get-Date -UFormat "%Y-%m-%d.%H_%M_%S" - $OutputPath += "\" + $Date - #Find the Template XML $GettAllCommandsDirectory = ".\Templates" @@ -410,9 +405,11 @@ function Get-AllBuildServerCommands { #loop through each Nested Dll Foreach($NestedFile in $ManifestNestedModules) { - Write-Host "-----------------------------------------------" -ForegroundColor White + $ModuleOutputPath = $OutputPath + "\" + $NestedFile.Name - $ModuleOutputPath = (Get-Location).Path + $ModuleOutputPath.Substring(1,$ModuleOutputPath.Length - 1) + $ModuleOutputPath = (Get-Location).Path + $ModuleOutputPath.Substring(1,$ModuleOutputPath.Length - 1) + Write-Host "Module Output Path " $ModuleOutputPath + Write-Host "-----------------------------------------------" -ForegroundColor White New-Item -ItemType Directory -Path $ModuleOutputPath -ErrorAction SilentlyContinue | Out-Null @@ -422,7 +419,7 @@ function Get-AllBuildServerCommands { #Get the MAML, Split and Place it in the PSMAML directory $MamlOutPutPath = $ModuleOutputPath + "\MAML" - $NestedFile | Add-Member -MemberType NoteProperty -Name "HelpXmlPath" -Value ($NestedFile.Path + "-help.xml") + $NestedFile | Add-Member -MemberType NoteProperty -Name "HelpXmlPath" -Value ($NestedFile.Path + "-help.xml") -Force New-Item -ItemType Directory -Path $MamlOutPutPath | Out-Null if(Test-Path -Path $NestedFile.HelpXmlPath) { @@ -430,7 +427,7 @@ function Get-AllBuildServerCommands { Copy-Item -Path $NestedFile.HelpXmlPath -Destination $ModuleOutputPath $CommandsMissing = $false $MissingCommandsList = "" - Get-Command -Module $NestedFile.Name | ForEach-Object + Get-Command -Module $NestedFile.Name | ForEach-Object ` { if(!(Test-Path -Path ($ModuleOutputPath + "\PSMAML\" + $_.name + ".xml"))) { @@ -466,7 +463,7 @@ function Get-AllBuildServerCommands { #add in cmdlet names found in the module get-content $FileFullName | ` - Foreach + Foreach ` { $Cmdlet = $_.Trim() if ($Cmdlet.Contains("-") -eq $true -and $Cmdlet.Contains("--") -eq $false) @@ -581,7 +578,7 @@ function Get-AllBuildServerCommands { #write out individual xml files into main file Get-ChildItem -Path $ModuleOutputPath -Name -Include "*.xml" -Exclude 'PSProject_Writer.xml','*help.xml' | - ForEach-Object + ForEach-Object ` { [System.XML.XMLDocument] $docCmdlet = New-Object System.XML.XMLDocument $docCmdlet.Load((Join-Path -Path $ModuleOutputPath -ChildPath $_)) @@ -676,6 +673,12 @@ function Get-AllBuildServerCommands { } +rm .\Output -Recurse -Force -ErrorAction SilentlyContinue + #Comment these lines to selectivly build the output for either Service Management or Resource Manager -Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ServiceManagement\Azure\Azure.psd1" -Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ResourceManager\AzureResourceManager\AzureResourceManager.psd1" \ No newline at end of file +Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "..\..\..\src\Package\Debug\ServiceManagement\Azure\Azure.psd1" +Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "..\..\AzureRM\AzureRM.psd1" + +$modules = (Get-ChildItem "..\..\..\src\Package\Debug\ResourceManager" -Recurse -Include "*.psd1" -Exclude "*dll-help.psd1", "AzureResourceManager.psd1") | sort -Unique -Property Name +$modules | Foreach { Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName $_.FullName } +