From a7003763b753c119004d1610c0dfc31fc6dc1c46 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 23 Feb 2017 23:25:26 -0600 Subject: [PATCH] Fix debian_config.json on ubuntu16.10 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. --- build/package/Microsoft.DotNet.Cli.Installer.DEB.targets | 3 ++- packaging/deb/dotnet-debian_config.json | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets index 5102f1ad5..a8801fd5b 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets +++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets @@ -83,7 +83,8 @@ - "$(AdditionalSharedFxDebianPackageName)" : {} + , + "$(AdditionalSharedFxDebianPackageName)" : {} diff --git a/packaging/deb/dotnet-debian_config.json b/packaging/deb/dotnet-debian_config.json index 4caa326c9..22e5beb77 100644 --- a/packaging/deb/dotnet-debian_config.json +++ b/packaging/deb/dotnet-debian_config.json @@ -29,7 +29,6 @@ }, "debian_dependencies":{ - "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}, - %SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY% + "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY% } }