|
2 | 2 | <Project ToolsVersion="14.0" DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3 | 3 | <PropertyGroup>
|
4 | 4 | <Root>$(MSBuildThisFileDirectory)..\</Root>
|
5 |
| - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 5 | + <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> |
6 | 6 | <Artifacts>$(Root)artifacts\</Artifacts>
|
7 | 7 | <TestFilter>"AcceptanceType=CheckIn"</TestFilter>
|
8 | 8 | </PropertyGroup>
|
|
25 | 25 | <Message Importance="high" Text="net452: Building $([System.IO.Path]::GetFileName($(Solution)))" />
|
26 | 26 | <MSBuild Projects="$(Solution)" Properties="Configuration=$(Configuration)" />
|
27 | 27 |
|
28 |
| - <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |
| 28 | + <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> |
29 | 29 | <CurrentDate>$([System.DateTime]::Now.ToString(yyyy-MM-dd_hh_mm_ss))</CurrentDate>
|
30 | 30 | <TestOutput>$(Artifacts)Test\$(Framework)\TestResults_$(CurrentDate).html</TestOutput>
|
31 | 31 | </PropertyGroup>
|
32 |
| - <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> |
| 32 | + <ItemGroup Condition="'$(Configuration)' == 'Debug'"> |
33 | 33 | <TestAssemblies Include="$(OutputDir)*.Tests.dll;$(OutputDir)*.Test.dll;$(OutputDir)*.UnitTest.dll" />
|
34 | 34 | </ItemGroup>
|
35 |
| - <Message Condition=" '$(Configuration)' == 'Debug' " Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" /> |
36 |
| - <Exec Condition=" '$(Configuration)' == 'Debug' " Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/> |
| 35 | + <Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" /> |
| 36 | + <Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/> |
37 | 37 | </Target>
|
38 | 38 |
|
39 | 39 | <Target Name="netstandard20">
|
40 | 40 | <Message Importance="high" Text="Build: netstandard20 started" />
|
41 | 41 | <PropertyGroup>
|
42 | 42 | <Solution>$(Root)Azure.PowerShell.Common.Netcore.sln</Solution>
|
43 | 43 | <TestOutput>$(Artifacts)Test\</TestOutput>
|
| 44 | + <FileVersion Condition="'$(FileVersion)' == ''">1.0.0.0</FileVersion> |
44 | 45 | </PropertyGroup>
|
45 | 46 |
|
46 | 47 | <Message Importance="high" Text="netstandard20: Building $([System.IO.Path]::GetFileName($(Solution)))" />
|
47 |
| - <Exec Command="dotnet build $(Solution) -c $(Configuration) -NoLogo" /> |
| 48 | + <Exec Command="dotnet build $(Solution) -c $(Configuration) /p:FileVersion=$(FileVersion) -NoLogo" /> |
48 | 49 |
|
49 |
| - <Message Condition=" '$(Configuration)' == 'Debug' " Importance="high" Text="netstandard20: Testing $([System.IO.Path]::GetFileName($(Solution)))" /> |
50 |
| - <Exec Condition=" '$(Configuration)' == 'Debug' " Command="dotnet test $(Solution) --filter $(TestFilter) --configuration $(Configuration) --logger trx -NoLogo" ContinueOnError="ErrorAndContinue" /> |
51 |
| - <ItemGroup Condition=" '$(Configuration)' == 'Debug' "> |
| 50 | + <Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="netstandard20: Testing $([System.IO.Path]::GetFileName($(Solution)))" /> |
| 51 | + <Exec Condition="'$(Configuration)' == 'Debug'" Command="dotnet test $(Solution) --filter $(TestFilter) --configuration $(Configuration) --logger trx -NoLogo" ContinueOnError="ErrorAndContinue" /> |
| 52 | + <ItemGroup Condition="'$(Configuration)' == 'Debug'"> |
52 | 53 | <TestResults Include="$(Root)src\**\TestResults\*.trx" />
|
53 | 54 | </ItemGroup>
|
54 |
| - <Move Condition=" '$(Configuration)' == 'Debug' " SourceFiles="@(TestResults)" DestinationFolder="$(TestOutput)" /> |
| 55 | + <Move Condition="'$(Configuration)' == 'Debug'" SourceFiles="@(TestResults)" DestinationFolder="$(TestOutput)" /> |
55 | 56 | </Target>
|
56 | 57 |
|
57 | 58 | <Target Name="All" DependsOnTargets="net452;netstandard20" />
|
|
0 commit comments