Resolving merge conflict in wxi file by taking theirs.

Author: dragonfly91

AzurePowershell.Test.targets

@@ -22,7 +22,7 @@
     <DataFactoryManagerTestDebug>.\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll</DataFactoryManagerTestDebug>
     <StreamAnalyticsManagerTestDebug>.\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll</StreamAnalyticsManagerTestDebug>
     <OperationalInsightsTestDebug>.\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll</OperationalInsightsTestDebug>
-    <BatchTestDebug>.\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
+    <BatchTestDebug>.\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
     <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>
@@ -56,7 +56,7 @@
     <XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll"/>
-    <XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>

ChangeLog.md

@@ -1,3 +1,33 @@
+## 2015.08.17 version 0.9.7
+* Azure Profile cmdlets
+  * New-AzureProfile
+    * Added parameter set for empty profile
+    * Fixed issues with AAD aithentication when constructing profile
+    * Enabled passing results of Add-AzureEnvironment to New-AzureProfile -Environment parameter
+* Azure ResourceManager cmdlets
+  * New-AzureResourceGroupDeployment: Added Mode (deployment mode) and Force parameters 
+  * Get-AzureProviderOperation: API changes to improve performance
+* Azure Compute (ARM) Cmdlets
+  * Fixes for Set-AzureDeployment with -ExtensionConfiguration
+  * Fixes for Set-AzureVMCustomExtension cmdlets
+  * Deprecated cmdlets Get-AzureVMImageDetail and Get-AzureVMExtentionImageDetail
+* Azure Compute (Service Management) cmdlets
+  * Publish-AzureVMDSCConfiguration: Added additional configuration parameters
+* Azure Network (ARM) cmdlets
+  * Added help for Route Table cmdlets
+* Azure Storage cmdlets
+  * Added support for downloading, uploading, and copying append blob
+  * Added support for asynchronous copying to and from cloud file
+  * Added azure service CORS management
+* Azure Sql (ARM) Cmdlets
+  * Fixed issues with ElascitPool cmdlets
+* AzureBatch cmdlets
+  * Added Batch autoscale cmdlets Enable-AzureBatchAutoScale, Disable-AzureBatchAutoScale
+* RemoteApp cmdlets
+  * Added Restart-AzureRemoteAppVm cmdlet
+* Azure HDInsight cmdlets
+  * Added cmdlet help
+
 ## 2015.08.07 version 0.9.6
 * Azure Batch cmdlets
     * Cmdlets updated to use the general availability API. See http://blogs.technet.com/b/windowshpc/archive/2015/07/10/what-39-s-new-in-azure-batch-july-release-general-availability.aspx
@@ -15,7 +45,6 @@
     * 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

setup/azurecmd.wxs

@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.9.6" ?>
+  <?define version="0.9.7" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>