Merge pull request #10 from Azure/dev

pull from dev branch of azure/azure-powershell

AzurePowershell.Test.targets

@@ -32,13 +32,35 @@
     <AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
   </PropertyGroup>
 
+  <ItemGroup>
+    <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"/>
+    <XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
+    <XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
+    <XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
+    <XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
+    <XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
+  </ItemGroup>
+
   <Target Name="InvokeMSTest">
     <!--Remove existing test result; otherwsie mstest will error-->
     <Delete Files="$(_testResult)"/>
     <Exec
       Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
       ContinueOnError="false" />
   </Target>
+
+  <Target Name="InvokeXUnit">
+    <Message Importance="high" Text="Running XUnit tests" />
+    <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
+    <Xunit.Runner.MSBuild.xunit Assemblies="@(XUnitTests)" Html="$(TestOutputDirectory)\xunit.tests.dll.html" Verbose="true"
+      ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
+  </Target>
 
   <Target Name="BeforeRunTests">
     <Message Importance="high" Text="You are required to have installed a version of Visual Studio with support for MSTest (and MSTest on your path)." />

ChangeLog.txt

@@ -1,3 +1,56 @@
+2015.02.12 version 0.8.14
+* StorSimple: New StorSimple commands in AzureServiceManagement mode:
+  * GetAzureStorSimpleAccessControlRecord
+  * GetAzureStorSimpleStorageAccountCredential
+  * RemoveAzureStorSimpleAccessControlRecord
+  * RemoveAzureStorSimpleStorageAccountCredential
+  * SetAzureStorSimpleAccessControlRecord
+  * GetAzureStorSimpleDeviceVolume 
+  * RemoveAzureStorSimpleDeviceVolume 
+  * GetAzureStorSimpleDeviceVolumeContainer
+  * RemoveAzureStorSimpleDeviceVolumeContainer
+  * GetAzureStorSimpleDevice
+  * GetAzureStorSimpleDeviceConnectedInitiator
+  * GetAzureStorSimpleResource
+  * GetAzureStorSimpleResourceContext
+  * SetAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleDeviceBackupPolicy
+  * GetAzureStorSimpleDeviceBackup
+  * RemoveAzureStorSimpleDeviceBackup
+  * StartAzureStorSimpleDeviceBackupJob
+  * StartAzureStorSimpleDeviceBackupRestoreJob
+  * RemoveAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleDeviceVolume
+  * SetAzureStorSimpleDeviceVolume
+  * NewAzureStorSimpleDeviceVolumeContainer
+  * SelectAzureStorSimpleResource
+  * GetAzureStorSimpleDeviceBackupPolicy
+  * NewAzureStorSimpleStorageAccountCredential
+  * GetAzureStorSimpleTask
+  * SetAzureStorSimpleStorageAccountCredential
+  * NewAzureStorSimpleInlineStorageAccountCredential
+  * NewAzureStorSimpleAccessControlRecord
+
+* HDInsight:
+  * HeadNodeVMSize (update): the parameter is now a string that can now accept various sizes (specifications here: https://msdn.microsoft.com/en-us/library/azure/dn197896.aspx -> Sizes for Web and Worker Role Instances)
+  * DataNodeVMSize (new)  :  use to specify size of data nodes (where applicable)
+  * ZookeeperNodeVMSize (new): use to specify Zookeeper node sizes (where applicable)
+  * ClusterType (update): New value (Spark) can be specified as cluster type
+  * Add-AzureHDInsightConfigValues cmdlet:
+    * Spark (new): collection of configuration properties can be passed in to customize the Spark service
+
+ * Azure Insights cmdlets in AzureResourceManager Mode:
+   * Get-AzureCrrelationLogId
+   * Get-AzureResourceGroupLog
+   * Get-AzureResourceLog
+   * Get-AzureResourceProviderLog
+   * Get-AzureSubscriptionIdLog
+
+* Azure VM cmdlets
+  * Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
+
+ * Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
+
 2015.01.08 version 0.8.13
 * Key Vault Service - new cmdlets in AzureResourceManager mode:
   * Keys:

build.proj

@@ -17,6 +17,7 @@
     <TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
     <DebugBuildConfig>Configuration=Debug;Platform=Any CPU</DebugBuildConfig>
     <ReleaseBuildConfig>Configuration=Release;Platform=Any CPU</ReleaseBuildConfig>
+    <BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
   </PropertyGroup>
   <ItemGroup>
     <AzurePowerShellSln Include=".\src\AzurePowerShell.sln" />
@@ -90,24 +91,12 @@
     <!-- Delete NuGet cache-->
     <Delete Files="@(NuGetCache)" />
 
-    <Delete Files="$(NuGetRestoreConfigFile)" />
-    <WriteLinesToFile File="$(NuGetRestoreConfigFile)" Lines="&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="true" Encoding="UTF-8" />
-    <!-- Create config for user name and password for private feed access -->
-    <Exec Command="$(NuGetCommand) sources add -Name AzureSdkInternal -Source &quot;https://www.myget.org/F/azure-sdk-internal/&quot; $(NuGetRestoreConfigSwitch)" />
-    <CallTarget Targets="ForceRestorePackagesFromPrivateFeed"/>
     <!-- Restore packages -->
-    <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
-    <!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
-    <Delete Files="$(NuGetRestoreConfigFile)" />
+    <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln" ContinueOnError="false" />
+
     <!--Restore the xunit runner needed to run unit tests-->
     <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
   </Target>
-
-  <Target Name="ForceRestorePackagesFromPrivateFeed" Condition="'$(PRIVATE_FEED_PASSWORD)' != ''">
-    <Exec Command="$(NuGetCommand) sources add -Name Hydra -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" />
-    <Exec Command="$(NuGetCommand) sources Update -Name Hydra -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)"
-          EchoOff="true" />
-  </Target>
 
   <!-- Build all flavors of the Cmdlets -->
   <Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
@@ -116,11 +105,13 @@
       Projects="@(AzurePowerShellSln)"
       Targets="Build"
       Properties="$(DebugBuildConfig)"
+      BuildInParallel="$(BuildInParallel)"
       ContinueOnError="false" />
     <MSBuild
       Projects="@(AzurePowerShellSln)"
       Targets="Build"
       Properties="$(ReleaseBuildConfig)"
+      BuildInParallel="$(BuildInParallel)"
       ContinueOnError="false" />
   </Target>
 
@@ -172,6 +163,7 @@
       Projects="@(AzurePowerShellSln)"
       Targets="Build"
       Properties="$(ReleaseBuildConfig)"
+      BuildInParallel="$(BuildInParallel)"
       ContinueOnError="false" />
   </Target>
 
@@ -182,6 +174,7 @@
       Projects="@(AzurePowerShellSln)"
       Targets="Build"
       Properties="$(DebugBuildConfig)"
+      BuildInParallel="$(BuildInParallel)"
       ContinueOnError="false" />
   </Target>
 
@@ -195,7 +188,7 @@
   <!-- Run checkin tests for each pull request -->
   <Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
     <Message Importance="high" Text="Running check in tests..." />
-    <CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager; TestStorSimple"/>
+    <CallTarget Targets="InvokeXUnit; TestHDInsight; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage;  TestDSCExtension_x64"/>
   </Target>
 
   <!-- Run Full switch with scenario tests -->

setup/azurecmd.wxs

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