From 2d58c30701d0caf5e2f1272f4c4d278170e91e7e Mon Sep 17 00:00:00 2001 From: Marius Heise Date: Wed, 22 Jul 2015 18:03:50 +0200 Subject: [PATCH] coapp.powershell issue #85, convert dots to dashes when making msbuild package id contains dots (based on original patch from swn1). Also tested with split (overlay) packages. --- clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs b/clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs index e121c62..db273d3 100644 --- a/clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs +++ b/clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs @@ -351,11 +351,11 @@ internal string Save(bool cleanIntermediateFiles, bool generateOnly ,out IEnume // 'declare' the properties in global scope/ - var propName = "Needs-{0}".format(_pkgName); + var propName = "Needs-{0}".format(_pkgName).Replace(".", "_"); pg.AddProperty(propName, ""); pg.Condition = "'$({0})' == '' OR '$({0})' == '*Undefined*'".format(propName); - propName = "Needs-{0}-Version".format(_pkgName); + propName = "Needs-{0}-Version".format(_pkgName).Replace(".", "_"); pg.AddProperty(propName, ""); pg.Condition = "'$({0})' == '' OR '$({0})' == '*Undefined*'".format(propName); @@ -392,8 +392,8 @@ internal string Save(bool cleanIntermediateFiles, bool generateOnly ,out IEnume // version check. var wantVer = ((UInt64)((FourPartVersion)(string)_nuSpec.metadata.version)).ToString(); - var nvPropName = "Needs-{0}-Version".format(_pkgName); - var propName = "Needs-{0}".format(_pkgName); + var nvPropName = "Needs-{0}-Version".format(_pkgName).Replace(".", "_"); + var propName = "Needs-{0}".format(_pkgName).Replace(".", "_"); var prop = pg.AddProperty(nvPropName, (string)_nuSpec.metadata.version); prop.Condition = "'$({0})' == '' OR $({0}) < {1} ".format(propName, wantVer);