Merge the commit from preview branch to Storage OAuth branch

.travis.yml

@@ -5,7 +5,7 @@ dotnet: 2.1.2
 dist: trusty
 
 env:
-  - NAME="azure-powershell-core" CONFIG="Release"
+  - NAME="azure-powershell-core" CONFIG="Debug"
 
 services:
  - docker
@@ -21,13 +21,14 @@ before_install:
 
 script:
  - dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG
+ - dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter="AcceptanceType=CheckIn" --configuration $CONFIG
 
 after_success:
  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     docker build . -t $DOCKER_USER/$NAME:$TRAVIS_COMMIT --build-arg CONFIG=$CONFIG;
     docker tag $DOCKER_USER/$NAME:$TRAVIS_COMMIT $DOCKER_USER/$NAME:$TRAVIS_BRANCH;
 
-    docker login -u $DOCKER_USER -p $DOCKER_PASS;
+    echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin;
 
     docker push $DOCKER_USER/$NAME:$TRAVIS_COMMIT;
     docker push $DOCKER_USER/$NAME:$TRAVIS_BRANCH;

AzurePowershell.Test.targets

@@ -7,7 +7,6 @@
 		<CommonTestDebug>.\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
 		<BackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll</BackupTestDebug>
 		<RecoveryServicesBackupTestDebug>.\src\ResourceManager\AzureBackup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll</RecoveryServicesBackupTestDebug>
-		<SiteRecoveryTestDebug>.\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll</SiteRecoveryTestDebug>
 		<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
 		<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
 		<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>

README.md

@@ -38,7 +38,7 @@ To install the module containing the legacy RDFE cmdlets, run the following comm
 Install-Module -Name Azure
 ```
 
-If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session:
+If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session. Update-Module installs the new version side-by-side with the old version. It does not remove the old version.
 
 ```powershell
 # Update to the latest version of AzureRM

TestMappings.json

@@ -94,6 +94,9 @@
   "src/ResourceManager/IotHub/": [
     ".\\src\\ResourceManager\\IotHub\\Commands.IotHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.IotHub.Test.dll"
   ],
