Skip to content

Commit b347d24

Browse files
jtlibingusjtlibingus
committed
Merge pull request #10 from Azure/dev
pull from dev branch of azure/azure-powershell
2 parents e9c320b + 1413bf3 commit b347d24

File tree

791 files changed

+99680
-45774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

791 files changed

+99680
-45774
lines changed

‎AzurePowershell.Test.targets

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,35 @@
3232
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
3333
</PropertyGroup>
3434

35+
<ItemGroup>
36+
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
37+
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
38+
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
39+
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
40+
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
41+
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
42+
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
43+
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
44+
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
45+
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
46+
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
47+
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
48+
</ItemGroup>
49+
3550
<Target Name="InvokeMSTest">
3651
<!--Remove existing test result; otherwsie mstest will error-->
3752
<Delete Files="$(_testResult)"/>
3853
<Exec
3954
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
4055
ContinueOnError="false" />
4156
</Target>
57+
58+
<Target Name="InvokeXUnit">
59+
<Message Importance="high" Text="Running XUnit tests" />
60+
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
61+
<Xunit.Runner.MSBuild.xunit Assemblies="@(XUnitTests)" Html="$(TestOutputDirectory)\xunit.tests.dll.html" Verbose="true"
62+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
63+
</Target>
4264

4365
<Target Name="BeforeRunTests">
4466
<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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,56 @@
1+
2015.02.12 version 0.8.14
2+
* StorSimple: New StorSimple commands in AzureServiceManagement mode:
3+
* GetAzureStorSimpleAccessControlRecord
4+
* GetAzureStorSimpleStorageAccountCredential
5+
* RemoveAzureStorSimpleAccessControlRecord
6+
* RemoveAzureStorSimpleStorageAccountCredential
7+
* SetAzureStorSimpleAccessControlRecord
8+
* GetAzureStorSimpleDeviceVolume
9+
* RemoveAzureStorSimpleDeviceVolume
10+
* GetAzureStorSimpleDeviceVolumeContainer
11+
* RemoveAzureStorSimpleDeviceVolumeContainer
12+
* GetAzureStorSimpleDevice
13+
* GetAzureStorSimpleDeviceConnectedInitiator
14+
* GetAzureStorSimpleResource
15+
* GetAzureStorSimpleResourceContext
16+
* SetAzureStorSimpleDeviceBackupPolicy
17+
* NewAzureStorSimpleDeviceBackupPolicy
18+
* GetAzureStorSimpleDeviceBackup
19+
* RemoveAzureStorSimpleDeviceBackup
20+
* StartAzureStorSimpleDeviceBackupJob
21+
* StartAzureStorSimpleDeviceBackupRestoreJob
22+
* RemoveAzureStorSimpleDeviceBackupPolicy
23+
* NewAzureStorSimpleDeviceVolume
24+
* SetAzureStorSimpleDeviceVolume
25+
* NewAzureStorSimpleDeviceVolumeContainer
26+
* SelectAzureStorSimpleResource
27+
* GetAzureStorSimpleDeviceBackupPolicy
28+
* NewAzureStorSimpleStorageAccountCredential
29+
* GetAzureStorSimpleTask
30+
* SetAzureStorSimpleStorageAccountCredential
31+
* NewAzureStorSimpleInlineStorageAccountCredential
32+
* NewAzureStorSimpleAccessControlRecord
33+
34+
* HDInsight:
35+
* 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)
36+
* DataNodeVMSize (new) : use to specify size of data nodes (where applicable)
37+
* ZookeeperNodeVMSize (new): use to specify Zookeeper node sizes (where applicable)
38+
* ClusterType (update): New value (Spark) can be specified as cluster type
39+
* Add-AzureHDInsightConfigValues cmdlet:
40+
* Spark (new): collection of configuration properties can be passed in to customize the Spark service
41+
42+
* Azure Insights cmdlets in AzureResourceManager Mode:
43+
* Get-AzureCrrelationLogId
44+
* Get-AzureResourceGroupLog
45+
* Get-AzureResourceLog
46+
* Get-AzureResourceProviderLog
47+
* Get-AzureSubscriptionIdLog
48+
49+
* Azure VM cmdlets
50+
* Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
51+
52+
* Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
53+
154
2015.01.08 version 0.8.13
255
* Key Vault Service - new cmdlets in AzureResourceManager mode:
356
* Keys:

