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

Fix debian_config.json on ubuntu16.10

Browse source 
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.

Fixing this by removing the comma when there is only a single Shared Framework dependency.
This commit is contained in:
Eric Erhardt 2017-02-23 23:25:26 -06:00
parent 6f6ae43a93
commit a7003763b7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
View file

@ -83,7 +83,8 @@
</DebianConfigTokenValues> </DebianConfigTokenValues>
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%" <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'"> Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'">
<ReplacementString>"$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString> <ReplacementString>,
"$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString>
</DebianConfigTokenValues> </DebianConfigTokenValues>
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%" <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'"> Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'">

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_ADDITIONAL_DEPENDENCY%
} }
} }