+  "src/ResourceManager/DeviceProvisioningServices/": [
+    ".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
+  ],
   "src/ResourceManager/KeyVault/": [
     ".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
     ".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll",
@@ -141,8 +144,7 @@
   ],
   "src/ResourceManager/RecoveryServices/": [
     ".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
-    ".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll",
-    ".\\src\\ResourceManager\\SiteRecovery\\Commands.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.SiteRecovery.Test.dll"
+    ".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
   ],
   "src/ResourceManager/RedisCache/": [
     ".\\src\\ResourceManager\\RedisCache\\Commands.RedisCache.Test\\bin\\Debug\\Microsoft.Azure.Commands.RedisCache.Test.dll"
@@ -159,16 +161,12 @@
   "src/ResourceManager/Scheduler/": [
     ".\\src\\ResourceManager\\Scheduler\\Commands.Scheduler.Test\\bin\\Debug\\Microsoft.Azure.Commands.Scheduler.Test.dll"
   ],
-  "src/ResourceManager/ServerManagement/": [],
   "src/ResourceManager/ServiceBus/": [
     ".\\src\\ResourceManager\\ServiceBus\\Commands.ServiceBus.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceBus.Test.dll"
   ],
   "src/ResourceManager/ServiceFabric/": [
     ".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll"
   ],
-  "src/ResourceManager/SiteRecovery/": [
-    ".\\src\\ResourceManager\\SiteRecovery\\Commands.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.SiteRecovery.Test.dll"
-  ],
   "src/ResourceManager/Sql/": [
     ".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll"
   ],

build.proj

@@ -53,7 +53,7 @@
     <NetCore Condition=" $(NetCore) == '' " >false</NetCore>
     <SkipHelp Condition =" '$(SkipHelp)' == '' ">false</SkipHelp>
     <BuildTasksPath>$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks\bin\$(Configuration)</BuildTasksPath>
-    <Stack Condition = "'$(Scope)' == '' or '$(Scope)' == 'all' or '$(Scope)' == 'Stack' ">true</Stack>
+    <Stack Condition = "(('$(Scope)' == '' or '$(Scope)' == 'all') and '$(NetCore)' == 'false') or '$(Scope)' == 'Stack' ">true</Stack>
     <Latest Condition = "'$(Scope)' == '' or '$(Scope)' != 'Stack'">true</Latest>
   </PropertyGroup>
   <ItemGroup>
@@ -71,7 +71,7 @@
 
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
     <LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
-	  <LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" />
+	  <LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
   </ItemGroup>
 
   <!-- Tasks -->
@@ -417,7 +417,7 @@
       Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
 
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(LibrarySourceFolder)\Package\$(Configuration) &quot;"
-        ContinueOnError="ErrorAndContinue" />
+        ContinueOnError="ErrorAndContinue" Condition="'$(NetCore)' == 'false'"/>
 
     <!-- Copying signed shortcut back -->
     <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"

documentation/azure-powershell-modules.md

@@ -60,10 +60,8 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Reservations                          | `AzureRM.Reservations`                  | [![Reservations](https://img.shields.io/powershellgallery/v/AzureRM.Reservations.svg?style=flat-square&label=AzureRM.Reservations)](https://www.powershellgallery.com/packages/AzureRM.Reservations/) |
 | Resources                             | `AzureRM.Resources`                     | [![Resources](https://img.shields.io/powershellgallery/v/AzureRM.Resources.svg?style=flat-square&label=AzureRM.Resources)](https://www.powershellgallery.com/packages/AzureRM.Resources/) |
 | Scheduler                             | `AzureRM.Scheduler`                     | [![Scheduler](https://img.shields.io/powershellgallery/v/AzureRM.Scheduler.svg?style=flat-square&label=AzureRM.Scheduler)](https://www.powershellgallery.com/packages/AzureRM.Scheduler/) |
-| Server Management                     | `AzureRM.ServerManagement`              | [![Server Management](https://img.shields.io/powershellgallery/v/AzureRM.ServerManagement.svg?style=flat-square&label=AzureRM.ServerManagement)](https://www.powershellgallery.com/packages/AzureRM.ServerManagement/) |
 | Service Bus                           | `AzureRM.ServiceBus`                    | [![Service Bus](https://img.shields.io/powershellgallery/v/AzureRM.ServiceBus.svg?style=flat-square&label=AzureRM.ServiceBus)](https://www.powershellgallery.com/packages/AzureRM.ServiceBus/) |
 | Service Fabric                        | `AzureRM.ServiceFabric`                 | [![Service Fabric](https://img.shields.io/powershellgallery/v/AzureRM.ServiceFabric.svg?style=flat-square&label=AzureRM.ServiceFabric)](https://www.powershellgallery.com/packages/AzureRM.ServiceFabric/) |
-| Site Recovery                         | `AzureRM.SiteRecovery`                  | [![Site Recovery](https://img.shields.io/powershellgallery/v/AzureRM.SiteRecovery.svg?style=flat-square&label=AzureRM.SiteRecovery)](https://www.powershellgallery.com/packages/AzureRM.SiteRecovery/) |
 | Sql                                   | `AzureRM.Sql`                           | [![Sql](https://img.shields.io/powershellgallery/v/AzureRM.Sql.svg?style=flat-square&label=AzureRM.Sql)](https://www.powershellgallery.com/packages/AzureRM.Sql/) |
 | Storage                               | `AzureRM.Storage`                       | [![Storage](https://img.shields.io/powershellgallery/v/AzureRM.Storage.svg?style=flat-square&label=AzureRM.Storage)](https://www.powershellgallery.com/packages/AzureRM.Storage/) |
 | Stream Analytics                      | `AzureRM.StreamAnalytics`               | [![Stream Analytics](https://img.shields.io/powershellgallery/v/AzureRM.StreamAnalytics.svg?style=flat-square&label=AzureRM.StreamAnalytics)](https://www.powershellgallery.com/packages/AzureRM.StreamAnalytics/) |

documentation/development-docs/azure-powershell-developer-guide.md

@@ -54,7 +54,7 @@ The following prerequisites should be completed before contributing to the Azure
 - Install the latest version of [Git](https://git-scm.com/downloads)
 - Install the latest version of [WiX](http://wixtoolset.org/releases/)
     - After installation, ensure that the path to "WiX Toolset\bin" has been added to your `PATH` environment variable
-- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/help-generation.md#installing-platyps)
+- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md#installing-platyps)
 - Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
     - `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
     - `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`

documentation/development-docs/vm-for-partners.md

@@ -0,0 +1,140 @@
+If you need an Azure Virtual Machine with all the [prerequisites](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#prerequisites) installed and ready to build and test Powershell Azure - follow the steps below. 
+
+# Copy the PowerShell Azure VHD blob to your subscription and create a VM from it.
+
+1. Make sure that you have the version 4.5.0 or above of the AzureRM.Compute PowerShell module. Run the following command to install it. This version has the "easy VM create" cmdlet that we are going to use in the script below to create a VM.
+    ```PowerShell
+    Install-Module AzureRM.Compute --MinimumVersion  4.5.0
+    ```
+2. Email [email protected] to obtain a VHD SAS URI, and assign that unique URI to the variable below.
+    ```PowerShell
+    $VhdSasUri = <vhd-sas-uri-requested-from-us>
+    ```
+3. Create some variables. **_Before setting the ```$Location``` variable - make sure your subscription supports virtual machine creation in the location._**
+   ```PowerShell
+    $SubscriptionId = <subscription-id>
+    $ResourceGroupName = <resource-group-name>
+    #Make sure your subscription supports virtual machine creation in the location.
+    $Location = <location>
+
+    $Random_5_digits = Get-Random -SetSeed (Get-Date).Second | ForEach-Object {$_.ToString().Substring(5)}
+    $StorageAccountName = "poshazureenv" + $Random_5_digits
+    $StorageContainerName = "vhds"
+
+    $VhdFileName = "ps-azure-env.vhd"
+    $ImageName = "ps-azure-env-image"
+    $VmName = "ps-azure-env"
+    $VMSize= "Standard_D4s_v3"
+
+    $VmLogin = <login>
+    $VmPassword = <password>
+
+    $ErrorActionPreference = "Stop"
+    $VmCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $VmLogin, $(ConvertTo-SecureString -String $VmPassword -AsPlainText -Force)
+   ```
+4. Sign in to your Azure account.
+    ```PowerShell
+    Connect-AzureRmAccount
+    ```
+5. Execute the Powershell script. The script essentially does the following:
+    1. Checks if a **resource group** with the name ```$ResourceGroupName``` exists if not - creates it for you.
+    2. Checks if a **storage account**  with the name ```$StorageAccountName``` exists if not - creates it for you.
+    3. Checks if a **storage account container** with the name ```$StorageAccountName``` exists if not - creates it for you.
+    4. Copies a **VHD** from the location ```$VhdSasUri``` to you storage account container.
+    5. Creates an **image** form the VHD with the ```$ImageName``` name.
+    5. Creates a **VM** from the image with the ```$VmName``` name.
+    ```PowerShell    
+    function SelectSubscription() {
+        Write-Host "==> SelectSubscription"
+        $null = Select-AzureRmSubscription -SubscriptionId $SubscriptionId    
+    }
+
+    function CreateResourceGroupIfNone() {
+        Write-Host "==> CreateResourceGroupIfNone"
+        $null = Get-AzureRmResourceGroup -Name $ResourceGroupName -ErrorVariable rgNotPresent -ErrorAction SilentlyContinue 
+        if ($rgNotPresent) {
+            $null = New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location
+            Write-Host "`tCreated resource group $ResourceGroupName" -ForegroundColor Yellow
+        }
+    }
+
+    function CreateStorageIfNone() {
+        Write-Host "==> CreateStorageIfNone"
+
+        # Storage Account
+        Write-Host "`tStorage Account"
+        try {
+            $sa = Get-AzureRmStorageAccount -StorageAccountName $StorageAccountName -ResourceGroupName $ResourceGroupName
+        } catch {
+            if ($_ -like "*was not found*") {
+                $sa = New-AzureRmStorageAccount -ResourceGroupName $ResourceGroupName -Name $StorageAccountName -Location $Location -SkuName Standard_LRS 
+                Write-Host "`tCreated storage account $StorageAccountName." -ForegroundColor Yellow
+            } else {
+                throw $_.Exception
+            }
+        }
+
+        $script:StorageAccountContext = $sa.Context
+
+        # Storage Container
+        Write-Host "`tStorage Container"
+        try {
+            $sc = Get-AzureStorageContainer -Name $StorageContainerName -Context $StorageAccountContext
+        } catch {
+            if ($_ -like "*Can not find the container*") {
+                $sc = New-AzureStorageContainer -Name $StorageContainerName -Context $StorageAccountContext  
+                Write-Host "`tCreated storage container $StorageContainerName." -ForegroundColor Yellow
+            } else {
+                throw $_.Exception
+            }
+        }
+    }
+
+    function CopyVhdBlob() {
+        Write-Host "==> Start-AzureStorageBlobCopy"
+        $null = Start-AzureStorageBlobCopy -AbsoluteUri $VhdSasUri -DestContainer $StorageContainerName -DestContext $StorageAccountContext -DestBlob $VhdFileName
+        $Time = [System.Diagnostics.Stopwatch]::StartNew()
+        Write-Host "==> Polling Azure Storage Blob Copy State..."
+        $null = Get-AzureStorageBlobCopyState -Blob $VhdFileName -Container $StorageContainerName -Context $StorageAccountContext -WaitForComplete    
+        $CurrentTime = $Time.Elapsed
+        $Elapsed = $([string]::Format("{0:d2}:{1:d2}:{2:d2}", $CurrentTime.hours, $CurrentTime.minutes, $CurrentTime.seconds))
+        Write-Host "`tVHD blob has been copied. Time: $Elapsed" -ForegroundColor Yellow
+    }
+
+    function CreateImageFromVhd() {
+        Write-Host "==> CreateImageFromVhd"
+        $Blob = Get-AzureStorageBlob -Context $StorageAccountContext -Container $StorageContainerName -Blob $VhdFileName
+        $BlobUri = $Blob.ICloudBlob.Uri.AbsoluteUri
+
+        $ImageConfig = New-AzureRmImageConfig -Location $Location
+        $ImageConfig = Set-AzureRmImageOsDisk -Image $ImageConfig -OsType Windows -OsState Generalized -BlobUri $BlobUri
+        $script:Image = New-AzureRmImage -ImageName $ImageName -ResourceGroupName $ResourceGroupName -Image $ImageConfig
+    }
+
+    function CreateVmFromImage() {
+        Write-Host "==> CreateVmFromImage"
+        New-AzureRmVm -Name $VmName -Location $Location -ResourceGroupName $ResourceGroupName -ImageName $Image.Id -Credential $VmCredential -Size $VmSize
+    }
+
+    SelectSubscription
+    CreateResourceGroupIfNone
+    CreateStorageIfNone
+    CopyVhdBlob
+    CreateImageFromVhd
+    CreateVmFromImage
+
+    Write-Host "==> All done."
+    ```
+
+# Github Settings and Repository Setup
+You will need to set up the GitHub configuration so that commits appear with your GitHub name.
+```
+git config --global user.email "<Your email on GitHub>"
+```
+```
+git config --global user.name "<Your name>"
+```
+Next, you will need to follow the steps [here](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#environment-setup) to set up your local fork of Azure/azure-powershell.
+
+# Building and Running Tests
+This image has been set up to build and run tests immediately. To build the project, run msbuild build.proj in the Developer Command Prompt for VS2015. Once this has completed, you can open your module in Visual Studio and start development there. To record tests, follow the instructions [here](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#recordingrunning-tests).