Skip to content

Commit b11f0db

Browse files
avirupchavirupch
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents c8ac33a + 8f1d81f commit b11f0db

File tree

555 files changed

+98379
-43028
lines changed

Some content is hidden

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

555 files changed

+98379
-43028
lines changed

‎AzurePowershell.Test.targets

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<DataFactoryManagerTestDebug>.\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll</DataFactoryManagerTestDebug>
1717
<StreamAnalyticsManagerTestDebug>.\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll</StreamAnalyticsManagerTestDebug>
1818
<BatchTestDebug>.\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
19+
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
1920
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
2021
<ServiceManagementExtensionsTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Extensions.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions.Test.dll</ServiceManagementExtensionsTestDebug>
2122
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
@@ -32,13 +33,36 @@
3233
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
3334
</PropertyGroup>
3435

36+
<ItemGroup>
37+
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
38+
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
39+
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
40+
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
41+
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
42+
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
43+
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
44+
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
45+
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
46+
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
47+
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
48+
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
49+
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
50+
</ItemGroup>
51+
3552
<Target Name="InvokeMSTest">
3653
<!--Remove existing test result; otherwsie mstest will error-->
3754
<Delete Files="$(_testResult)"/>
3855
<Exec
3956
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
4057
ContinueOnError="false" />
4158
</Target>
59+
60+
<Target Name="InvokeXUnit">
61+
<Message Importance="high" Text="Running XUnit tests" />
62+
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
63+
<Xunit.Runner.MSBuild.xunit Assemblies="@(XUnitTests)" Html="$(TestOutputDirectory)\xunit.tests.dll.html" Verbose="true"
64+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
65+
</Target>
4266

4367
<Target Name="BeforeRunTests">
4468
<Message Importance="high" Text="You are required to have installed a version of Visual Studio with support for MSTest (and MSTest on your path)." />
@@ -68,6 +92,12 @@
6892
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
6993
</Target>
7094

95+
96+
<Target Name="TestWebsites">
97+
<Xunit.Runner.MSBuild.xunit Assemblies="$(WebsitesTestDebug)" Html="$(TestOutputDirectory)\WebsitesTestDebug.xunit.dll.html" Verbose="false"
98+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
99+
</Target>
100+
71101
<Target Name="TestDataFactoryManager">
72102
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"
73103
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
@@ -269,12 +299,12 @@
269299
ContinueOnError="false" />
270300
</Target>
271301

272-
<Target Name="AzureRTFuntional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
273-
<Message Importance="high" Text="Running AzureRT Funtional tests..." />
302+
<Target Name="AzureRTFunctional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
303+
<Message Importance="high" Text="Running AzureRT Functional tests..." />
274304

275-
<Delete Files="$(TestOutputDirectory)\RTFuntionalDebug.trx" />
305+
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
276306
<Exec
277-
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFuntionalDebug.trx"
307+
Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug.trx"
278308
ContinueOnError="false" />
279309
</Target>
280310

‎build.proj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
1818
<DebugBuildConfig>Configuration=Debug;Platform=Any CPU</DebugBuildConfig>
1919
<ReleaseBuildConfig>Configuration=Release;Platform=Any CPU</ReleaseBuildConfig>
20+
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<AzurePowerShellSln Include=".\src\AzurePowerShell.sln" />
@@ -104,11 +105,13 @@
104105
Projects="@(AzurePowerShellSln)"
105106
Targets="Build"
106107
Properties="$(DebugBuildConfig)"
108+
BuildInParallel="$(BuildInParallel)"
107109
ContinueOnError="false" />
108110
<MSBuild
109111
Projects="@(AzurePowerShellSln)"
110112
Targets="Build"
111113
Properties="$(ReleaseBuildConfig)"
114+
BuildInParallel="$(BuildInParallel)"
112115
ContinueOnError="false" />
113116
</Target>
114117

@@ -160,6 +163,7 @@
160163
Projects="@(AzurePowerShellSln)"
161164
Targets="Build"
162165
Properties="$(ReleaseBuildConfig)"
166+
BuildInParallel="$(BuildInParallel)"
163167
ContinueOnError="false" />
164168
</Target>
165169

@@ -170,6 +174,7 @@
170174
Projects="@(AzurePowerShellSln)"
171175
Targets="Build"
172176
Properties="$(DebugBuildConfig)"
177+
BuildInParallel="$(BuildInParallel)"
173178
ContinueOnError="false" />
174179
</Target>
175180

@@ -183,7 +188,7 @@
183188
<!-- Run checkin tests for each pull request -->
184189
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
185190
<Message Importance="high" Text="Running check in tests..." />
186-
<CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager; TestStorSimple"/>
191+
<CallTarget Targets="InvokeXUnit; TestHDInsight; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestDSCExtension_x64"/>
187192
</Target>
188193

189194
<!-- 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 - February 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - March 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.14" ?>
8+
<?define version="0.8.15" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

0 commit comments

Comments
 (0)