Fixing a couple more merge issues regarding deb generation.
This commit is contained in:
parent
f42599dec2
commit
a5c7ac12f7
3 changed files with 6 additions and 2 deletions
|
@ -47,6 +47,10 @@
|
|||
DestinationFile="$(DebianConfigJsonFile)"
|
||||
ReplacementItems="@(DebianConfigTokenValues)" />
|
||||
|
||||
<Chmod
|
||||
Glob="$(PackageTool)"
|
||||
Mode="u+x" />
|
||||
|
||||
<!-- Build SDK Deb package -->
|
||||
<DotNetDebTool ToolPath="$(Stage0Directory)"
|
||||
InputDirectory="$(LayoutDirectory)"
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
<PropertyGroup>
|
||||
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName>
|
||||
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
|
||||
<PackageTool>$(NuGetPackagesDir)/dotnet-deb-tool/2.0.0-beta-beta-001599/lib/netcoreapp1.0/tool/package_tool</PackageTool>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- constants -->
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
},
|
||||
|
||||
"debian_dependencies":{
|
||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {},
|
||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {}
|
||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue