8000 account for 2 digit version being concatenated with prerelease when c… · PowerShell/PSResourceGet@fa0880b · GitHub
[go: up one dir, main page]

Skip to content

Commit fa0880b

Browse files
committed
account for 2 digit version being concatenated with prerelease when creating version for .xml when installing
1 parent a253650 commit fa0880b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/code/Utils.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,11 @@ public static string GetNormalizedVersionString(
316316
string versionString,
317317
string prerelease)
318318
{
319-
// versionString may be like 1.2.0.0 or 1.2.0
319+
// versionString may be like 1.2.0.0 or 1.2.0 or 1.2
320320
// prerelease may be null or "alpha1"
321321
// possible passed in examples:
322+
// versionString: "1.2" <- container registry 2 digit version
323+
// versionString: "1.2" prerelease: "alpha1" <- container registry 2 digit version
322324
// versionString: "1.2.0" prerelease: "alpha1"
323325
// versionString: "1.2.0" prerelease: "" <- doubtful though
324326
// versionString: "1.2.0.0" prerelease: "alpha1"
@@ -331,9 +333,10 @@ public static string GetNormalizedVersionString(
331333

332334
int numVersionDigits = versionString.Split('.').Count();
333335

334-
if (numVersionDigits == 3)
336+
if (numVersionDigits == 2 || numVersionDigits == 3)
335337
{
336-
// versionString: "1.2.0" prerelease: "alpha1"
338+
// versionString: "1.2.0" prerelease: "alpha1" -> 1.2.0-alpha1
339+
// versionString: "1.2" prerelease: "alpha1" -> 1.2-alpha1
337340
return versionString + "-" + prerelease;
338341
}
339342
else if (numVersionDigits == 4)

0 commit comments

Comments
 (0)
0