Skip to content

Fix multi-arch container label parsing #55414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baronfel merged 1 commit into from
Jul 23, 2026
+30 −2
Merged

Fix multi-arch container label parsing #55414

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@
Include="$(_ContainerLabel)"/>
<ContainerLabel
Condition="@(_ParsedContainerLabel->Count()) > 0 "
Include="$([System.String]::Copy('%(_ParsedContainerLabel.Identity)').Split(':')[0])"
Value="$([System.String]::Copy('%(_ParsedContainerLabel.Identity)').Split(':')[1])" />
Include="$([System.String]::Copy('%(_ParsedContainerLabel.Identity)').Split(':', 2)[0])"
Value="$([System.String]::Copy('%(_ParsedContainerLabel.Identity)').Split(':', 2)[1])" />

<_ParsedContainerPort
Condition="'$(_ContainerPort)' != ':'"
Expand Down
28 changes: 28 additions & 0 deletions test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,34 @@ public void GetsConventionalLabelsByDefault(bool shouldEvaluateLabels)

private static bool LabelMatch(string label, string value, ProjectItemInstance item) => item.EvaluatedInclude == label && item.GetMetadata("Value") is { } v && v.EvaluatedValue == value;

[TestMethod]
public void MultiArchContainerLabelsPreserveColonsInValues()
{
var expectedLabels = new Dictionary<string, string>
{
["org.opencontainers.image.source"] = "https://github.com/dotnet/sdk",
["org.opencontainers.image.created"] = "2026-07-22T12:34:56.7890000Z",
};
var serializedLabels = string.Join(';', expectedLabels.Select(label => $"{label.Key}:{label.Value}"));

var (project, logger, d) = ProjectInitializer.InitProject(new()
{
["_ContainerLabel"] = serializedLabels,
}, projectName: nameof(MultiArchContainerLabelsPreserveColonsInValues));
using var _ = d;
var instance = project.CreateProjectInstance(ProjectInstanceSettings.None);

instance.Build(["_ParseItemsForPublishingSingleContainer"], [logger])
.Should().BeTrue("Build should have succeeded but failed due to {0}", string.Join('\n', logger.AllMessages));

var labels = instance.GetItems(ContainerLabel);
labels.Should().HaveCount(expectedLabels.Count);
foreach (var expectedLabel in expectedLabels)
{
labels.Should().ContainSingle(label => LabelMatch(expectedLabel.Key, expectedLabel.Value, label));
}
}

[DataRow(true)]
[DataRow(false)]
[TestMethod]
Expand Down
Loading