This commit is contained in:
Andrei A 2019-07-04 18:44:28 +03:00
Родитель 085bff03aa
Коммит 8739516bd9
18 изменённых файлов: 26 добавлений и 26 удалений

Просмотреть файл

@ -79,7 +79,7 @@ namespace Microsoft.Bot.Builder.FunctionalTests
var activitySet = await client.Conversations.GetActivitiesAsync(conversationId, watermark);
watermark = activitySet?.Watermark;
// Extract the activies sent from the bot.
// Extract the activities sent from the bot.
var activities = from x in activitySet.Activities
where x.From.Id == botId
select x;

Просмотреть файл

@ -31,7 +31,7 @@ namespace Microsoft.Bot.Builder.AI.Luis
/// <summary>
/// Initializes a new instance of the <see cref="LuisApplication"/> class.
/// </summary>
/// <param name="service">LUIS coonfiguration.</param>
/// <param name="service">LUIS configuration.</param>
public LuisApplication(LuisService service)
: this((service.AppId, service.SubscriptionKey, service.GetEndpoint()))
{

Просмотреть файл

@ -292,7 +292,7 @@ namespace Microsoft.Bot.Builder.AI.Luis
/// <summary>
/// If a property doesn't exist add it to a new array, otherwise append it to the existing array.
/// </summary>
/// <param name="obj">Object in wich the property will be added.</param>
/// <param name="obj">Object in which the property will be added.</param>
/// <param name="key">Key of the property.</param>
/// <param name="value">Value for the property.</param>
internal static void AddProperty(JObject obj, string key, JToken value)

Просмотреть файл

@ -36,7 +36,7 @@ namespace Microsoft.Bot.Builder.AI.QnA
/// <param name="httpClient">An alternate client with which to talk to QnAMaker.
/// If null, a default client is used for this instance.</param>
/// <param name="telemetryClient">The IBotTelemetryClient used for logging telemetry events.</param>
/// <param name="logPersonalInformation">Set to true to include personally indentifiable information in telemetry events.</param>
/// <param name="logPersonalInformation">Set to true to include personally identifiable information in telemetry events.</param>
public QnAMaker(QnAMakerEndpoint endpoint, QnAMakerOptions options, HttpClient httpClient, IBotTelemetryClient telemetryClient, bool logPersonalInformation = false)
{
_endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
@ -97,7 +97,7 @@ namespace Microsoft.Bot.Builder.AI.QnA
/// <param name="httpClient">An alternate client with which to talk to QnAMaker.
/// If null, a default client is used for this instance.</param>
/// <param name="telemetryClient">The IBotTelemetryClient used for logging telemetry events.</param>
/// <param name="logPersonalInformation">Set to true to include personally indentifiable information in telemetry events.</param>
/// <param name="logPersonalInformation">Set to true to include personally identifiable information in telemetry events.</param>
public QnAMaker(QnAMakerService service, QnAMakerOptions options, HttpClient httpClient, IBotTelemetryClient telemetryClient, bool logPersonalInformation = false)
: this(new QnAMakerEndpoint(service), options, httpClient, telemetryClient, logPersonalInformation)
{

Просмотреть файл

@ -50,10 +50,10 @@ namespace Microsoft.Bot.Builder.Dialogs
public List<DialogInstance> Stack { get; private set; }
/// <summary>
/// Gets or sets the The parent DialogContext if any. Used when searching for dialogs to start.
/// Gets or sets the parent DialogContext if any. Used when searching for dialogs to start.
/// </summary>
/// <value>
/// The The parent DialogContext if any. Used when searching for dialogs to start.
/// The parent DialogContext if any. Used when searching for dialogs to start.
/// </value>
public DialogContext Parent { get; set; }

Просмотреть файл

@ -187,7 +187,7 @@ namespace Microsoft.Bot.Builder.Adapters
{
// The BotFrameworkAdapter and Console adapter implement this
// hack directly in the POST method. Replicating that here
// to keep the behavior as close as possible to facillitate
// to keep the behavior as close as possible to facilitate
// more realistic tests.
var delayMs = (int)activity.Value;
@ -298,7 +298,7 @@ namespace Microsoft.Bot.Builder.Adapters
/// <param name="cancellationToken">A cancellation token that can be used by other objects
/// or threads to receive notice of cancellation.</param>
/// <returns>A task that represents the work queued to execute.</returns>
/// <remarks>This resets the <see cref="ActiveQueue"/>, and does not maintain multiple converstion queues.</remarks>
/// <remarks>This resets the <see cref="ActiveQueue"/>, and does not maintain multiple conversation queues.</remarks>
public Task CreateConversationAsync(string channelId, BotCallbackHandler callback, CancellationToken cancellationToken)
{
ActiveQueue.Clear();
@ -502,7 +502,7 @@ namespace Microsoft.Bot.Builder.Adapters
/// </summary>
/// <param name="context">The turnContext (with a valid Activity).</param>
/// <param name="userId">The user id.</param>
/// <param name="includeFilter">Optional comma seperated list of connection's to include. Blank will return token status for all configured connections.</param>
/// <param name="includeFilter">Optional comma separated list of connection's to include. Blank will return token status for all configured connections.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Array of TokenStatus.</returns>
public virtual Task<TokenStatus[]> GetTokenStatusAsync(ITurnContext context, string userId, string includeFilter = null, CancellationToken cancellationToken = default(CancellationToken))
@ -531,7 +531,7 @@ namespace Microsoft.Bot.Builder.Adapters
/// <param name="resourceUrls">The list of AAD resource URLs.</param>
/// <param name="userId">The user ID.</param>
/// <param name="cancellationToken">The cancellationToken.</param>
/// <returns>The dicitonary of TokenResponses for each resource URL.</returns>
/// <returns>The dictionary of TokenResponses for each resource URL.</returns>
public virtual Task<Dictionary<string, TokenResponse>> GetAadTokensAsync(ITurnContext context, string connectionName, string[] resourceUrls, string userId = null, CancellationToken cancellationToken = default(CancellationToken))
{
return Task.FromResult(new Dictionary<string, TokenResponse>());

Просмотреть файл

@ -70,7 +70,7 @@ namespace Microsoft.Bot.Builder.Adapters
/// </summary>
/// <returns>Runs the exchange between the user and the bot.</returns>
/// <remarks>This methods sends the activities from the user to the bot and
/// checks the responses from the bot based on the activiies described in the
/// checks the responses from the bot based on the activities described in the
/// current test flow.</remarks>
public Task StartTestAsync() => _testTask;
@ -309,7 +309,7 @@ namespace Microsoft.Bot.Builder.Adapters
}
/// <summary>
/// Shorcut for adding an arbitray exchange between the user and bot.
/// Shortcut for adding an arbitrary exchange between the user and bot.
/// Each activity with a <see cref="IActivity.From"/>.<see cref="ChannelAccount.Role"/> equals to "bot"
/// will be processed with the <see cref="AssertReply(IActivity, string, uint)"/> method.
/// Every other activity will be processed as user's message via the <see cref="Send(IActivity)"/> method.
@ -337,7 +337,7 @@ namespace Microsoft.Bot.Builder.Adapters
}
/// <summary>
/// Shorcut for adding an arbitray exchange between the user and bot.
/// Shortcut for adding an arbitrary exchange between the user and bot.
/// Each activity with a <see cref="IActivity.From"/>.<see cref="ChannelAccount.Role"/> equals to "bot"
/// will be processed with the <see cref="AssertReply(IActivity, string, uint)"/> method.
/// Every other activity will be processed as user's message via the <see cref="Send(IActivity)"/> method.

Просмотреть файл

@ -112,7 +112,7 @@ namespace Microsoft.Bot.Builder
/// Sends a proactive message to a conversation.
/// </summary>
/// <param name="botId">The application ID of the bot. This paramter is ignored in
/// single tenant the Adpters (Console, Test, etc) but is critical to the BotFrameworkAdapter
/// single tenant the Adapters (Console, Test, etc) but is critical to the BotFrameworkAdapter
/// which is multi-tenant aware. </param>
/// <param name="reference">A reference to the conversation to continue.</param>
/// <param name="callback">The method to call for the resulting bot turn.</param>

Просмотреть файл

@ -127,7 +127,7 @@ namespace Microsoft.Bot.Builder
// Relocate the tenantId field used by MS Teams to a new location (from channelData to conversation)
// This will only occur on activities from teams that include tenant info in channelData but NOT in conversation,
// thus should be future friendly. However, once the the transition is complete. we can remove this.
// thus should be future friendly. However, once the transition is complete. we can remove this.
Use(new TenantIdWorkaroundForTeamsMiddleware());
// DefaultRequestHeaders are not thread safe so set them up here because this adapter should be a singleton.

Просмотреть файл

@ -60,7 +60,7 @@ namespace Microsoft.Bot.Builder
/// Send a trace message.
/// </summary>
/// <param name="message">Message to display.</param>
/// <param name="severityLevel">Trace severaity level <see cref="Severity"/>.</param>
/// <param name="severityLevel">Trace severity level <see cref="Severity"/>.</param>
/// <param name="properties">Named string values you can use to search and classify events.</param>
void TrackTrace(string message, Severity severityLevel, IDictionary<string, string> properties);

Просмотреть файл

@ -59,7 +59,7 @@ namespace Microsoft.Bot.Builder
/// </summary>
/// <param name="context">Context for the current turn of conversation with the user.</param>
/// <param name="userId">The user Id for which token status is retrieved.</param>
/// <param name="includeFilter">Optional comma seperated list of connection's to include. Blank will return token status for all configured connections.</param>
/// <param name="includeFilter">Optional comma separated list of connection's to include. Blank will return token status for all configured connections.</param>
/// <param name="cancellationToken">A cancellation token that can be used by other objects
/// or threads to receive notice of cancellation.</param>
/// <returns>Array of TokenStatus.</returns>
@ -69,7 +69,7 @@ namespace Microsoft.Bot.Builder
/// Retrieves Azure Active Directory tokens for particular resources on a configured connection.
/// </summary>
/// <param name="context">Context for the current turn of conversation with the user.</param>
/// <param name="connectionName">The name of the Azure Active Direcotry connection configured with this bot.</param>
/// <param name="connectionName">The name of the Azure Active Directory connection configured with this bot.</param>
/// <param name="resourceUrls">The list of resource URLs to retrieve tokens for.</param>
/// <param name="userId">The user Id for which tokens are retrieved. If passing in null the userId is taken from the Activity in the ITurnContext.</param>
/// <param name="cancellationToken">A cancellation token that can be used by other objects

Просмотреть файл

@ -33,7 +33,7 @@ namespace Microsoft.Bot.Builder.Integration
/// Sends a proactive message to a conversation.
/// </summary>
/// <param name="botId">The application ID of the bot. This paramter is ignored in
/// single tenant the Adpters (Console, Test, etc) but is critical to the BotFrameworkAdapter
/// single tenant the Adapters (Console, Test, etc) but is critical to the BotFrameworkAdapter
/// which is multi-tenant aware. </param>
/// <param name="reference">A reference to the conversation to continue.</param>
/// <param name="callback">The method to call for the resulting bot turn.</param>

Просмотреть файл

@ -8,7 +8,7 @@ namespace Microsoft.Bot.Builder
/// </summary>
public static class TelemetryLoggerConstants
{
// The name of the event when when new message is received from the user.
// The name of the event when a new message is received from the user.
public static readonly string BotMsgReceiveEvent = "BotMessageReceived";
// The name of the event when logged when a message is sent from the bot to the user.

Просмотреть файл

@ -20,7 +20,7 @@ namespace Microsoft.Bot.Builder
/// Initializes a new instance of the <see cref="TelemetryLoggerMiddleware"/> class.
/// </summary>
/// <param name="telemetryClient">The IBotTelemetryClient implementation used for registering telemetry events.</param>
/// <param name="logPersonalInformation"> (Optional) TRUE to include personally indentifiable information.</param>
/// <param name="logPersonalInformation"> (Optional) TRUE to include personally identifiable information.</param>
public TelemetryLoggerMiddleware(IBotTelemetryClient telemetryClient, bool logPersonalInformation = false)
{
TelemetryClient = telemetryClient ?? new NullBotTelemetryClient();

Просмотреть файл

@ -66,7 +66,7 @@ namespace Microsoft.Bot.Configuration
// Get all the Dispatch (Luis) types in the service list
var dispatchServices = botConfiguration.Services.OfType<DispatchService>();
// The dispatch service is not always included in the the bot configuration files.
// The dispatch service is not always included in the bot configuration files.
// Therefore, it will only be validated if the bot configuration file contains at least one service of this type.
if (dispatchServices.Any())
{

Просмотреть файл

@ -25,7 +25,7 @@ namespace Microsoft.Bot.Connector.Authentication
/// <param name="expectedEndorsement">The expected endorsement. Generally the ID of the channel to validate, typically extracted from the activity's
/// <see cref="Schema.Activity.ChannelId"/> property, that to which the Activity is affinitized. Alternatively, it could represent a compliance certification that is required.</param>
/// <param name="endorsements">The JWT tokens signing party is permitted to send activities only for
/// specific channels. That list, the set of channels the service can sign for, is called the the endorsement list.
/// specific channels. That list, the set of channels the service can sign for, is called the endorsement list.
/// The activitys <see cref="Schema.Activity.ChannelId"/> MUST be found in the endorsement list, or the incoming
/// activity is not considered valid.</param>
/// <returns>True if the channel ID is found in the endorsements list; otherwise, false.</returns>

Просмотреть файл

@ -316,7 +316,7 @@ namespace Microsoft.Bot.Connector
/// Get the status of tokens for connections for this bot for a particular user.
/// </summary>
/// <param name="userId">User id.</param>
/// <param name="includeFilter">A comma seperated list of connections to include. If null, then all connections are returned.</param>
/// <param name="includeFilter">A comma separated list of connections to include. If null, then all connections are returned.</param>
/// <param name="cancellationToken">Cancellation Token.</param>
/// <returns>TokenStatus.</returns>
public async Task<TokenStatus[]> GetTokenStatusAsync(string userId, string includeFilter = null, CancellationToken cancellationToken = default(CancellationToken))

Просмотреть файл

@ -103,7 +103,7 @@ namespace Microsoft.Bot.Builder.Integration.ApplicationInsights.Core
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/> which specifies the contract for a collection of service descriptors.</param>
/// <param name="botTelemetryClient">Bot Telemetry Client that logs event information.</param>
/// <param name="instrumentationKey">If Bot Telemetry Client is using Application Insights, provide the instumentation key.</param>
/// <param name="instrumentationKey">If Bot Telemetry Client is using Application Insights, provide the instrumentation key.</param>
/// <returns>A reference to this instance after the operation has completed.</returns>
public static IServiceCollection AddBotApplicationInsights(this IServiceCollection services, IBotTelemetryClient botTelemetryClient, string instrumentationKey = null)
{