|
1 | 1 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 2 | + |
2 | 3 | <ItemGroup> |
3 | 4 | <AssemblyProject Include="src\Base\Base.csproj" /> |
4 | 5 | <AssemblyProject Include="src\Environment\Environment.csproj" /> |
|
7 | 8 | <AssemblyProject Include="src\Json\Json.csproj" /> |
8 | 9 | </ItemGroup> |
9 | 10 |
|
10 | | - <ItemGroup Condition="'$(BuildCoreOnly)' != 'true'"> |
11 | | - <AssemblyProject Include="test\Microsoft.Configuration.ConfigurationBuilders.Test\Test\Test.csproj" /> |
12 | | - <AssemblyProject Include="samples\SampleWebApp\SampleWebApp.csproj" /> |
| 11 | + <ItemGroup> |
| 12 | + <TestProject Include="test\Microsoft.Configuration.ConfigurationBuilders.Test\Test.csproj" /> |
| 13 | + </ItemGroup> |
| 14 | + |
| 15 | + <ItemGroup> |
| 16 | + <SampleProject Include="samples\SampleWebApp\SampleWebApp.csproj" /> |
13 | 17 | </ItemGroup> |
14 | 18 |
|
15 | 19 | <ItemGroup> |
16 | 20 | <PackageProject Include="src\Packages\Packages.csproj" /> |
17 | 21 | </ItemGroup> |
18 | 22 |
|
19 | | - <Target Name="Build" DependsOnTargets="BuildAssemblies;BuildPackages" /> |
20 | | - <Target Name="Clean" DependsOnTargets="CleanPackages;CleanAssemblies" /> |
| 23 | + <Target Name="Build" DependsOnTargets="BuildAssemblies;UnitTest;BuildPackages" /> |
| 24 | + <Target Name="BuildAll" DependsOnTargets="BuildAssemblies;BuildSamples;UnitTest;BuildPackages" /> |
| 25 | + <Target Name="Clean" DependsOnTargets="CleanPackages;CleanSamples;CleanTests;CleanAssemblies" /> |
21 | 26 | <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> |
22 | 27 |
|
23 | 28 | <Target Name="BuildAssemblies" DependsOnTargets="RestorePackages"> |
24 | 29 | <MSBuild Targets="Build" Projects="@(AssemblyProject)" /> |
25 | | - </Target> |
| 30 | + </Target> |
| 31 | + |
| 32 | + <Target Name="BuildTests" DependsOnTargets="RestorePackages"> |
| 33 | + <MSBuild Targets="Build" Projects="@(TestProject)" /> |
| 34 | + </Target> |
| 35 | + |
| 36 | + <Target Name="BuildSamples" DependsOnTargets="RestorePackages"> |
| 37 | + <MSBuild Targets="Build" Projects="@(SampleProject)" /> |
| 38 | + </Target> |
26 | 39 |
|
27 | 40 | <Target Name="CleanAssemblies"> |
28 | | - <MSBuild Targets="Clean" Projects="MicrosoftConfigurationBuilders.sln" /> |
| 41 | + <MSBuild Targets="Clean" Projects="@(AssemblyProject)" /> |
29 | 42 | </Target> |
30 | 43 |
|
31 | | - <Target Name="RebuildAssemblies" DependsOnTargets="Clean;Build" /> |
| 44 | + <Target Name="CleanTests"> |
| 45 | + <MSBuild Targets="Clean" Projects="@(TestProject)" /> |
| 46 | + </Target> |
| 47 | + |
| 48 | + <Target Name="CleanSamples"> |
| 49 | + <MSBuild Targets="Clean" Projects="@(SampleProject)" /> |
| 50 | + </Target> |
32 | 51 |
|
33 | 52 | <!-- Packages build --> |
34 | 53 |
|
|
46 | 65 | <Exec Command=".nuget\NuGet.exe restore" /> |
47 | 66 | </Target> |
48 | 67 |
|
49 | | - <!-- |
50 | | - <Target Name="UnitTest"> |
51 | | - <ItemGroup> |
52 | | - <TestDLLs Include="test\Microsoft.Configuration.ConfigurationBuilders.Test\bin\$(Configuration)\*Test.dll" /> |
53 | | - </ItemGroup> |
54 | | - |
55 | | - <PropertyGroup> |
56 | | - <TestSettingsFile Condition=" '$(Configuration)' == 'CodeCoverage' ">$(MsBuildProjectDirectory)\test\CodeCoverage.testsettings</TestSettingsFile> |
57 | | - <TestSettingsFile Condition=" '$(Configuration)' != 'CodeCoverage' ">$(MsBuildProjectDirectory)\unittest.testsettings</TestSettingsFile> |
58 | | - </PropertyGroup> |
59 | | - |
60 | | - <Delete Files="bin\$(Configuration)-TestResults.trx" /> |
61 | | - <Exec |
62 | | - Command=""$(VS100COMNTOOLS)..\IDE\MSTEST.EXE" /nologo /usestderr /resultsfile:"bin\$(Configuration)-TestResults.trx" @(TestDLLs -> '/testcontainer:"%(Identity)"', ' ') /testsettings:"$(TestSettingsFile)"" /> |
63 | | - </Target> |
64 | | ---> |
65 | | - <Import Project="tools\MicrosoftConfigurationBuilders.targets"/> |
| 68 | + <Target Name="UnitTest" DependsOnTargets="BuildTests"> |
| 69 | + <MSBuild Targets="XunitTest" Projects="@(TestProject)" /> |
| 70 | + </Target> |
| 71 | + |
66 | 72 | </Project> |
0 commit comments