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

Responding to PR feedback

Browse source
This commit is contained in:
Zlatko Knezevic 2017-01-18 12:04:18 -08:00
parent 20b06d1f21
commit e365eb7591
1 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
build/Microsoft.DotNet.Cli.Test.targets
View file

@ -86,40 +86,14 @@
</Target> </Target>
<Target Name="RestoreTests" <Target Name="RestoreTests"
DependsOnTargets="CreateTestAssetPackageNuPkgs; DependsOnTargets="CreateTestAssetPackageNuPkgs;">
CleanTestProjectsBinObj;
SetupRestoreTestsInputs;"
Inputs="@(RestoreTestsInputs)"
Outputs="@(RestoreTestsInputs->'%(RelativeDir)/obj/project.assets.json');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.props');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.targets')">
<CallTarget Targets="CleanTestProjectsLockFiles"/> <CallTarget Targets="CleanTestProjectsLockFiles"/>
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(Stage0Directory)"
ProjectPath="&quot;%(RestoreTestsInputs.FullPath)&quot;" /> ProjectPath="&quot;$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln&quot;" />
</Target> </Target>
<Target Name="CleanTestProjectsBinObj" <Target Name="BuildTestAssets"
DependsOnTargets="SetupRestoreTestsInputs;">
<ItemGroup>
<FilesToDelete Include="$(TestDirectory)**/bin/**/project.assets.json;$(TestDirectory)**/bin/**/*.csproj.nuget.g.props;$(TestDirectory)**/bin/**/*.csproj.nuget.g.targets" />
<FilesToDelete Include="$(TestDirectory)**/obj/**/project.assets.json;$(TestDirectory)**/obj/**/*.csproj.nuget.g.props;$(TestDirectory)**/obj/**/*.csproj.nuget.g.targets" />
</ItemGroup>
<Delete Files="@(FilesToDelete)" />
<ItemGroup>
<FilesToDelete Remove="*" />
</ItemGroup>
</Target>
<Target Name="SetupRestoreTestsInputs"
DependsOnTargets="PrepareTests;" >
<ItemGroup>
<RestoreTestsInputs Include="$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln"
Exclude="$(TestDirectory)/**/bin/**/*.csproj" />
</ItemGroup>
</Target>
<Target Name="BuildTestAssets"
DependsOnTargets="BuildTestAssetProjects; DependsOnTargets="BuildTestAssetProjects;
BuildDesktopTestAssetProjects;"> BuildDesktopTestAssetProjects;">
</Target> </Target>