Skip to content

Commit 7125dee

Browse files
huangpfhuangpf
committed
Merge pull request #136 from huangpf/dev
Dev
2 parents d77ade5 + aa6553a commit 7125dee

File tree

1,008 files changed

+22453
-6590
lines changed

Some content is hidden

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

1,008 files changed

+22453
-6590
lines changed

‎AzurePowershell.Test.targets

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
8585
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8686
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
87-
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
87+
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
88+
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
8889
<XUnitTests Include="@(AsmXUnitTests)"/>
8990
</ItemGroup>
9091
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
@@ -98,19 +99,37 @@
9899
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
99100
<Message Importance="high" Text="Running XUnit tests" />
100101
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
101-
<Exec
102-
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
103-
Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/>
104-
<OnError ExecuteTargets="TimeoutErrorHandler"/>
102+
103+
<xunit
104+
Assemblies="@(XUnitTests)"
105+
AppDomains="true"
106+
ShadowCopy="false"
107+
ParallelizeTestCollections="false"
108+
ParallelizeAssemblies="true"
109+
IncludeTraits="AcceptanceType=CheckIn"
110+
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
111+
MaxParallelThreads="10"
112+
DiagnosticMessages="false"
113+
ContinueOnError="false"
114+
Condition=" @(XUnitTests) != '' "/>
105115
</Target>
106116

107117
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
108118
<Message Importance="high" Text="Running XUnit tests" />
109119
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
110-
<Exec
111-
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -notrait &quot;RunType=LiveOnly&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
112-
Timeout="$(TestTimeout)" ContinueOnError="false"/>
113-
<OnError ExecuteTargets="TimeoutErrorHandler"/>
120+
121+
<xunit
122+
Assemblies="@(XUnitTests)"
123+
AppDomains="true"
124+
ShadowCopy="false"
125+
ParallelizeTestCollections="false"
126+
ParallelizeAssemblies="true"
127+
ExcludeTraits="RunType=LiveOnly"
128+
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
129+
MaxParallelThreads="10"
130+
DiagnosticMessages="false"
131+
ContinueOnError="false"
132+
Condition=" @(XUnitTests) != '' "/>
114133
</Target>
115134

116135
<Target Name="TimeoutErrorHandler">
@@ -458,7 +477,7 @@
458477

459478
<Target Name="LiveTests">
460479
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
461-
<Exec Command="packages\xunit.runners.1.9.2\tools\xunit.console.clr4.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
480+
<Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
462481
</Target>
463482

464483

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
7171

7272
<UsingTask
73-
AssemblyFile="$(MSBuildProjectDirectory)\src\packages\xunit.MSBuild.2.0.0.0\tools\xunit.runner.msbuild.dll"
73+
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll"
7474
TaskName="Xunit.Runner.MSBuild.xunit" />
7575

7676
<!-- Clean the build in all configurations -->

‎packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit.runner.console" version="2.0.0" />
4-
<package id="xunit.runners" version="1.9.2" />
3+
<package id="xunit.runner.console" version="2.1.0" />
4+
<package id="xunit.runner.msbuild" version="2.1.0" />
55
</packages>

0 commit comments

Comments
 (0)