resolve merge conflict

Author: shicwu

AzurePowershell.Test.targets

@@ -86,7 +86,21 @@
       <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\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\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\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\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
       <XUnitTests Include="@(AsmXUnitTests)"/>
     </ItemGroup>

ChangeLog.md

@@ -1,6 +1,145 @@
+##2016.07.04 version 1.6.0
+* 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
+
+##2016.06.01 version 1.5.0
+* Azure Resource Manager
+  - (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly
+  - (Get/New/Remove)-AzureRmResourceGroupDeployment cmdlets will now use the new autorest generated ARM assembly
+  - (Get/Register)-AzureRmProviderFeature cmdlets will now use the new autorest generated ARM assembly
+  - (Get/Register/Unregister)-AzureRmResourceProvider cmdlets will now use the new autorest generated ARM assembly
+  - Use a constant backoff interval when polling for deployment progress in New-AzureRmResourceGroupDeployment cmdlet
+  - Add support to specify file share paths for cmdlets that take input file as parameter
+  - Improve error message when Move-AzureRmResource cmdlet fails
+  - Improve error message when New-AzureRmResourceGroupDeployment cmdlet fails
+  - Enable object and array type parameters for template deployment
+  - Preserve casing for resource properties in New/Set-AzureRmResource cmdlet
+  - PropertyObject parameter is now optional in New-AzureRmResource cmdlet
+* Azure Compute (CRP)
+  - Add additional validation for fixed vhd in Add-AzureRmVhd cmdlet
+  - Add -ForceRerun parameter to Set-AzureRmVMCustomExtension, Set-AzureRmVMBginfoExtension, and Set-AzureRmAccessExtension
+  - Update -VhdUri parameter from optional to mandatory (bug fix)
+  - Remove GeoReplicationEnabled deprecation warning message for Get-AzureStorageAccount cmdlet
+  - Fix piping issue for Remove-AzureRmExtension
+  - Create one storage account for Boot diagnostics (one for each location, instead of one for each resource group)
+  - Add -DiskSizeInGB paramter to Set-AzureRmVMOSDisk cmdlet
+  - Show operation id and status for POST Async cmdlets.
+  - Fix Remove-AzureRmNetworkInterface issue for not throwing error when all NICs are removed.
+  - Fix 'Type' output for List cmdlet
+  - Remove xmlCfg contents from output format.
+  - Show warning message for upcoming breaking update of Tag fix.
+  - Change Set-AzureBootDiagnostics cmdlets name to Set-AzureVMBootDiagnostics (and set alias)
+* Azure Compute (ASM)
+  - Storage Migration cmdlet (Move-AzureStorageAccount)
+  - Fix Add-AzureCertificate issue
+* Azure Storage
+  * Fix get Storage Account throttling failures when run it on subscription with many accounts 
+    - Get-AzureRmStorageAccount
+    - Get-AzureStorageAccount
+* Azure Batch
+  * Added Batch account usage cmdlets
+    - Get-BatchPoolUsageMetrics
+    - Get-BatchPoolStatistics
+    - Get-BatchJobStatistics
+  * Added application packages and task dependencies cmdlets
+    - Get-AzureRmBatchApplication
+    - Get-AzureRmBatchApplicationPackage
+    - New-AzureRmBatchApplication
+    - New-AzureRmBatchApplicationPackage
+    - Set-AzureRmBatchApplication
+    - Remove-AzureRmBatchApplicationPackage
+    - Remove-AzureRmBatchApplication
+  * Added bulk task option to New-AzureBatchTask cmdlet
+* Azure API Management
+  * Added Tenant Access cmdlets to get keys for Tenant Access via REST API
+    - Get-AzureRmApiManagementTenantAccess
+    - Set-AzureRmApiManagementTenantAccess
+   * Added OpenId Connect Provider cmdlets to Manage OpenID Connect Providers
+    - Get-AzureRmApiManagementOpenIdConnectProvider
+    - New-AzureRmApiManagementOpenIdConnectProvider
+    - Remove-AzureRmApiManagementOpenIdConnectProvider
+    - Set-AzureRmApiManagementOpenIdConnectProvider
+* Azure Automation
+  * (New/Import)-AzureRmAutomationRunbook now supports the new values of 'GraphicalPowerShell' and 'GraphicalPowerShellWorkflow' with the Type parameter.  The use of 'Graph' value is discouraged.
+  * Start-AzureRmAutomationRunbook now supports the Wait and MaxWaitSeconds parameters.
+  * (New/Get)-AzureRmAutomationSchedule now supports weekly and monthly schedules.
+  * New-AzureRmAutomationSchedule now takes a TimeZone parameter to adjust for daylight savings.
+* Azure Machine Learning (Preview)
+  * New cmdlets to manage Azure Machine Learning Web Services
+    - New-AzureRmMlWebService
+    - Get-AzureRmMlWebService
+    - Remove-AzureRmMlWebService
+    - Update-AzureRmMlWebService
+    - Get-AzureRmMlWebServiceKeys
+    - Import-AzureRmMlWebService
+    - Export-AzureRmMlWebService
+* Azure Data Lake (Preview)
+  * Convenience cmdlet aliases added for all cmdlets
+    - Analytics account management
+      - Get-AdlAnalyticsAccount
+      - New-AdlAnalyticsAccount
+      - Remove-AdlAnalyticsAccount
+      - Set-AdlAnalyticsAccount
+      - Test-AdlAnalyticsAccount
+    - Data source management
+      - Add-AdlAnalyticsDataSource
+      - Get-AdlAnalyticsDataSource
+      - Remove-AdlAnalyticsDataSource
+      - Set-AdlAnalyticsDataSource
+    - Job management
+      - Get-AdlJob
+      - Stop-AdlJob
+      - Submit-AdlJob
+      - Wait-AdlJob
+    - Catalog management
+      - Get-AdlCatalogItem
+      - New-AdlCatalogSecret
+      - Remove-AdlCatalogSecret
+      - Set-AdlCatalogSecret
+      - Test-AdlCatalogItem
+    - Store account management
+      - Get-AdlStore
+      - New-AdlStore
+      - Remove-AdlStore
+      - Set-AdlStore
+      - Test-AdlStore
+    - File management
+      - Add-AdlStoreItemContent
+      - Export-AdlStoreItem
+      - Get-AdlStoreChildItem
+      - Get-AdlStoreItem
+      - Get-AdlStoreItemContent
+      - Import-AdlStoreItem
+      - Join-AdlStoreItem
+      - Move-AdlStoreItem
+      - New-AdlStoreItem
+      - Remove-AdlStoreItem
+      - Test-AdlStoreItem
+    - File access management
+      - Get-AdlStoreItemAcl
+      - Get-AdlStoreItemOwner
+      - Get-AdlStoreItemPermissions
+      - Remove-AdlStoreItemAcl
+      - Remove-AdlStoreItemAclEntry
+      - Set-AdlStoreItemAcl
+      - Set-AdlStoreItemAclEntry
+      - Set-AdlStoreItemOwner
+      - Set-AdlStoreItemPermissions
+   * Granular progress tracking for folder upload done through Import-AzureRMDataLakeStoreItem
+   * Scalable performance improvements for flat and recursive folder upload through Import-AzureRMDataLakeStoreItem. Full network saturation should now be possible.
+   * Errors more accurately indicate that failed Import-AzureRMDataLakeStoreItem commands can be resumed/retried.
+   * More targetted error handling for all Data Lake Store filesystem cmdlets.
+   * Support for getting/listing table partitions through Get-AzureRMDataLakeAnalyticsCatalogItem
+   
 ##2016.05.04 version 1.4.0
 * Azure Resource Manager
-  - Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces
+  - Get-AzureRmLocation cmdlet: New cmdlet Lists all public Azure locatiosn with available provider namespaces
   - Get-AzureRMResourceGroupDeploymentOperations: Improved output format
   - Get-AzureRMDeployment: Responses contain all error details
   - Added cmdlet help anbd examples
@@ -150,7 +289,7 @@
     - New-AzureStorageShareSASToken
     - New-AzureStorageQueueSASToken
     - New-AzureStorageTableSASToken
-* Azure SQL DB Backup/restore
+* Azure SQL DB Backup/Restore
   * Get-AzureRmSqlDatabaseGeoBackup
   * Get-AzureRmSqlDeletedDatabaseBackup
   * Restore-AzureRmSqlDatabase

README.md

@@ -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._

build.proj

@@ -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)"

setup/azurecmd.wxs

@@ -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 - May 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - June 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.4.0" ?>
+  <?define version="1.5.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"