huangpf
diff --git a/‎AzurePowershell.Test.targets
Lines changed: 33 additions & 1 deletion b/‎AzurePowershell.Test.targets
Lines changed: 33 additions & 1 deletion
diff --git a/‎ChangeLog.md
Lines changed: 94 additions & 1 deletion b/‎ChangeLog.md
Lines changed: 94 additions & 1 deletion
diff --git a/‎README.md
Lines changed: 3 additions & 0 deletions b/‎README.md
Lines changed: 3 additions & 0 deletions
diff --git a/‎build.proj
Lines changed: 5 additions & 2 deletions b/‎build.proj
Lines changed: 5 additions & 2 deletions
diff --git a/‎setup/azurecmd.wxs
Lines changed: 2 additions & 2 deletions b/‎setup/azurecmd.wxs
Lines changed: 2 additions & 2 deletions
@@ -8,6 +8,7 @@
     <ScenarioTestDebug>.\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
     <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>
@@ -34,6 +35,7 @@
     <DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
     <DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>
     <UsageAggregationTestDebug>.\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
+    <PowerBIEmbeddedTestDebug>.\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll</PowerBIEmbeddedTestDebug>
     <TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
     <ScenarioTestFilter>All</ScenarioTestFilter>
     <OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
@@ -86,7 +88,23 @@
       <XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
-	  <XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
+      <!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/> 
+      <XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> 
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices.Backup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\RedisCache\Commands.RedisCache.Test\bin\Debug\Microsoft.Azure.Commands.RedisCache.Test.dll"/>
+      <!--<XUnitTests Include=".\src\ResourceManager\ServerManagement\Commands.ServerManagement.Test\bin\Debug\Microsoft.Azure.Commands.ServerManagement.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Storage\Commands.Management.Storage.Test\bin\Debug\Microsoft.Azure.Commands.Management.Storage.Test.dll"/>-->
+	  <XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
       <XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
       <XUnitTests Include="@(AsmXUnitTests)"/>
     </ItemGroup>
@@ -265,6 +283,13 @@
       IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
   </Target>
 
+   <!-- Run the Recovery Services backup tests -->
+   <Target Name="RecoveryServicesBackupTests">
+    <Message Importance="high" Text="Running Recovery Services Backup tests" />
+	  <Xunit.Runner.MSBuild.xunit Assemblies="$(RecoveryServicesBackupTestDebug)" Html="$(TestOutputDirectory)\RecoveryServicesBackupTests.xunit.dll.html" Verbose="false"
+      IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
+  </Target>
+  
   <!-- Run the common tests -->
   <Target Name="CommonTests">
     <Message Importance="high" Text="Running Common tests" />
@@ -306,6 +331,13 @@
     <Xunit.Runner.MSBuild.xunit Assemblies="$(DataLakeStoreTestDebug)" Html="$(TestOutputDirectory)\DataLakeStoreTests.xunit.dll.html" Verbose="true"
       IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
   </Target>
+
+  <!-- Run the Power BI Embedded tests -->
+  <Target Name="PowerBIEmbeddedTests">
+    <Message Importance="high" Text="Running Power BI Embedded tests" />
+ 	<Xunit.Runner.MSBuild.xunit Assemblies="$(PowerBIEmbeddedTestDebug)" Html="$(TestOutputDirectory)\PowerBIEmbeddedTestDebug.xunit.dll.html" Verbose="true"
+	  IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
+  </Target>
 
   <!-- run the UsageAggregationTests -->
   <Target Name="UsageAggregationTests">
 
