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

Fixing a couple more merge issues regarding deb generation.

Browse source
This commit is contained in:
Parallels 2017-03-03 13:30:57 -08:00
parent f42599dec2
commit a5c7ac12f7
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/package/Installer.DEB.proj
View file

@ -47,6 +47,10 @@
DestinationFile="$(DebianConfigJsonFile)" DestinationFile="$(DebianConfigJsonFile)"
ReplacementItems="@(DebianConfigTokenValues)" /> ReplacementItems="@(DebianConfigTokenValues)" />
<Chmod
Glob="$(PackageTool)"
Mode="u+x" />
<!-- Build SDK Deb package --> <!-- Build SDK Deb package -->
<DotNetDebTool ToolPath="$(Stage0Directory)" <DotNetDebTool ToolPath="$(Stage0Directory)"
InputDirectory="$(LayoutDirectory)" InputDirectory="$(LayoutDirectory)"

1
build/package/Installer.DEB.targets
View file

@ -10,6 +10,7 @@
<PropertyGroup> <PropertyGroup>
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName> <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName>
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir> <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
<PackageTool>$(NuGetPackagesDir)/dotnet-deb-tool/2.0.0-beta-beta-001599/lib/netcoreapp1.0/tool/package_tool</PackageTool>
</PropertyGroup> </PropertyGroup>
<!-- constants --> <!-- constants -->

3
packaging/deb/dotnet-debian_config.json
View file

@ -29,7 +29,6 @@
}, },
"debian_dependencies":{ "debian_dependencies":{
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}, "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {}
} }
} }