Skip to content

Fix apostrophe in notification button content breaking XML #6239

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

Draft
guimafelipe wants to merge 2 commits into
base: main
Choose a base branch
from
+45 −1
Draft

Fix apostrophe in notification button content breaking XML #6239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6cc1a9
Fix XML encoding for button content in AppNotificationButton
guimafelipe Feb 20, 2026
9ce759b
Add tests for XML encoding of button content special characters
guimafelipe Feb 20, 2026
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
2 changes: 1 addition & 1 deletion dev/AppNotifications/AppNotificationBuilder/AppNotificationButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace winrt::Microsoft::Windows::AppNotifications::Builder::implementation
auto logTelemetry{ AppNotificationBuilderTelemetry::ButtonToString::Start(g_telemetryHelper) };

std::wstring xmlResult{ wil::str_printf<std::wstring>(L"<action content='%ls'%ls%ls%ls%ls%ls%ls%ls/>",
m_content.c_str(),
EncodeXml(m_content).c_str(),
GetActivationArguments().c_str(),
m_useContextMenuPlacement ? L" placement='contextMenu'" : L"",
m_iconUri ? wil::str_printf<std::wstring>(L" imageUri='%ls'", m_iconUri.ToString().c_str()).c_str() : L"",
Expand Down
44 changes: 44 additions & 0 deletions test/AppNotificationBuilderTests/APITests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,50 @@ namespace Test::AppNotification::Builder
VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
}

TEST_METHOD(AppNotificationBuilderAddButtonWithApostropheInContent)
{
auto builder{ winrt::AppNotificationBuilder()
.AddButton(winrt::AppNotificationButton(L"Don't miss this")
.AddArgument(L"key", L"value"))
};
auto expected{ L"<toast><visual><binding template='ToastGeneric'></binding></visual><actions><action content='Don&apos;t miss this' arguments='key=value'/></actions></toast>" };

VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
}

TEST_METHOD(AppNotificationBuilderAddButtonWithXmlSpecialCharsInContent)
{
auto builder{ winrt::AppNotificationBuilder()
.AddButton(winrt::AppNotificationButton(LR"(&"'<>)")
.AddArgument(L"key", L"value"))
};
auto expected{ L"<toast><visual><binding template='ToastGeneric'></binding></visual><actions><action content='&amp;&quot;&apos;&lt;&gt;' arguments='key=value'/></actions></toast>" };

VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
}

TEST_METHOD(AppNotificationBuilderAddButtonWithAmpersandInContent)
{
auto builder{ winrt::AppNotificationBuilder()
.AddButton(winrt::AppNotificationButton(L"Save & Close")
.AddArgument(L"action", L"save"))
};
auto expected{ L"<toast><visual><binding template='ToastGeneric'></binding></visual><actions><action content='Save &amp; Close' arguments='action=save'/></actions></toast>" };

VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
}

TEST_METHOD(AppNotificationBuilderAddButtonWithAngleBracketsInContent)
{
auto builder{ winrt::AppNotificationBuilder()
.AddButton(winrt::AppNotificationButton(L"<Click Here>")
.AddArgument(L"key", L"value"))
};
auto expected{ L"<toast><visual><binding template='ToastGeneric'></binding></visual><actions><action content='&lt;Click Here&gt;' arguments='key=value'/></actions></toast>" };

VERIFY_ARE_EQUAL(builder.BuildNotification().Payload(), expected);
}

TEST_METHOD(AppNotificationBuilderWithIsCallingPreviewSupportedIsFalse)
{
if (!::Microsoft::Windows::CallingPreviewSupport::Feature_CallingPreviewSupport::IsEnabled())
Expand Down
Loading