Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Author: hyonholee

ChangeLog.md

@@ -51,6 +51,13 @@
   * Set-AzureVMSqlServerExtension
   * Get-AzureVMSqlServerExtension
   * Remove-AzureVMSqlServerExtension
+* Azure SQL Database Index Recommendation Cmdlets
+  * Get-AzureSqlDatabaseIndexRecommendations
+  * Start-AzureSqlDatabaseExecuteIndexRecommendation
+  * Stop-AzureSqlDatabaseExecuteIndexRecommendation
+* Azure SQL Database and Server Upgrade Hints Cmdlets
+  * Get-AzureSqlDatabaseUpgradeHint
+  * Get-AzureSqlServerUpgradeHint
 
 ## 2015.08.17 version 0.9.7
 * Azure Profile cmdlets

setup-powershellget/Setup/ShortcutStartup.ps1

@@ -11,10 +11,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ----------------------------------------------------------------------------------
-[CmdletBinding()]
+[CmdletBinding(DefaultParametersetName="none")]
 Param(
-[Parameter(Mandatory=$False, HelpMessage="Use Install parameter to install Azure modules from PowerShell Gallery.")]
-[switch]$Install
+[Parameter(Mandatory=$True, HelpMessage="Use Install parameter to install Azure modules from PowerShell Gallery.", ParameterSetName="install")]
+[switch]$Install,
+[Parameter(Mandatory=$True, HelpMessage="Use Uninstall parameter to uninstall Azure modules from PowerShell Gallery.", ParameterSetName="uninstall")]
+[switch]$Uninstall
 )
 
 function EnsureRegistryPath
@@ -35,11 +37,10 @@ function EnsureRegistryPath
 $error.clear()
 try {
 	if ($Install.IsPresent) {
-		EnsureRegistryPath
 		Write-Output @"
 
 Finalizing installation of Azure PowerShell. 
-Installing Azure Modules from PowerShell Gallery. 
+Installing AzureRM Modules from PowerShell Gallery. 
 This may take some time...
 "@
 		$env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"
@@ -50,14 +51,47 @@ This may take some time...
 
 		Import-Module PowerShellGet
 
-		Install-Module AzureRM
-		Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
-		Update-AzureRM
-	} else {
+		$DefaultPSRepository = $env:DefaultPSRepository
+		if ([string]::IsNullOrWhiteSpace($DefaultPSRepository)) 
+		{
+			$DefaultPSRepository = "PSGallery"
+		}
+
+		$_InstallationPolicy = (Get-PSRepository -Name $DefaultPSRepository).InstallationPolicy
+		try 
+		{
+			Set-PSRepository -Name $DefaultPSRepository -InstallationPolicy Trusted
+		
+			Install-Module AzureRM -Repository $DefaultPSRepository
+			Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
+
+			Update-AzureRM -Repository $DefaultPSRepository
+		} finally {
+			# Clean up
+			Set-PSRepository -Name $DefaultPSRepository -InstallationPolicy $_InstallationPolicy
+		}
+	}
+	elseif ($Uninstall.IsPresent) 
+	{
+		Write-Output @"
+
+Finalizing uninstallation of Azure PowerShell. 
+This may take some time...
+"@
+		$env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"
+
+		Uninstall-AzureRM
+		Uninstall-Module -Name AzureRM -Confirm:$false -Force
+	} 
+	else 
+	{
 		cd c:\
 		$welcomeMessage = @"
-For a list of all Azure cmdlets type 'help azure'.
-For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
+For a list of all Azure RM cmdlets type 'help azurerm'.
+
+To start using Azure RM login via Login-AzureRmAccount cmdlet.
+To switch between subscriptions use Set-AzureRmContext.
+For more details, see http://aka.ms/azps-getting-started.
 
 To use Azure Service Management cmdlets please execute the following cmdlet:
   Install-Module Azure
@@ -72,6 +106,6 @@ catch
 Write-Output "An error occured during installation."
 Write-Output $error 
 Write-Output "Press any key..."
-$host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+$key = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
 }
 

setup-powershellget/azurecmd.wxs

@@ -97,12 +97,14 @@
     <CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
     <CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;Set-ExecutionPolicy RemoteSigned -Force&quot;" Execute="deferred" Impersonate="no" Return="check"/>
     <CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Install&quot;" Execute="deferred" Impersonate="no" Return="check"/>
+    <CustomAction Id="RunModuleUninstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Uninstall&quot;" Execute="deferred" Impersonate="no" Return="check"/>
 
     <InstallExecuteSequence>
       <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
       <Custom Action="UpdatePSShortcut" After="SetCustomActionDataValue">NOT Installed</Custom>
       <Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
       <Custom Action="RunModuleInstallScript" After="SetExecutionPolicy">NOT Installed</Custom>
+      <Custom Action="RunModuleUninstallScript" After="InstallInitialize">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
     </InstallExecuteSequence>
 
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />