Skip to content

pull from dev branch of azure/azure-powershell #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 44 commits into from
Mar 10, 2015
Merged

pull from dev branch of azure/azure-powershell #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
246afed
Retry setting up vnet during initialization of Static CA tests.
Feb 10, 2015
1ba0970
Retry setting up vnet during initialization of Static CA tests.
Feb 10, 2015
648aaea
Update vm size test
Feb 10, 2015
2338f53
Fix type
Feb 10, 2015
da73cb5
Add downloading tools
Feb 13, 2015
eac543c
Add ReservedIp test for PaaS
Feb 18, 2015
73ce75b
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
Feb 18, 2015
29771aa
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 18, 2015
6de00fc
Vipmobility powershell
Feb 22, 2015
f705eb4
Update Compute package version to 9.2.0
Mar 1, 2015
acdfadc
Fix reference version
Mar 1, 2015
fed92be
Powershell parameters changed, mote tests added for vipMobility
Mar 1, 2015
4560019
Add -ForceUpdate parameter to the following cmdltes:
Mar 1, 2015
b54853c
Add Regions to Get-AzureVMAvailableExtension output
Mar 1, 2015
958a59f
Merge pull request #12 from hyonholee/dev
AzureRT Mar 1, 2015
35f9f13
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
Mar 1, 2015
e12700c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Mar 2, 2015
768f091
Add 'ResizedSizeInGB' parameter to Update-AzureDisk
Mar 2, 2015
c71801c
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
Mar 2, 2015
8d9bf96
Add 'ResizedSizeInGB' parameter to Set-AzureOSDisk
Mar 2, 2015
74d4bd7
Merge pull request #13 from hyonholee/dev
AzureRT Mar 2, 2015
eefbaaf
updated Pull from AzureRT
Mar 2, 2015
38da735
Merge pull request #11 from avijitgupta/dev
AzureRT Mar 3, 2015
4b711b5
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Mar 3, 2015
6df9a7d
Remove password and fix AzureDiskTest
Mar 3, 2015
c9592e6
Update versions to 0.8.15
markcowl Mar 3, 2015
5a62841
Add 'ResizedSizeInGB' parameter to Set-AzureDataDisk
Mar 3, 2015
393bfe6
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
Mar 3, 2015
bcf0445
Merge pull request #14 from hyonholee/dev
AzureRT Mar 3, 2015
518a34b
Merge pull request #213 from markcowl/release-0.8.15
amarzavery Mar 3, 2015
067c371
Merge pull request #214 from AzureRT/dev
amarzavery Mar 3, 2015
6dbf8f0
tests and also webhosting plan work
NaveenGoli Mar 3, 2015
e37245e
Remving unnecessary dependency in Websites cmdlets and finxing installer
markcowl Mar 4, 2015
b920021
Updating build target directory for Release
markcowl Mar 4, 2015
5b952b4
modified installation tests
amarzavery Mar 4, 2015
a93426d
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
amarzavery Mar 4, 2015
2ef923b
Merge pull request #225 from amarzavery/dev
markcowl Mar 4, 2015
e5f36c2
fixdynamic
markcowl Mar 4, 2015
e426982
Merging with dev branch
markcowl Mar 4, 2015
a2dd76d
Merge pull request #227 from markcowl/wixdev
markcowl Mar 4, 2015
076807f
addressed comments and ensured tests are updated to latest changes
NaveenGoli Mar 5, 2015
05ba243
Merge dev https://github.com/Azure/azure-powershell
NaveenGoli Mar 5, 2015
b007564
removed hardcoding in the tests; removed unnecessary references, adde…
NaveenGoli Mar 6, 2015
a1a8503
Merge pull request #229 from NaveenGoli/save-branch
ogail Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<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>
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
<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>
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
Expand All @@ -40,6 +41,7 @@
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
Expand Down Expand Up @@ -90,6 +92,12 @@
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>


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

<Target Name="TestDataFactoryManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
Expand Down Expand Up @@ -291,12 +299,12 @@
ContinueOnError="false" />
</Target>

<Target Name="AzureRTFuntional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
<Message Importance="high" Text="Running AzureRT Funtional tests..." />
<Target Name="AzureRTFunctional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
<Message Importance="high" Text="Running AzureRT Functional tests..." />

<Delete Files="$(TestOutputDirectory)\RTFuntionalDebug.trx" />
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
<Exec
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFuntionalDebug.trx"
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
ContinueOnError="false" />
</Target>

Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
View file
Open in desktop
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 - February 2015" ?>
<?define productName="Microsoft Azure PowerShell - March 2015" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="0.8.14" ?>
<?define version="0.8.15" ?>
<?define versionedStartMenuFolder="Microsoft Azure" ?>
<?define staleStartMenuFolder="Windows Azure" ?>

Expand Down
Loading