@@ -1,3 +1,96 @@
+##2016.07.11 version 1.6.0
+* **Behavioral change for -Force, –Confirm and $ConfirmPreference parameters for all cmdlets. We are changing this implementation to be in line with PowerShell guidelines. For most cmdlets, this means removing the Force parameter and to skip the ShouldProcess prompt, users will need to include the parameter: ‘-Confirm:$false’ in their PowerShell scripts.** This changes are addressing following issues:
+  * Correct implementation of –WhatIf functionality, allowing a user to determine the effects of a cmdlet or script without making any actual changes
+  * Control over prompting using a session-wide $ConfirmPreference, so that the user is prompted based on the impact of a prospective change (as reported in the ConfirmImpact setting in the cmdlet)
+  * Cmdlet-specific control over confirmation prompts using the –Confirm parameter
+  * Consistent use of ShouldContinue and the –Force parameter across cmdlets, for only those actions that would require prompting from the user due to the special nature of the changes (for example, deleting hidden files)
+  * Consistency with other PowerShell cmdlets, so that PowerShell scripting knowledge from other cmdlets is immediately applicable to the Azure PowerShell cmdlets.
+
+**Notice that now to *automatically skip all Prompts in all Circumstances* Azure PowerShell cmdlets require the user to supply two parameters:**
+```
+My-CmdletWithConfirmation –Confirm:$false -Force
+```
+* Azure Compute
+  * Set-AzureRmVMADDomainExtension
+  * Get-AzureRmVMADDomainExtension
+  * -Redeploy parameter for Restart-AzureVM
+  * -Validate parameter for Move-AzureService, Move-AzureStorageAccount, and Move-AzureVirtualNetwork
+  * Name and version parameters for extension cmdlets are optional as before.
+  * New-AzureVM can get a license type from VM object.
+* Azure Storage
+  * Change Tags Parameter to Tag, and add parameter alias Tags
+    - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount
+* Azure Network
+  * New cmdlet added for Virtual Network Peering
+* Azure Redis Cache
+  * New cmdlet added for Reset-AzureRmRedisCache 
+  * New cmdlet added for Export-AzureRmRedisCache 
+  * New cmdlet added for Import-AzureRmRedisCache 
+  * Modified cmdlet New-AzureRmRedisCache to include parameter change for vNet 
+* Azure SQL DB Backup/Restore
+  * Cmdlets for LTR (Long Term Retention) backup feature
+    * Get-AzureRmSqlServerBackupLongTermRetentionVault
+    * Get-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
+    * Set-AzureRmSqlServerBackupLongTermRetentionVault
+    * Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
+  * Restore-AzureRmSqlDatabase now supports point-in-time restore of a deleted database
+  * Restore-AzureRmSqlDatabase now supports restoring from a Long Term Retention backup
+* Azure LogicApp
+  * Added LogicApp Integration accounts cmdlets.
+    * Get-AzureRmIntegrationAccountAgreement
+    * Get-AzureRmIntegrationAccountCallbackUrl
+    * Get-AzureRmIntegrationAccountCertificate
+    * Get-AzureRmIntegrationAccount
+    * Get-AzureRmIntegrationAccountMap
+    * Get-AzureRmIntegrationAccountPartner
+    * Get-AzureRmIntegrationAccountSchema
+    * New-AzureRmIntegrationAccountAgreement
+    * New-AzureRmIntegrationAccountCertificate
+    * New-AzureRmIntegrationAccount
+    * New-AzureRmIntegrationAccountMap
+    * New-AzureRmIntegrationAccountPartner
+    * New-AzureRmIntegrationAccountSchema
+    * Remove-AzureRmIntegrationAccountAgreement
+    * Remove-AzureRmIntegrationAccountCertificate
+    * Remove-AzureRmIntegrationAccount
+    * Remove-AzureRmIntegrationAccountMap
+    * Remove-AzureRmIntegrationAccountPartner
+    * Remove-AzureRmIntegrationAccountSchema
+    * Set-AzureRmIntegrationAccountAgreement
+    * Set-AzureRmIntegrationAccountCertificate
+    * Set-AzureRmIntegrationAccount
+    * Set-AzureRmIntegrationAccountMap
+    * Set-AzureRmIntegrationAccountPartner
+    * Set-AzureRmIntegrationAccountSchema
+* Azure Data Lake Store
+  * Drastically improve performance of file and folder upload and download.
+    * This includes a slight change to the parameter names for download and inclusion of two new parameters for upload:
+      * NumThreads -> PerFileThreadCount, used to indicate the number of threads to use in a single file
+      * ConcurrentFileCount, used to indicate the number of files to upload/download in parallel for folder upload/download.
+    * Default threading values are now designed to give a better all around throughput for most file sizes. If performance is not as desired, the values above can be modified to meet requirements.
+* Azure Data Lake Analytics
+  * Get-AzureRMDataLakeAnalyticsDataSource now returns all data sources when called with no arguments.
+    * This change also removes the data source type parameter from the cmdlet.
+    * This change results in a new object being returned for the list operation with the following properties:
+      * Type, the type of data source
+      * Name, the name of the data source
+      * IsDefault, set to true if this is the default data source for the account
+  * Get-AzureRMDataLakeAnalyticsJob fixed for list for certain date time offset values when filtering on submittedBefore and submittedAfter.
+* Web Apps
+  * Add Swap-AzureRmWebAppSlot cmdlet for regular swap and swap with preview
+  * Extend Set-AzureRmWebAppSlot cmdlet to support auto swap
+* Azure API Management
+  * Fixed Azure Api Management Deployment cmdlets for AzureChinaCloud.
+  * Removed cmdlet Set-AzureRmApiManagementTenantGitAccess as Git Access is enabled by Default.
+* Azure Recovery Services Backup
+  * Added support for the Azure SQL workload
+  * Added support for backing up and restoring encrypted Azure VMs
+  * Backup-AzureRmRecoveryServicesBackupItem - Added optional retention time feature for recovery points
+  * Minor filter-related bug fixes in Get-AzureRmRecoveryServicesBackupContainer and Get-AzureRmRecoveryServicesBackupItem cmdlets
+* Azure Automation
+  * Added Get-AzureRmAutomationHybridWorkerGroup
+
 ##2016.06.23 version 1.5.1
 * Azure Resource Manager
   - Fix a bug in New-AzureRmResourceGroupDeployment. In some deployments the cmdlet throws an exception with "Deployment 'deploymentName' could not be found." and causes the cmdlet to fail. The fix makes sure the deployment is created before getting operations.
@@ -285,7 +378,7 @@
     - New-AzureStorageShareSASToken
     - New-AzureStorageQueueSASToken
     - New-AzureStorageTableSASToken
-* Azure SQL DB Backup/restore
+* Azure SQL DB Backup/Restore
   * Get-AzureRmSqlDatabaseGeoBackup
   * Get-AzureRmSqlDeletedDatabaseBackup
   * Restore-AzureRmSqlDatabase
 
@@ -197,3 +197,6 @@ If you encounter any bugs with the library please file an issue in the [Issues](
 # Learn More
 
 * [Microsoft Azure Script Center](https://azure.microsoft.com/en-us/documentation/scripts/)
+
+---
+_This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments._
@@ -111,8 +111,11 @@
 
   <PropertyGroup>
     <NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
+    <LibraryNugetPackageFolder>$(LibrarySourceFolder)\packages</LibraryNugetPackageFolder>
     <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
     <NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
+    <NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
+
     <PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
   </PropertyGroup>
 
@@ -135,9 +138,9 @@
       Encoding="Unicode"/>
 
     <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
-
+    <Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/> 
     <!-- Restore packages -->
-    <Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)" 
+    <Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)" 
           ContinueOnError="false" />
     <!-- Restore packages for static analysis-->
     <Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch)"
 
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <?define productName="Microsoft Azure PowerShell - June 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - July 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.5.1" ?>
+  <?define version="1.6.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"