|
68 | 68 | <Exec Command='"$(NuGetExe)" restore "%(SolutionsToBuild.Identity)" -PackagesDirectory packages -NonInteractive -Verbosity quiet -ConfigFile "$(MsBuildThisFileDirectory)\.nuget\NuGet.Config"' /> |
69 | 69 | <!-- Pick the right Microsoft.Web.FxCop package to use and copy it to a standard location. --> |
70 | 70 | </Target> |
71 | | - |
| 71 | + |
72 | 72 | <Target Name="BuildTools"> |
73 | 73 | <PropertyGroup> |
74 | 74 | <FxCopProjectLocation>$(MsBuildThisFileDirectory)tools\src\Microsoft.Web.FxCop\</FxCopProjectLocation> |
75 | 75 | <CustomFxCopRulesPath>$(MsBuildThisFileDirectory)packages\CustomFxCopRules</CustomFxCopRulesPath> |
76 | 76 | </PropertyGroup> |
77 | | - <MsBuild |
| 77 | + <MsBuild |
78 | 78 | Condition=" '$(CodeAnalysis)' == 'true' " |
79 | | - Projects="$(FxCopProjectLocation)\Microsoft.Web.FxCop.csproj" |
| 79 | + Projects="$(FxCopProjectLocation)\Microsoft.Web.FxCop.csproj" |
80 | 80 | Properties="Configuration=Release;OutputPath=$(CustomFxCopRulesPath)" /> |
81 | 81 | </Target> |
82 | 82 |
|
|
98 | 98 |
|
99 | 99 | <Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames"> |
100 | 100 | <ItemGroup> |
101 | | - <TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll;bin\$(Configuration)\test\*.Test.*.dll;bin\$(Configuration)\Test\NetCore\*.Test.dll;bin\$(Configuration)\Test\NetStandard\*.Test.dll" /> |
102 | | - <XunitProject Include="tools\WebStack.xunit.targets"> |
103 | | - <Properties>TestAssembly=%(TestDLLsXunit.FullPath);XmlPath=$(TestResultsDirectory)%(TestDLLsXunit.FileName)-XunitResults.xml</Properties> |
104 | | - </XunitProject> |
| 101 | + <_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" /> |
| 102 | + <_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.*.dll" /> |
| 103 | + <_TestDLLsXunit Include="bin\$(Configuration)\Test\NetCore\*.Test.dll" /> |
| 104 | + <_TestDLLsXunit Include="bin\$(Configuration)\Test\NetStandard\*.Test.dll" /> |
| 105 | + <_XunitProject Include="tools\WebStack.xunit.targets"> |
| 106 | + <Properties>TestAssembly=%(_TestDLLsXunit.FullPath);XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties> |
| 107 | + </_XunitProject> |
105 | 108 | </ItemGroup> |
106 | 109 |
|
107 | | - <!-- Re-create the test results directory so that print summary doesn't run on old test results --> |
| 110 | + <!-- Recreate the test results directory so that print summary doesn't run on old test results. --> |
108 | 111 | <RemoveDir Directories="$(TestResultsDirectory)" /> |
109 | 112 | <MakeDir Directories="$(TestResultsDirectory)" /> |
110 | 113 |
|
111 | | - <MSBuild Projects="@(XunitProject)" BuildInParallel="$(TestInParallel)" Targets="Xunit" /> |
| 114 | + <MSBuild Projects="@(_XunitProject)" BuildInParallel="$(TestInParallel)" Targets="Xunit" /> |
112 | 115 | </Target> |
113 | 116 |
|
114 | 117 | <Target Name="CheckSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames"> |
|
0 commit comments