Skip to content

Commit 040e5f6

Browse files
committed
Automerge after syncing AsrOneSdk/azure-powershell from Azure/azure-powershell
2 parents a7d517a + 3a3c93e commit 040e5f6

File tree

1,171 files changed

+118718
-37537
lines changed

Some content is hidden

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

1,171 files changed

+118718
-37537
lines changed

AzurePowershell.Test.targets

Lines changed: 85 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@
1414
<ManagementTestDebug>.\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll</ManagementTestDebug>
1515
<ResourceManagerTestDebug>.\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll</ResourceManagerTestDebug>
1616
<DataFactoryManagerTestDebug>.\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll</DataFactoryManagerTestDebug>
17+
<StreamAnalyticsManagerTestDebug>.\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll</StreamAnalyticsManagerTestDebug>
1718
<BatchTestDebug>.\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
1819
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
1920
<ServiceManagementExtensionsTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Extensions.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions.Test.dll</ServiceManagementExtensionsTestDebug>
2021
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
2122
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
2223
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
23-
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain"</TestFilter>
24+
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
25+
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
2426
<ScenarioTestFilter>All</ScenarioTestFilter>
2527
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
26-
<AzureRTAllTestFilter>"Functional|AzureRTScenario"</AzureRTAllTestFilter>
27-
<AzureRTAllTestFilter2>"Functional|AzureRTScenario|Preview"</AzureRTAllTestFilter2>
28-
<AzureRTAllTestFilter3>"Functional|AzureRTScenario|Sequential"</AzureRTAllTestFilter3>
28+
<AzureRTAllTestFilter>"Functional|AzureRTScenario|Sequential|AzureRTUpload|Network"</AzureRTAllTestFilter>
29+
<AzureRTParAllFilter>"Functional|AzureRTScenario"</AzureRTParAllFilter>
30+
<AzureRTAllPreviewFilter>"Functional|AzureRTScenario|Preview"</AzureRTAllPreviewFilter>
31+
<AzureRTUploadSeqFilter>"AzureRTUpload|Sequential"</AzureRTUploadSeqFilter>
32+
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
2933
</PropertyGroup>
3034

3135
<Target Name="InvokeMSTest">
@@ -69,6 +73,11 @@
6973
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
7074
</Target>
7175

76+
<Target Name="TestStreamAnalyticsManager">
77+
<Xunit.Runner.MSBuild.xunit Assemblies="$(StreamAnalyticsManagerTestDebug)" Html="$(TestOutputDirectory)\StreamAnalyticsManagerTestDebug.xunit.dll.html" Verbose="false"
78+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
79+
</Target>
80+
7281
<Target Name="TestServiceManagement">
7382
<MSBuild Targets="InvokeMSTest"
7483
Properties="_testAssembly=$(ServiceManagementTestDebug);_testSettings=$(TestSettings);_testFilter=$(TestFilter);_testResult=$(TestOutputDirectory)\ServiceManagementDebug.trx"
@@ -106,6 +115,14 @@
106115
<Xunit.Runner.MSBuild.xunit Assemblies="$(_RecoveryServicesTestAssembly)" Html="$(TestOutputDirectory)\RecoveryServices.xunit.dll.html" Verbose="false"
107116
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
108117
</Target>
118+
119+
<Target Name="TestStorSimple">
120+
<PropertyGroup>
121+
<_StorSimpleTestAssembly>.\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll</_StorSimpleTestAssembly>
122+
</PropertyGroup>
123+
<Xunit.Runner.MSBuild.xunit Assemblies="$(_StorSimpleTestAssembly)" Html="$(TestOutputDirectory)\StorSimple.xunit.dll.html" Verbose="false"
124+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
125+
</Target>
109126

110127
<!-- Run the scenario tests -->
111128
<Target Name="ScenarioTest" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
@@ -131,6 +148,13 @@
131148
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
132149
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
133150
</Target>
151+
152+
<!-- Run the KeyVault tests -->
153+
<Target Name="KeyVaultTests">
154+
<Message Importance="high" Text="Running KeyVault tests" />
155+
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
156+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
157+
</Target>
134158

135159
<!-- Run the scenario tests with Mocks -->
136160
<Target Name="MockedScenarioTests">
@@ -172,6 +196,14 @@
172196
ContinueOnError="false" />
173197
</Target>
174198

199+
<Target Name="AzureRTRepeat" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
200+
<Message Importance="high" Text="Running a specific tests..." />
201+
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
202+
<Exec
203+
Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
204+
ContinueOnError="false" />
205+
</Target>
206+
175207
<Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
176208
<Message Importance="high" Text="Running tests:" />
177209
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
@@ -184,7 +216,7 @@
184216
<Message Importance="high" Text="Running AzureRT all tests..." />
185217
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
186218
<Exec
187-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter3) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
219+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
188220
ContinueOnError="false" />
189221
</Target>
190222

@@ -194,33 +226,67 @@
194226
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
195227
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
196228
<Exec
197-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
229+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
198230
ContinueOnError="true" />
199231
<Exec
200-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
232+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTParAllFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
201233
ContinueOnError="false" />
202234
</Target>
203235

204236
<Target Name="AzureRTSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
205237
<Message Importance="high" Text="Running AzureRT all tests..." />
206238

207239
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
208-
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
209240
<Exec
210-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
241+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTSeqAllFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
211242
ContinueOnError="true" />
212243
</Target>
213244

