8000 only convert Version info to hashtable if its not an empty string · PowerShell/PSResourceGet@c822121 · GitHub
[go: up one dir, main page]

Skip to content

Commit c822121

Browse files
committed
only convert Version info to hashtable if its not an empty string
1 parent eb2443b commit c822121

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

src/code/PublishHelper.cs

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,38 +1126,43 @@ private string CreateNuspec(
11261126
{
11271127
XmlElement element = doc.CreateElement("dependency", nameSpaceUri);
11281128
element.SetAttribute("id", dependencyName);
1129-
1130-
var requiredModulesVersionInfo = (Hashtable)requiredModules[dependencyName];
1131-
string versionRange = "";
1132-
if (requiredModulesVersionInfo.ContainsKey("RequiredVersion"))
1129+
1130+
string dependencyVersion = requiredModules[dependencyName].ToString();
1131+
if (!string.IsNullOrEmpty(dependencyVersion))
11331132
{
1134-
// For RequiredVersion, use exact version notation [x.x.x]
1135-
string requiredModulesVersion = requiredModulesVersionInfo["RequiredVersion"].ToString();
1136-
versionRange = $"[{requiredModulesVersion}]";
1137-
}
1138-
else if (requiredModulesVersionInfo.ContainsKey("ModuleVersion") && requiredModulesVersionInfo.ContainsKey("MaximumVersion"))
1139-
{
1140-
// Version range when both min and max specified: [min,max]
1141-
versionRange = $"[{requiredModulesVersionInfo["ModuleVersion"]}, {requiredModulesVersionInfo["MaximumVersion"]}]";
1142-
}
1143-
else if (requiredModulesVersionInfo.ContainsKey("ModuleVersion"))
1144-
{
1145-
// Only min specified: min (which means ≥ min)
1146-
versionRange = requiredModulesVersionInfo["ModuleVersion"].ToString();
1147-
}
1148-
else if (requiredModulesVersionInfo.ContainsKey("MaximumVersion"))
1149-
{
1150-
// Only max specified: (, max]
1151-
versionRange = $"(, {requiredModulesVersionInfo["MaximumVersion"]}]";
1152-
}
1133+
var requiredModulesVersionInfo = (Hashtable)requiredModules[dependencyName];
1134+
string versionRange = String.Empty;
1135+
if (requiredModulesVersionInfo.ContainsKey("RequiredVersion"))
1136+
{
1137+
// For RequiredVersion, use exact version notation [x.x.x]
1138+
string requiredModulesVersion = requiredModulesVersionInfo["RequiredVersion"].ToString();
1139+
versionRange = $"[{requiredModulesVersion}]";
1140+
}
1141+
else if (requiredModulesVersionInfo.ContainsKey("ModuleVersion") && requiredModulesVersionInfo.ContainsKey("MaximumVersion"))
1142+
{
1143+
// Version range when both min and max specified: [min,max]
1144+
versionRange = $"[{requiredModulesVersionInfo["ModuleVersion"]}, {requiredModulesVersionInfo["MaximumVersion"]}]";
1145+
}
1146+
else if (requiredModulesVersionInfo.ContainsKey("ModuleVersion"))
1147+
{
1148+
// Only min specified: min (which means ≥ min)
1149+
versionRange = requiredModulesVersionInfo["ModuleVersion"].ToString();
1150+
}
1151+
else if (requiredModulesVersionInfo.ContainsKey("MaximumVersion"))
1152+
{
1153+
// Only max specified: (, max]
1154+
versionRange = $"(, {requiredModulesVersionInfo["MaximumVersion"]}]";
1155+
}
11531156

1154-
if (!string.IsNullOrEmpty(versionRange))
1155-
{
1156-
element.SetAttribute("version", versionRange);
1157+
if (!string.IsNullOrEmpty(versionRange))
1158+
{
1159+
element.SetAttribute("version", versionRange);
1160+
}
11571161
}
11581162

11591163
dependenciesElement.AppendChild(element);
11601164
}
1165+
11611166
metadataElement.AppendChild(dependenciesElement);
11621167
}
11631168

0 commit comments

Comments
 (0)
0