Merge pull request #101 from Azure/dev

.

Author: huangpf

setup-powershellget/Setup/ShortcutStartup.ps1

@@ -17,11 +17,30 @@ Param(
 [switch]$Install
 )
 
-cd c:\
-$welcomeMessage = @"
+$error.clear()
+try {
+	if ($Install.IsPresent) {
+		Write-Output @"
+
+Finalizing installation of Azure PowerShell. 
+Installing Azure Modules from PowerShell Gallery. 
+This may take some time...
+"@
+		Get-PackageProvider -Name NuGet -ForceBootstrap
+		Install-Module AzureRM.Installer
+		Install-AzureRM
+	} 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*'.
 "@
-Write-Output $welcomeMessage
+		Write-Output $welcomeMessage
 
-$VerbosePreference = "Continue"
+		$VerbosePreference = "Continue"
+	}
+}
+catch { Write-Output $error }
+if ($error) {
+	Read-Host -Prompt "An error occured during installation. Press any key..."
+}

setup-powershellget/azurecmd.wxs

@@ -102,7 +102,7 @@
     <CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
                      Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
     <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 -Install\&quot;&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"/>
 
     <InstallExecuteSequence>
       <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>

setup/azurecmdfiles.wxi

@@ -55,17 +55,17 @@ ScriptsToProcess = @()
 
 # Type files (.ps1xml) to be loaded when importing this module  
 TypesToProcess = @(
-	'.\Microsoft.WindowsAzure.Commands.Storage.Types.ps1xml'
+    '.\Microsoft.WindowsAzure.Commands.Storage.Types.ps1xml'
 )
 
 # Format files (.ps1xml) to be loaded when importing this module  
 FormatsToProcess = @(
-	'.\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml'
+    '.\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml'
 )
 
 # Modules to import as nested modules of the module specified in ModuleToProcess  
 NestedModules = @(  
-    '.\Microsoft.WindowsAzure.Commands.Storage.dll',
+    '.\Microsoft.WindowsAzure.Commands.Storage.dll'
 )
 
 # Functions to export from this module  
@@ -79,7 +79,7 @@ VariablesToExport = '*'
 
 # Aliases to export from this module  
 AliasesToExport = @(
-	'Get-AzureRMStorageContainerAcl',  
+    'Get-AzureRMStorageContainerAcl',  
     'Start-CopyAzureStorageBlob',  
     'Stop-CopyAzureStorageBlob'
 )

src/Common/Storage/Azure.Storage.psd1

@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.AzureBackup\</OutputPath>
+    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Backup\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.AzureBackup\</OutputPath>
+    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Backup\</OutputPath>
     <DefineConstants>TRACE;SIGN</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -192,8 +192,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\AzureRM.AzureBackup.psd1">
-      <Link>AzureRM.AzureBackup.psd1</Link>
+    <None Include="..\AzureRM.Backup.psd1">
+      <Link>AzureRM.Backup.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Microsoft.Azure.Commands.AzureBackup.dll-help.psd1" />

src/ResourceManager/AzureBackup/AzureRM.AzureBackup.psd1 renamed to src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.AzureBatch\</OutputPath>
+    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Batch\</OutputPath>
     <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.AzureBatch\</OutputPath>
+    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Batch\</OutputPath>
     <DefineConstants>TRACE;SIGN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj

@@ -58,7 +58,7 @@ TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module  
 FormatsToProcess = @(
-	'.\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml'
+    '.\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml'
 )
 
 # Modules to import as nested modules of the module specified in ModuleToProcess  

src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj

@@ -164,6 +164,7 @@
   <ItemGroup>
     <None Include="..\AzureRM.OperationalInsights.psd1">
       <Link>AzureRM.OperationalInsights.psd1</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1" />
     <Content Include="Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml">

src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1

@@ -64,7 +64,7 @@ FormatsToProcess = @(
 # Modules to import as nested modules of the module specified in ModuleToProcess  
 NestedModules = @(  
     '.\Microsoft.Azure.Commands.Resources.dll',
-	'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll',
+	'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll'
 )
 
 # Functions to export from this module