214-
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
245+
<Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
246+
<Message Importance="high" Text="Running AzureRT all tests..." />
247+
248+
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
249+
<Exec
250+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
251+
ContinueOnError="false" />
252+
</Target>
253+
254+
<Target Name="AzureRTUploadSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
215255
<Message Importance="high" Text="Running AzureRT all tests..." />
216256

217257
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
258+
<Exec
259+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:$(AzureRTUploadSeqFilter) /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
260+
ContinueOnError="false" />
261+
</Target>
262+
263+
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
264+
<Message Importance="high" Text="Running AzureRT all tests..." />
265+
218266
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
219267
<Exec
220268
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
221269
ContinueOnError="false" />
222270
</Target>
223271

272+
<Target Name="AzureRTFuntional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
273+
<Message Importance="high" Text="Running AzureRT Funtional tests..." />
274+
275+
<Delete Files="$(TestOutputDirectory)\RTFuntionalDebug.trx" />
276+
<Exec
277+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFuntionalDebug.trx"
278+
ContinueOnError="false" />
279+
</Target>
280+
281+
<Target Name="AzureRTScenario" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
282+
<Message Importance="high" Text="Running AzureRT Scenario tests..." />
283+
284+
<Delete Files="$(TestOutputDirectory)\RTScenarioDebug.trx" />
285+
<Exec
286+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:AzureRTScenario /resultsfile:$(TestOutputDirectory)\RTScenarioDebug.trx"
287+
ContinueOnError="false" />
288+
</Target>
289+
224290
<Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
225291
<Message Importance="high" Text="Running AzureRT all tests..." />
226292
<Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />
@@ -229,7 +295,7 @@
229295
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTAddVhdDebug.trx"
230296
ContinueOnError="true" />
231297
<Exec
232-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter2) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
298+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllPreviewFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
233299
ContinueOnError="false" />
234300
</Target>
235301

@@ -241,6 +307,14 @@
241307
ContinueOnError="false" />
242308
</Target>
243309

310+
<Target Name="AzureRTCleanUp" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
311+
<Message Importance="high" Text="Running AzureRT clean up tests..." />
312+
<Delete Files="$(TestOutputDirectory)\RTCleanUpDebug.trx" />
313+
<Exec
314+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:AzureRTCleanUp /resultsfile:$(TestOutputDirectory)\RTCleanUpDebug.trx"
315+
ContinueOnError="false" />
316+
</Target>
317+
244318
<!-- DSC extension related targets -->
245319
<Target Name="TestDSCExtension_x64">
246320
<Message Importance="high" Text="Running DSC extension BVT x64 tests..." />

ChangeLog.txt

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,52 @@
1+
2015.01.08 version 0.8.13
2+
* Key Vault Service - new cmdlets in AzureResourceManager mode:
3+
* Keys:
4+
* Add-AzureKeyVaultKey
5+
* Get-AzureKeyVaultKey
6+
* Set-AzureKeyVaultKey
7+
* Backup-AzureKeyVaultKey
8+
* Restore-AzureKeyVaultKey
9+
* Remove-AzureKeyVaultKey
10+
* Secrets:
11+
* Get-AzureKeyVaultSecret
12+
* Set-AzureKeyVaultSecret
13+
* Remove-AzureKeyVaultSecret
14+
15+
2014.12.12 version 0.8.12
16+
* StreamAnalytics
17+
* New cmdlets in AzureResourceManager mode
18+
* New-AzureStreamAnalyticsJob
19+
* New-AzureStreamAnalyticsInput
20+
* New-AzureStreamAnalyticsOutput
21+
* New-AzureStreamAnalyticsTransformation
22+
* Get-AzureStreamAnalyticsJob
23+
* Get-AzureStreamAnalyticsInput
24+
* Get-AzureStreamAnalyticsOutput
25+
* Get-AzureStreamAnalyticsTransformation
26+
* Get-AzureStreamAnalyticsQuota
27+
* Remove-AzureStreamAnalyticsJob
28+
* Remove-AzureStreamAnalyticsInput
29+
* Remove-AzureStreamAnalyticsOutput
30+
* Test-AzureStreamAnalyticsInput
31+
* Test-AzureStreamAnalyticsOutput
32+
* Start-AzureStreamAnalyticsJob
33+
* Stop-AzureStreamAnalyticsJob
34+
* Batch
35+
* Fixed issue with Delete-AzureBatchAccount
36+
* Profile
37+
* Fixed issues with Select-AzureSubscription to allow selecting subscriptions by Id
38+
* Deprecated SubscriptionDataFile parameter
39+
* Compute
40+
* Set-AzureVMImage cmdlets - added IconUri, SmallIconUri, and ShowInGui parameters
41+
* Sql
42+
* Added Sql Servver v12 support to SQL authentication context for SqlAzure cmdlets
43+
144
2014.11.14 Version 0.8.11
245
* Profile
346
* Clear-AzureProfile: remove all subscription and credential data from the user store
447
* Select-AzureSubscription: fixed output types in default and PassThru mode
548
* Compute
649
* Get-AzureVMSqlServerExtension
7-
* New-AzureVMSqlServerExtension
850
* Set-AzureVMSqlServerExtension
951
* Remove-AzureVMSqlServerExtension
1052
* HDInsight

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<!-- Run checkin tests for each pull request -->
196196
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
197197
<Message Importance="high" Text="Running check in tests..." />
198-
<CallTarget Targets="SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices"/>
198+
<CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager; TestStorSimple"/>
199199
</Target>
200200

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

setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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 - November 2014" ?>
4+
<?define productName="Microsoft Azure PowerShell - January 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.11" ?>
8+
<?define version="0.8.14" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

0 commit comments

Comments
 (0)