Skip to content

Commit

Permalink
Merge pull request Azure#18 from stankovski/dev
Browse files Browse the repository at this point in the history
Merging public dev into private
  • Loading branch information
stankovski committed Dec 31, 2014
2 parents 508e973 + 347fb75 commit 79990d6
Show file tree
Hide file tree
Showing 615 changed files with 39,528 additions and 13,268 deletions.
6 changes: 6 additions & 0 deletions AzurePowershell.Test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ManagementTestDebug>.\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll</ManagementTestDebug>
<ResourceManagerTestDebug>.\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll</ResourceManagerTestDebug>
<DataFactoryManagerTestDebug>.\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll</DataFactoryManagerTestDebug>
<StreamAnalyticsManagerTestDebug>.\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll</StreamAnalyticsManagerTestDebug>
<BatchTestDebug>.\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
<ServiceManagementExtensionsTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Extensions.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions.Test.dll</ServiceManagementExtensionsTestDebug>
Expand Down Expand Up @@ -69,6 +70,11 @@
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestStreamAnalyticsManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(StreamAnalyticsManagerTestDebug)" Html="$(TestOutputDirectory)\StreamAnalyticsManagerTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestServiceManagement">
<MSBuild Targets="InvokeMSTest"
Properties="_testAssembly=$(ServiceManagementTestDebug);_testSettings=$(TestSettings);_testFilter=$(TestFilter);_testResult=$(TestOutputDirectory)\ServiceManagementDebug.trx"
Expand Down
30 changes: 29 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,38 @@
2014.12.12 version 0.8.12
* StreamAnalytics
* New cmdlets in AzureResourceManager mode
* New-AzureStreamAnalyticsJob
* New-AzureStreamAnalyticsInput
* New-AzureStreamAnalyticsOutput
* New-AzureStreamAnalyticsTransformation
* Get-AzureStreamAnalyticsJob
* Get-AzureStreamAnalyticsInput
* Get-AzureStreamAnalyticsOutput
* Get-AzureStreamAnalyticsTransformation
* Get-AzureStreamAnalyticsQuota
* Remove-AzureStreamAnalyticsJob
* Remove-AzureStreamAnalyticsInput
* Remove-AzureStreamAnalyticsOutput
* Test-AzureStreamAnalyticsInput
* Test-AzureStreamAnalyticsOutput
* Start-AzureStreamAnalyticsJob
* Stop-AzureStreamAnalyticsJob
* Batch
* Fixed issue with Delete-AzureBatchAccount
* Profile
* Fixed issues with Select-AzureSubscription to allow selecting subscriptions by Id
* Deprecated SubscriptionDataFile parameter
* Compute
* Set-AzureVMImage cmdlets - added IconUri, SmallIconUri, and ShowInGui parameters
* Sql
* Added Sql Servver v12 support to SQL authentication context for SqlAzure cmdlets

2014.11.14 Version 0.8.11
* Profile
* Clear-AzureProfile: remove all subscription and credential data from the user store
* Select-AzureSubscription: fixed output types in default and PassThru mode
* Compute
* Get-AzureVMSqlServerExtension
* New-AzureVMSqlServerExtension
* Set-AzureVMSqlServerExtension
* Remove-AzureVMSqlServerExtension
* HDInsight
Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<!-- Run checkin tests for each pull request -->
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
<Message Importance="high" Text="Running check in tests..." />
<CallTarget Targets="SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices"/>
<CallTarget Targets="SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager"/>
</Target>

<!-- Run Full switch with scenario tests -->
Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define productName="Microsoft Azure PowerShell - November 2014" ?>
<?define productName="Microsoft Azure PowerShell - December 2014" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="0.8.11" ?>
<?define version="0.8.12" ?>
<?define versionedStartMenuFolder="Microsoft Azure" ?>
<?define staleStartMenuFolder="Windows Azure" ?>

Expand Down
Loading

0 comments on commit 79990d6

Please sign in to comment.