Skip to content

Commit 6ea8f95

Browse files
committed
Add "final" support to SDK content tests
1 parent 9f388f4 commit 6ea8f95

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

tests/Microsoft.DotNet.Docker.Tests/Config.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,20 @@ private static JObject LoadManifest(string manifestFile)
6767
public static string GetVariableValue(string variableName) =>
6868
GetVariableValue(variableName, (JObject)ManifestVersions.Value["variables"]);
6969

70+
public static bool TryGetVariableValue(string variableName, out string value)
71+
{
72+
var variables = (JObject)ManifestVersions.Value["variables"];
73+
JToken token = variables[variableName];
74+
if (token is null)
75+
{
76+
value = string.Empty;
77+
return false;
78+
}
79+
80+
value = ResolveVariables((string)token, variables);
81+
return true;
82+
}
83+
7084
private static string GetVariableValue(string variableName, JObject variables) =>
7185
ResolveVariables((string)variables[variableName], variables);
7286

tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,20 @@ private static string GetSdkVersionFileLabel(string sdkBuildVersion, string dotn
347347
|| sdkBuildVersion.Contains("-servicing")
348348
|| sdkBuildVersion.Contains("-rtm");
349349

350-
string sdkVersionFile = isStableBranding
351-
? Config.GetVariableValue($"sdk|{dotnetVersion}|product-version")
352-
: sdkBuildVersion;
350+
if (isStableBranding)
351+
{
352+
return Config.GetVariableValue($"sdk|{dotnetVersion}|product-version");
353+
}
354+
355+
bool useFinalVersion =
356+
Config.TryGetVariableValue($"sdk|{dotnetVersion}|use-final-version", out string finalFlag)
357+
&& finalFlag == "true";
358+
if (useFinalVersion)
359+
{
360+
return Config.GetVariableValue($"sdk|{dotnetVersion}|product-version") + ".final";
361+
}
353362

354-
return sdkVersionFile;
363+
return sdkBuildVersion;
355364
}
356365

357366
private string GetSdkUrl(ProductImageData imageData)

0 commit comments

Comments
 (0)