Skip to content

Commit

Permalink
Fix debian package generation
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dsplaisted committed Sep 1, 2017
1 parent 4c3b13e commit ac67434
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
12 changes: 1 addition & 11 deletions build/package/Installer.DEB.proj
Original file line number Diff line number Diff line change
Expand Up @@ -156,22 +156,12 @@
<MakeDir Directories="$(DotNetDebToolOutputDirectory)" />
</Target>

<Target Name="PrepareDotnetDebTool"
DependsOnTargets="WriteDotnetDebToolProject">
<Target Name="PrepareDotnetDebTool">

<DotNetRestore ToolPath="$(PreviousStageDirectory)"
WorkingDirectory="$(DotnetDebToolDir)" />
</Target>

<Target Name="WriteDotnetDebToolProject"
Inputs="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
Outputs="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)">

<Copy SourceFiles="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
DestinationFiles="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)" />

</Target>

<Target Name="TestDebuild">
<Message Text="Don't remove this" />

Expand Down
3 changes: 1 addition & 2 deletions build/package/Installer.DEB.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

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

Expand Down

0 comments on commit ac67434

Please sign in to comment.