Skip to content

Commit aa997d8

Browse files
committed
support other channels for ComputeDotnetBaseImageTag
1 parent 4a2d9cf commit aa997d8

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageTag.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ public override bool Execute()
9797
return null;
9898
}
9999
}
100+
else if (channel == "alpha")
101+
{
102+
return $"{major}.{minor}-preview.1";
103+
}
104+
else if (channel == "dev" || channel == "ci")
105+
{
106+
return $"{major}.{minor}-preview";
107+
}
100108
else
101109
{
102110
Log.LogError(Resources.Strings.InvalidSdkPrereleaseVersion, channel);

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ public void ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn(bool includeSour
140140
[InlineData("8.0.200-preview3", "v8.0", "8.0")]
141141
[InlineData("6.0.100", "v6.0", "6.0")]
142142
[InlineData("6.0.100-preview.1", "v6.0", "6.0")]
143+
[InlineData("8.0.100-dev", "v8.0", "8.0-preview")]
144+
[InlineData("8.0.100-ci", "v8.0", "8.0-preview")]
145+
[InlineData("8.0.100-alpha.12345", "v8.0", "8.0-preview.1")]
146+
[InlineData("9.0.100-alpha.12345", "v9.0", "9.0-preview.1")]
143147
[Theory]
144148
public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, string expectedTag)
145149
{

0 commit comments

Comments
 (0)