mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #5864 from piotrpMSFT/piotrpMSFT/infra/BuildTestsWithStage2

Browse source 
Move Test to use build output where possible.
This commit is contained in:
Piotr Puszkiewicz 2017-02-27 23:10:42 -08:00 • committed by GitHub
commit c8e1a52b01
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/Test.targets
View file

@ -58,13 +58,13 @@
<Target Name="RestoreTests" <Target Name="RestoreTests"
DependsOnTargets="PrepareTests; DependsOnTargets="PrepareTests;
CreateTestAssetPackageNuPkgs;"> CreateTestAssetPackageNuPkgs;">
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(OutputDirectory)"
ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;" /> ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;" />
</Target> </Target>
<Target Name="BuildTests" <Target Name="BuildTests"
DependsOnTargets="RestoreTests;"> DependsOnTargets="RestoreTests;">
<DotNetBuild ToolPath="$(Stage0Directory)" <DotNetBuild ToolPath="$(OutputDirectory)"
ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;" /> ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;" />
</Target> </Target>
@ -79,7 +79,7 @@
<!-- https://github.com/NuGet/Home/issues/4063 --> <!-- https://github.com/NuGet/Home/issues/4063 -->
<DotNetPack Output="$(TestPackagesDir)" <DotNetPack Output="$(TestPackagesDir)"
ProjectPath="%(TestPackageProject.ProjectPath)" ProjectPath="%(TestPackageProject.ProjectPath)"
ToolPath="$(Stage0Directory)" ToolPath="$(OutputDirectory)"
VersionSuffix="%(TestPackageProject.VersionSuffix)" VersionSuffix="%(TestPackageProject.VersionSuffix)"
MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" /> MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />