Skip to content

Commit b8a5313

Browse files
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Conflicts: AzurePowershell.Test.targets
2 parents 1586d7a + 4b461b2 commit b8a5313

File tree

816 files changed

+51902
-15476
lines changed

Some content is hidden

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

816 files changed

+51902
-15476
lines changed

AzurePowershell.Test.targets

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
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>
@@ -71,6 +72,11 @@
7172
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
7273
</Target>
7374

75+
<Target Name="TestStreamAnalyticsManager">
76+
<Xunit.Runner.MSBuild.xunit Assemblies="$(StreamAnalyticsManagerTestDebug)" Html="$(TestOutputDirectory)\StreamAnalyticsManagerTestDebug.xunit.dll.html" Verbose="false"
77+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
78+
</Target>
79+
7480
<Target Name="TestServiceManagement">
7581
<MSBuild Targets="InvokeMSTest"
7682
Properties="_testAssembly=$(ServiceManagementTestDebug);_testSettings=$(TestSettings);_testFilter=$(TestFilter);_testResult=$(TestOutputDirectory)\ServiceManagementDebug.trx"
@@ -133,6 +139,13 @@
133139
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
134140
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
135141
</Target>
142+
143+
<!-- Run the KeyVault tests -->
144+
<Target Name="KeyVaultTests">
145+
<Message Importance="high" Text="Running KeyVault tests" />
146+
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
147+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
148+
</Target>
136149

137150
<!-- Run the scenario tests with Mocks -->
138151
<Target Name="MockedScenarioTests">

ChangeLog.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
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

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"/>
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.13" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

0 commit comments

Comments
 (0)