Fix debian package generation

Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored.  This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties.  So this change restores it in-place instead.
This commit is contained in:
Daniel Plaisted 2017-09-01 12:12:10 -07:00
parent 4c3b13e4a8
commit ac67434ea4
3 changed files with 2 additions and 13 deletions

View file

@ -156,22 +156,12 @@
<MakeDir Directories="$(DotNetDebToolOutputDirectory)" /> <MakeDir Directories="$(DotNetDebToolOutputDirectory)" />
</Target> </Target>
<Target Name="PrepareDotnetDebTool" <Target Name="PrepareDotnetDebTool">
DependsOnTargets="WriteDotnetDebToolProject">
<DotNetRestore ToolPath="$(PreviousStageDirectory)" <DotNetRestore ToolPath="$(PreviousStageDirectory)"
WorkingDirectory="$(DotnetDebToolDir)" /> WorkingDirectory="$(DotnetDebToolDir)" />
</Target> </Target>
<Target Name="WriteDotnetDebToolProject"
Inputs="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
Outputs="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)">
<Copy SourceFiles="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
DestinationFiles="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)" />
</Target>
<Target Name="TestDebuild"> <Target Name="TestDebuild">
<Message Text="Don't remove this" /> <Message Text="Don't remove this" />

View file

@ -8,8 +8,7 @@
<!-- dotnet deb-tool --> <!-- dotnet deb-tool -->
<PropertyGroup> <PropertyGroup>
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName> <DotnetDebToolDir>$(MSBuildThisFileDirectory)/dotnet-deb-tool-consumer</DotnetDebToolDir>
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
<PackageTool>$(NuGetPackagesDir)/dotnet-deb-tool/$(DotnetDebToolVersion)/lib/netcoreapp2.0/tool/package_tool</PackageTool> <PackageTool>$(NuGetPackagesDir)/dotnet-deb-tool/$(DotnetDebToolVersion)/lib/netcoreapp2.0/tool/package_tool</PackageTool>
</PropertyGroup> </PropertyGroup>