Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.

coapp.powershell issue #85, convert dots to dashes when making msbuil… #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

coapp.powershell issue #85, convert dots to dashes when making msbuil… #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions clrplus/Scripting.MsBuild/Packaging/NugetPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down