‎build.proj

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
1818
<DebugBuildConfig>Configuration=Debug;Platform=Any CPU</DebugBuildConfig>
1919
<ReleaseBuildConfig>Configuration=Release;Platform=Any CPU</ReleaseBuildConfig>
20+
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<AzurePowerShellSln Include=".\src\AzurePowerShell.sln" />
@@ -90,24 +91,12 @@
9091
<!-- Delete NuGet cache-->
9192
<Delete Files="@(NuGetCache)" />
9293

93-
<Delete Files="$(NuGetRestoreConfigFile)" />
94-
<WriteLinesToFile File="$(NuGetRestoreConfigFile)" Lines="&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="true" Encoding="UTF-8" />
95-
<!-- Create config for user name and password for private feed access -->
96-
<Exec Command="$(NuGetCommand) sources add -Name AzureSdkInternal -Source &quot;https://www.myget.org/F/azure-sdk-internal/&quot; $(NuGetRestoreConfigSwitch)" />
97-
<CallTarget Targets="ForceRestorePackagesFromPrivateFeed"/>
9894
<!-- Restore packages -->
99-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
100-
<!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
101-
<Delete Files="$(NuGetRestoreConfigFile)" />
95+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln" ContinueOnError="false" />
96+
10297
<!--Restore the xunit runner needed to run unit tests-->
10398
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
10499
</Target>
105-
106-
<Target Name="ForceRestorePackagesFromPrivateFeed" Condition="'$(PRIVATE_FEED_PASSWORD)' != ''">
107-
<Exec Command="$(NuGetCommand) sources add -Name Hydra -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" />
108-
<Exec Command="$(NuGetCommand) sources Update -Name Hydra -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)"
109-
EchoOff="true" />
110-
</Target>
111100

112101
<!-- Build all flavors of the Cmdlets -->
113102
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
@@ -116,11 +105,13 @@
116105
Projects="@(AzurePowerShellSln)"
117106
Targets="Build"
118107
Properties="$(DebugBuildConfig)"
108+
BuildInParallel="$(BuildInParallel)"
119109
ContinueOnError="false" />
120110
<MSBuild
121111
Projects="@(AzurePowerShellSln)"
122112
Targets="Build"
123113
Properties="$(ReleaseBuildConfig)"
114+
BuildInParallel="$(BuildInParallel)"
124115
ContinueOnError="false" />
125116
</Target>
126117

@@ -172,6 +163,7 @@
172163
Projects="@(AzurePowerShellSln)"
173164
Targets="Build"
174165
Properties="$(ReleaseBuildConfig)"
166+
BuildInParallel="$(BuildInParallel)"
175167
ContinueOnError="false" />
176168
</Target>
177169

@@ -182,6 +174,7 @@
182174
Projects="@(AzurePowerShellSln)"
183175
Targets="Build"
184176
Properties="$(DebugBuildConfig)"
177+
BuildInParallel="$(BuildInParallel)"
185178
ContinueOnError="false" />
186179
</Target>
187180

@@ -195,7 +188,7 @@
195188
<!-- Run checkin tests for each pull request -->
196189
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
197190
<Message Importance="high" Text="Running check in tests..." />
198-
<CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager; TestStorSimple"/>
191+
<CallTarget Targets="InvokeXUnit; TestHDInsight; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestDSCExtension_x64"/>
199192
</Target>
200193

201194
<!-- Run Full switch with scenario tests -->

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - January 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - February 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

0 commit comments

Comments
 (0)