Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 samples/HtmlWidgetBot/HtmlWidgetBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget;ExperimentalTeamsExtendedMarkdown</NoWarn>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions samples/StreamingBot/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ static async Task RunExtendedMarkdownDemoAsync(TeamsStreamingWriter writer, Canc
"- [x] Strikethrough renders too\n",
];

#pragma warning disable ExperimentalTeamsExtendedMarkdown
// The informative update carries its own format (plain markdown here); the streamed chunks
// set extended markdown per-chunk via MessageActivityInput, which also formats the final message.
await writer.SendInformativeUpdateAsync("Starting the *extended* markdown stream…", TextFormats.Markdown, cancellationToken);
Expand All @@ -211,7 +210,6 @@ static async Task RunExtendedMarkdownDemoAsync(TeamsStreamingWriter writer, Canc
await Task.Delay(500, cancellationToken);
await writer.AppendResponseAsync(new MessageActivityInput().WithText(message, TextFormats.ExtendedMarkdown), cancellationToken);
}
#pragma warning restore ExperimentalTeamsExtendedMarkdown

await writer.FinalizeResponseAsync(cancellationToken: cancellationToken);
}
Expand Down
2 changes: 0 additions & 2 deletions samples/TeamsBot/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ await context.SendAsync(
// Extended Markdown handler: matches "extendedMarkdown" (case-insensitive)
teamsApp.OnMessage("(?i)^extendedMarkdown$", async (context, cancellationToken) =>
{
#pragma warning disable ExperimentalTeamsExtendedMarkdown
MessageActivityInput extendedMarkdownMessage = new MessageActivityInput()
.WithText("""
# Extended Markdown Demo
Expand All @@ -76,7 +75,6 @@ await context.SendAsync(
$$E = mc^2$$
""", TextFormats.ExtendedMarkdown)
;
#pragma warning restore ExperimentalTeamsExtendedMarkdown

await context.SendAsync(extendedMarkdownMessage, cancellationToken);
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using Microsoft.Teams.Apps.Schema;
Expand Down Expand Up @@ -145,10 +144,6 @@ public class TextFormat(string value) : StringEnum(value)
/// Extended markdown text format. Supports GFM tables, LaTeX math blocks,
/// and other rich content beyond standard markdown.
/// </summary>
/// <remarks>
/// This format is currently in public preview and may be subject to change.
/// </remarks>
[Experimental("ExperimentalTeamsExtendedMarkdown")]
public static readonly TextFormat ExtendedMarkdown = new("extendedmarkdown");
}

Expand Down Expand Up @@ -176,10 +171,6 @@ public static class TextFormats
/// Extended markdown text format. Supports GFM tables, LaTeX math blocks,
/// and other rich content beyond standard markdown.
/// </summary>
/// <remarks>
/// This format is currently in public preview and may be subject to change.
/// </remarks>
[Experimental("ExperimentalTeamsExtendedMarkdown")]
public static TextFormat ExtendedMarkdown => TextFormat.ExtendedMarkdown;
}

Expand Down
2 changes: 1 addition & 1 deletion test/IntegrationTests/IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget;ExperimentalTeamsExtendedMarkdown;CS0618</NoWarn>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget;CS0618</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
[Fact]
public void Constructor_Default_SetsMessageType()
{
MessageActivity activity = new();

Check warning on line 14 in test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs

View workflow job for this annotation

GitHub Actions / Build & Test & Lint

'MessageActivity.MessageActivity()' is obsolete: 'MessageActivity is an inbound (received) activity. To construct and send a message, use new MessageActivityInput() instead.'
Assert.Equal(TeamsActivityTypes.Message, activity.Type);
}

[Fact]
public void Constructor_WithText_SetsTextAndMessageType()
{
MessageActivity activity = new("Hello World");

Check warning on line 21 in test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs

View workflow job for this annotation

GitHub Actions / Build & Test & Lint

'MessageActivity.MessageActivity(string)' is obsolete: 'MessageActivity is an inbound (received) activity. To construct and send a message, use new MessageActivityInput() instead.'
Assert.Equal(TeamsActivityTypes.Message, activity.Type);
Assert.Equal("Hello World", activity.Text);
}
Expand All @@ -43,7 +43,7 @@
[Fact]
public void MessageActivity_Serialize_ToJson()
{
MessageActivity activity = new("Hello World")

Check warning on line 46 in test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs

View workflow job for this annotation

GitHub Actions / Build & Test & Lint

'MessageActivity.MessageActivity(string)' is obsolete: 'MessageActivity is an inbound (received) activity. To construct and send a message, use new MessageActivityInput() instead.'
{
TextFormat = TextFormats.Markdown,
};
Expand All @@ -57,7 +57,7 @@
[Fact]
public void MessageActivity_Constants_TextFormats()
{
MessageActivity activity = new("Test")

Check warning on line 60 in test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs

View workflow job for this annotation

GitHub Actions / Build & Test & Lint

'MessageActivity.MessageActivity(string)' is obsolete: 'MessageActivity is an inbound (received) activity. To construct and send a message, use new MessageActivityInput() instead.'
{
TextFormat = TextFormats.Plain
};
Expand All @@ -69,9 +69,7 @@
activity.TextFormat = TextFormats.Xml;
Assert.Equal("xml", activity.TextFormat!.ToString());

#pragma warning disable ExperimentalTeamsExtendedMarkdown
activity.TextFormat = TextFormats.ExtendedMarkdown;
#pragma warning restore ExperimentalTeamsExtendedMarkdown
Assert.Equal("extendedmarkdown", activity.TextFormat!.ToString());
}

Expand All @@ -89,7 +87,7 @@
[Fact]
public void MessageActivity_SerializedAsCoreActivity_IncludesText()
{
MessageActivity messageActivity = new("Hello World")

Check warning on line 90 in test/Microsoft.Teams.Apps.UnitTests/MessageActivityTests.cs

View workflow job for this annotation

GitHub Actions / Build & Test & Lint

'MessageActivity.MessageActivity(string)' is obsolete: 'MessageActivity is an inbound (received) activity. To construct and send a message, use new MessageActivityInput() instead.'
{
Type = ActivityType.Message,
ServiceUrl = new Uri("https://test.service.url/")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget;ExperimentalTeamsExtendedMarkdown;ExperimentalTeamsSocketMode</NoWarn>
<NoWarn>$(NoWarn);ExperimentalTeamsHtmlWidget;ExperimentalTeamsSocketMode</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading