Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@
PropertyName="SubTasks" />
</CreateProperty>
<CreateProperty
Value="@(BuildCsprojList->Split(`;`)->Count())">
Value="@(TestCsprojList->Split(`;`)->Count())">
<Output
TaskParameter="Value"
PropertyName="IsBuildListEmpty" />
PropertyName="IsTestListEmpty" />
</CreateProperty>
</Target>

Expand Down Expand Up @@ -311,13 +311,13 @@
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) &quot;" />
</Target>

<Target Name="Test">
<Target Name="Test" DependsOnTargets="FilterBuild">
<Message Importance="high" Text="Running check in tests..." />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />

<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
<Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" />
<Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot; --verbosity d" />

<OnError ExecuteTargets="TestFailureErrorMessage" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion tools/CreateFilterMappings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function Add-ProjectDependencies
[string]$SolutionPath
)

$CommonProjectsToIgnore = @("Authenticators", "ScenarioTest.ResourceManager", "TestFx", "Tests" )
$CommonProjectsToIgnore = @("ScenarioTest.ResourceManager", "TestFx", "Tests" )

$ProjectDependencies = @()
$Content = Get-Content -Path $SolutionPath
Expand Down