Merge pull request #1 from Azure/build

Update from master

Author: yaakoviyun

AzurePowershell.Test.targets

@@ -8,6 +8,8 @@
     <ScenarioTestDebug>.\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
     <CommonTestDebug>.\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
     <SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
+    <ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
+    <NetworkTestDebug>.\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll</NetworkTestDebug>
     <AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
     <AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
     <StorageScenarioTestDebug>src\ServiceManagement\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
@@ -41,6 +43,8 @@
     <XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
     <XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
     <XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
+    <XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.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"/>
@@ -50,6 +54,7 @@
     <XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.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\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
   </ItemGroup>
 
   <Target Name="InvokeMSTest">
@@ -104,7 +109,17 @@
     <Xunit.Runner.MSBuild.xunit Assemblies="$(ResourceManagerTestDebug)" Html="$(TestOutputDirectory)\ResourceManagerTestDebug.xunit.dll.html" Verbose="false"
       IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
   </Target>
-  
+
+  <Target Name="TestCompute">
+    <Xunit.Runner.MSBuild.xunit Assemblies="$(ComputeTestDebug)" Html="$(TestOutputDirectory)\ComputeTestDebug.xunit.dll.html" Verbose="false"
+      IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
+  </Target>
+
+  <Target Name="NetworkTestDebug">
+    <Xunit.Runner.MSBuild.xunit Assemblies="$(NetworkTestDebug)" Html="$(TestOutputDirectory)\NetworkTestDebug.xunit.dll.html" Verbose="false"
+      IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
+  </Target>
+
   <Target Name="TestBatch">
      <Xunit.Runner.MSBuild.xunit Assemblies="$(BatchTestDebug)" Html="$(TestOutputDirectory)\BatchTestDebug.xunit.dll.html" Verbose="false"
        IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
@@ -195,6 +210,13 @@
       IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
   </Target>
 
+  <!-- Run the Compute tests -->
+  <Target Name="ComputeTests">
+    <Message Importance="high" Text="Running Compute tests" />
+    <Xunit.Runner.MSBuild.xunit Assemblies="$(ComputeTestDebug)" Html="$(TestOutputDirectory)\ComputeTests.xunit.dll.html" Verbose="false"
+      ExcludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
+  </Target>
+
   <!-- Run the sql tests -->
   <Target Name="SqlTests">
     <Message Importance="high" Text="Running Sql tests" />
@@ -253,7 +275,7 @@
     <Message Importance="high" Text="Running a specific tests..." />
     <Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
     <Exec
-      Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
+      Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
       ContinueOnError="false" />
   </Target>
 

ChangeLog.txt

@@ -1,3 +1,69 @@
+2015.05.17 version 0.8.18
+* Azure Network
+  * Added Cmdlets
+    * Get-AzureVirtualNetwork
+    * New-AzureVirtualNetwork
+    * Remove-AzureVirtualNetwork
+    * Set-AzureVirtualNetwork
+    * Get-AzureVirtualNetworkSubnetConfig
+    * New-AzureVirtualNetworkSubnetConfig
+    * Add-AzureVirtualNetworkSubnetConfig
+    * Set-AzureVirtualNetworkSubnetConfig
+    * Remove-AzureVirtualNetworkSubnetConfig
+    * Get-AzureNetworkInterface
+    * New-AzureNetworkInterface
+    * Remove-AzureNetworkInterface
+    * Set-AzureNetworkInterface
+    * Get-AzurePublicIpAddress
+    * New-AzurePublicIpAddress
+    * Remove-AzurePublicIpAddress
+    * Set-AzurePublicIpAddress
+    * Add-AzureLoadBalancerBackendAddressPoolConfig
+    * Add-AzureLoadBalancerFrontendIpConfig
+    * Add-AzureLoadBalancerInboundNatRuleConfig
+    * Add-AzureLoadBalancerProbeConfig
+    * Add-AzureLoadBalancerRuleConfig
+    * Get-AzureLoadBalancer
+    * Get-AzureLoadBalancerBackendAddressPoolConfig
+    * Get-AzureLoadBalancerFrontendIpConfig
+    * Get-AzureLoadBalancerInboundNatRuleConfig
+    * Get-AzureLoadBalancerProbeConfig*
+    * Get-AzureLoadBalancerRuleConfig
+    * New-AzureLoadBalancer
+    * New-AzureLoadBalancerBackendAddressPoolConfig
+    * New-AzureLoadBalancerFrontendIpConfig
+    * New-AzureLoadBalancerInboundNatRuleConfig
+    * New-AzureLoadBalancerProbeConfig
+    * New-AzureLoadBalancerRuleConfig
+    * Remove-AzureLoadBalancer
+    * Remove-AzureLoadBalancerBackendAddressPoolConfig
+    * Remove-AzureLoadBalancerFrontendIpConfig
+    * Remove-AzureLoadBalancerInboundNatRuleConfig
+    * Remove-AzureLoadBalancerProbeConfig
+    * Remove-AzureLoadBalancerRuleConfig
+    * Set-AzureLoadBalancer
+    * Set-AzureLoadBalancerFrontendIpConfig
+    * Set-AzureLoadBalancerInboundNatRuleConfig
+    * Set-AzureLoadBalancerProbeConfig
+    * Set-AzureLoadBalancerRuleConfig
+    * Get-AzureNetworkSecurityGroup
+    * New-AzureNetworkSecurityGroup
+    * Remove-AzureNetworkSecurityGroup
+    * Set-AzureNetworkSecurityGroup
+    * Get-AzureNetworkSecurityRuleConfig
+    * New-AzureNetworkSecurityRuleConfig
+    * Remove-AzureNetworkSecurityRuleConfig
+    * Add-AzureNetworkSecurityRuleConfig
+    * Set-AzureNetworkSecurityRuleConfig
+
+2015.04.28 version 0.8.17
+* Azure Batch
+  * Added cmdlets
+    * New-AzureBatchVMUser
+    * Remove-AzureBatchVMUser
+    * Get-AzureBatchRDPFile
+    * Get-AzureBatchVMFileContents
+
 2015.03.31 version 0.8.16
 * Azure Data Factory:
   * Fixes for clean install and subscription registration issues

README.md

@@ -122,7 +122,6 @@ For detail descriptions and examples of the cmdlets, type
 * ```help azure``` to get all the cmdlets.
 * ```help node-dev``` to get all Node.js development related cmdlets.
 * ```help php-dev``` to get all PHP development related cmdlets.
-* ```help python-dev``` to get all Python development related cmdlets.
 * ```help <cmdlet name>``` to get the details of a specific cmdlet.
 
 ## Supported Environments

build.proj

@@ -90,12 +90,23 @@
 
     <!-- Delete NuGet cache-->
     <Delete Files="@(NuGetCache)" />
+    
+    <Delete Files="$(NuGetRestoreConfigFile)" />
+    <WriteLinesToFile
+      File="$(NuGetRestoreConfigFile)"
+      Lines="&lt;configuration&gt;&lt;/configuration&gt;"
+      Overwrite="true"
+      Encoding="Unicode"/>
+
+    <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
 
     <!-- Restore packages -->
-    <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln" ContinueOnError="false" />
+    <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
 
     <!--Restore the xunit runner needed to run unit tests-->
     <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
+    
+    <Delete Files="$(NuGetRestoreConfigFile)" />
   </Target>
 
   <!-- Build all flavors of the Cmdlets -->

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.8.16" ?>
+  <?define version="0.8.16.1" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>