Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 764f750

Browse files
committed
Fix wildcard expansion to correctly exclude TestWrapper projects from build
1 parent 6c47879 commit 764f750

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/src/dirs.proj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="VerifyBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="dir.props" />
33

4-
<Target Name="VerifyBuildTools"
4+
<Target Name="VerifyBuildTools"
55
Inputs="$(BuildToolsTargetInputs)"
66
Outputs="$(BuildToolsTargetOutputs)"
77
>
8-
<Error Condition="!Exists('$(BuildToolsInstallSemaphore)')"
8+
<Error Condition="!Exists('$(BuildToolsInstallSemaphore)')"
99
Text="The build tools have not been installed. Please run buildtest.cmd from the root of the repo at least once to get the tools installed." />
1010

1111
<!-- If we enter this target at all then the inputs are newer then the outputs so give a warning. -->
12-
<Warning Text="Looks like there may be an update to the build tools. Please run buildtest.cmd from the root of the repo to refresh the build tools." />
12+
<Warning Text="Looks like there may be an update to the build tools. Please run buildtest.cmd from the root of the repo to refresh the build tools." />
1313
</Target>
1414

1515
<Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects" >
1616
<ItemGroup>
17-
<DisabledProjects Include="TestWrappers*\*\*.csproj" />
17+
<DisabledProjects Include="TestWrappers*\**\*.csproj" />
1818
<DisabledProjects Include="*\**\cs_template.csproj" />
1919
<DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' != 'true'" />
2020
<DisabledProjects Include="Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" />
@@ -31,7 +31,7 @@
3131
<DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
3232
<DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
3333
</ItemGroup>
34-
34+
3535
<ItemGroup>
3636
<Project Include="*\**\*.csproj" Exclude="@(DisabledProjects)">
3737
<AdditionalProperties>OSGroup=$(OSGroup)</AdditionalProperties>
@@ -43,7 +43,7 @@
4343
</Target>
4444

4545
<Import Project="..\dir.traversal.targets" />
46-
46+
4747
<!-- Override clean from dir.traversal.targets and just remove the full BinDir -->
4848
<Target Name="Clean">
4949
<RemoveDir Directories="$(BinDir)" />

0 commit comments

Comments
 (0)