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
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public MessageActivity AddAttachment(params Attachment[] value)
return this;
}

public MessageActivity AddAttachment(Teams.Cards.Card card)
public MessageActivity AddAttachment(Teams.Cards.AdaptiveCard card)
{
return AddAttachment(new Attachment(card));
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Microsoft.Teams.Api/Attachment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public Attachment(ContentType contentType, object? content = null)
Content = content;
}

public Attachment(Teams.Cards.Card card)
public Attachment(Teams.Cards.AdaptiveCard card)
{
ContentType = ContentType.AdaptiveCard;
Content = card;
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Microsoft.Teams.Apps/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public async Task<MessageActivity> Send(string conversationId, string text, stri
/// send a message activity with a card attachment
/// </summary>
/// <param name="card">the card to send as an attachment</param>
public async Task<MessageActivity> Send(string conversationId, Cards.Card card, string? serviceUrl = null, CancellationToken cancellationToken = default)
public async Task<MessageActivity> Send(string conversationId, Cards.AdaptiveCard card, string? serviceUrl = null, CancellationToken cancellationToken = default)
{
return await Send(conversationId, new MessageActivity().AddAttachment(card), serviceUrl, cancellationToken);
}
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Microsoft.Teams.Apps/Contexts/Context.Client.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Client(IContext<IActivity> context)
/// send a message activity with a card attachment
/// </summary>
/// <param name="card">the card to send as an attachment</param>
public Task<MessageActivity> Send(Cards.Card card) => context.Send(card);
public Task<MessageActivity> Send(Cards.AdaptiveCard card) => context.Send(card);

/// <summary>
/// send an activity to the conversation as a reply
Expand All @@ -44,7 +44,7 @@ public class Client(IContext<IActivity> context)
/// send a message activity with a card attachment as a reply
/// </summary>
/// <param name="card">the card to send as an attachment</param>
public Task<MessageActivity> Reply(Cards.Card card) => context.Reply(card);
public Task<MessageActivity> Reply(Cards.AdaptiveCard card) => context.Reply(card);

/// <summary>
/// send a typing activity
Expand Down
8 changes: 4 additions & 4 deletions Libraries/Microsoft.Teams.Apps/Contexts/Context.Send.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial interface IContext<TActivity>
/// send a message activity with a card attachment
/// </summary>
/// <param name="card">the card to send as an attachment</param>
public Task<MessageActivity> Send(Cards.Card card);
public Task<MessageActivity> Send(Cards.AdaptiveCard card);

/// <summary>
/// send an activity to the conversation as a reply
Expand All @@ -38,7 +38,7 @@ public partial interface IContext<TActivity>
/// send a message activity with a card attachment as a reply
/// </summary>
/// <param name="card">the card to send as an attachment</param>
public Task<MessageActivity> Reply(Cards.Card card);
public Task<MessageActivity> Reply(Cards.AdaptiveCard card);

/// <summary>
/// send a typing activity
Expand All @@ -64,7 +64,7 @@ public Task<MessageActivity> Send(string text)
return Send(new MessageActivity(text));
}

public Task<MessageActivity> Send(Cards.Card card)
public Task<MessageActivity> Send(Cards.AdaptiveCard card)
{
return Send(new MessageActivity().AddAttachment(card));
}
Expand All @@ -90,7 +90,7 @@ public Task<MessageActivity> Reply(string text)
return Reply(new MessageActivity(text));
}

public Task<MessageActivity> Reply(Cards.Card card)
public Task<MessageActivity> Reply(Cards.AdaptiveCard card)
{
return Reply(new MessageActivity().AddAttachment(card));
}
Expand Down
184 changes: 0 additions & 184 deletions Libraries/Microsoft.Teams.Cards/Actions/Action.cs

This file was deleted.

62 changes: 0 additions & 62 deletions Libraries/Microsoft.Teams.Cards/Actions/ExecuteAction.cs

This file was deleted.

16 changes: 16 additions & 0 deletions Libraries/Microsoft.Teams.Cards/Actions/IMBackAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace Microsoft.Teams.Cards;

public class IMBackAction : SubmitAction
{
/// <summary>
/// Initial data that input fields will be combined with. These are essentially ‘hidden’ properties.
/// </summary>
///
public IMBackAction(string value)
{
Data = new()
{
MsTeams = new ImBackSubmitActionData(value)
};
}
}
12 changes: 12 additions & 0 deletions Libraries/Microsoft.Teams.Cards/Actions/InvokeAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Microsoft.Teams.Cards;

public class InvokeAction : SubmitAction
{
public InvokeAction(object value)
{
Data = new()
{
MsTeams = new InvokeSubmitActionData(value)
};
}
}
29 changes: 29 additions & 0 deletions Libraries/Microsoft.Teams.Cards/Actions/MessageBackAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
namespace Microsoft.Teams.Cards;

public class MessageBackAction : SubmitAction
{
public MessageBackAction(string text, string value)
{
Data = new()
{
MsTeams = new MessageBackSubmitActionData()
{
Text = text,
Value = value
}
};
}

public MessageBackAction(string text, string displayText, string value)
{
Data = new()
{
MsTeams = new MessageBackSubmitActionData()
{
Text = text,
DisplayText = displayText,
Value = value
}
};
}
}
Loading