Skip to content

Commit 83db66f

Browse files
nemanja88nemanja88
committed
Pull and resolve conflicts
2 parents f10d0b9 + 57f5b0c commit 83db66f

File tree

709 files changed

+82813
-34891
lines changed

Some content is hidden

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

709 files changed

+82813
-34891
lines changed

‎AzurePowershell.Test.targets

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
2222
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
2323
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
24-
<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"</TestFilter>
2526
<ScenarioTestFilter>All</ScenarioTestFilter>
2627
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
27-
<AzureRTAllTestFilter>"Functional|AzureRTScenario"</AzureRTAllTestFilter>
28-
<AzureRTAllTestFilter2>"Functional|AzureRTScenario|Preview"</AzureRTAllTestFilter2>
29-
<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>
3033
</PropertyGroup>
3134

3235
<Target Name="InvokeMSTest">
@@ -112,6 +115,14 @@
112115
<Xunit.Runner.MSBuild.xunit Assemblies="$(_RecoveryServicesTestAssembly)" Html="$(TestOutputDirectory)\RecoveryServices.xunit.dll.html" Verbose="false"
113116
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
114117
</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>
115126

116127
<!-- Run the scenario tests -->
117128
<Target Name="ScenarioTest" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
@@ -137,6 +148,13 @@
137148
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
138149
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
139150
</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>
140158

141159
<!-- Run the scenario tests with Mocks -->
142160
<Target Name="MockedScenarioTests">
@@ -178,6 +196,14 @@
178196
ContinueOnError="false" />
179197
</Target>
180198

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+
181207
<Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
182208
<Message Importance="high" Text="Running tests:" />
183209
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
@@ -190,7 +216,7 @@
190216
<Message Importance="high" Text="Running AzureRT all tests..." />
191217
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
192218
<Exec
193-
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"
194220
ContinueOnError="false" />
195221
</Target>
196222

@@ -200,33 +226,67 @@
200226
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
201227
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
202228
<Exec
203-
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"
204230
ContinueOnError="true" />
205231
<Exec
206-
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"
207233
ContinueOnError="false" />
208234
</Target>
209235

210236
<Target Name="AzureRTSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
211237
<Message Importance="high" Text="Running AzureRT all tests..." />
212238

213239
<Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
214-
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
215240
<Exec
216-
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"
217242
ContinueOnError="true" />
218243
</Target>
219244

220-
<Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
245+
<Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
221246
<Message Importance="high" Text="Running AzureRT all tests..." />
222247

223248
<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">
255+
<Message Importance="high" Text="Running AzureRT all tests..." />
256+
257+
<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+
224266
<Delete Files="$(TestOutputDirectory)\RTDebug.trx" />
225267
<Exec
226268
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:$(AzureRTAllTestFilter) /resultsfile:$(TestOutputDirectory)\RTDebug.trx"
227269
ContinueOnError="false" />
228270
</Target>
229271

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+
230290
<Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
231291
<Message Importance="high" Text="Running AzureRT all tests..." />
232292
<Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />
@@ -235,7 +295,7 @@
235295
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Sequential /resultsfile:$(TestOutputDirectory)\RTAddVhdDebug.trx"
236296
ContinueOnError="true" />
237297
<Exec
238-
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"
239299
ContinueOnError="false" />
240300
</Target>
241301

‎ChangeLog.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
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+
115
2014.12.12 version 0.8.12
216
* StreamAnalytics
317
* New cmdlets in AzureResourceManager mode

‎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; TestStreamAnalyticsManager"/>
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 - December 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.12" ?>
8+
<?define version="0.8.13" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

0 commit comments

Comments
 (0)