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

Author: yoavrubin

AzurePowershell.Test.targets

@@ -26,7 +26,6 @@
     <WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
     <RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
     <ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
-    <ServiceManagementExtensionsTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Extensions.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions.Test.dll</ServiceManagementExtensionsTestDebug>
     <SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
     <HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
     <StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
@@ -44,7 +43,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
     <XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
@@ -67,7 +66,7 @@
     <XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
     <XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
-	<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
   </ItemGroup>
 
   <Target Name="InvokeMSTest">
@@ -170,12 +169,6 @@
              Projects="build.proj"/>
   </Target>
 
-  <Target Name="TestServiceManagementExtensions">
-    <MSBuild Targets="InvokeMSTest"
-             Properties="_testAssembly=$(ServiceManagementExtensionsTestDebug);_testSettings=$(TestSettings);_testFilter=$(TestFilter);_testResult=$(TestOutputDirectory)\ServiceManagementExtensionsDebug.trx"
-             Projects="build.proj"/>
-  </Target>
-
   <Target Name="TestSqlDatabase">
     <MSBuild Targets="InvokeMSTest"
         Properties="_testAssembly=$(SqlDatabaseTestDebug);_testSettings=$(TestSettings);_testFilter=$(TestFilter);_testResult=$(TestOutputDirectory)\SqlDatabaseDebug.trx"
@@ -422,15 +415,6 @@
       ContinueOnError="false" />
   </Target>
 
-  <!-- DSC extension related targets -->
-  <Target Name="TestDSCExtension_x64">
-    <Message Importance="high" Text="Running DSC extension BVT x64 tests..." />
-    <Delete Files="$(TestOutputDirectory)\DSCExtensionDebug_x64.trx" />
-    <Exec
-      Command="MSTest.exe /testcontainer:$(ServiceManagementExtensionsTestDebug) /testsettings:$(TestSettings_x64) /category:x64_only /resultsfile:$(TestOutputDirectory)\DSCExtensionDebug_x64.trx"
-      ContinueOnError="false" />
-  </Target>
-
   <ItemGroup>
     <LiveTestDlls Include="$(ResourceManagerTestDebug)" />    
   </ItemGroup>

ChangeLog.md

@@ -8,6 +8,30 @@
         * If you were using the AzureBatchVM cmdlets, use the AzureBatchComputeNode cmdlets instead.
         * The AzureBatchTaskFile and AzureBatchVMFile cmdlets have been consolidated into the AzureBatchNodeFile cmdlets.
         * The Name property on most entities has been replaced by an Id property.
+* Azure Network
+    * Cert and SET cmdlet bugfix
+* Azure Compute
+    * Update VMAcces extension to use Json configs.
+    * Fix Publish Extension cmdlets.
+    * Update CustomScript cmdlet for SAS Uri.
+    * Update help file.
+    * Get, Set and Remove Azure Powershell commandlets for IaaS V2 VM.
+* Azure Data Factory
+    * Rename Table to Dataset.
+* Azure SQL
+    * changed the structure of the security namespace to align to the rest of the namespaces in the Azure SQL namespace.
+    * Added Schema to data masking rule.
+    * Updated underlying sql nuget version.
+    * Add the parameter for elastic pool in Start-AzureSqlServerUpgrade.
+    * Return the schedule time of the upgrade (in case of forced upgrade) to customer in Get-AzureSqlServerUpgrade.
+* Azure Hdinsight Resoruce Management cmdlets
+* Azure Site Recovery
+    * Add Valult, Server, Protection Container, protection Entity, Protection Profile, Job cmdlets.
+* Azure Stream Analytics 
+    * Use Stream Analytics SDK reference to 1.6.0 version.
+* Azure Backup
+    * Enable-AzureBackupContainerReregistration cmdlet.
+* Azure UsageAggregates cmdlet
 
 ## 2015.07.17 version 0.9.5
 * Azure SQL cmdlets

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define productName="Microsoft Azure PowerShell - July 2015" ?>
+  <?define productName="Microsoft Azure PowerShell - August 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.9.5" ?>
+  <?define version="0.9.6" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>