diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/BotBuilderTemplatesVSIX.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/BotBuilderTemplatesVSIX.csproj index 3c5fb59f55..99c205863a 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/BotBuilderTemplatesVSIX.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/BotBuilderTemplatesVSIX.csproj @@ -119,7 +119,7 @@ - + @@ -128,12 +128,12 @@ powershell Compress-Archive -Path '$(SolutionDir)UncompressedProjectTemplates\*' -DestinationPath $(ProjectDir)ProjectTemplates\Bot` Framework.zip -Force - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/packages.config b/generators/vsix-vs-win/BotBuilderVSIX-V4/packages.config index 16dd3079a2..85c520ea32 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/packages.config +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/libraries/Directory.Build.props b/libraries/Directory.Build.props index e47f4ffe13..c6b3ca8611 100644 --- a/libraries/Directory.Build.props +++ b/libraries/Directory.Build.props @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/TestScript.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/TestScript.cs index 82fd763ff0..b2885d146a 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/TestScript.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/TestScript.cs @@ -204,7 +204,7 @@ public async Task ExecuteAsync(ResourceExplorer resourceExplorer, [CallerMemberN userToken.Setup(adapter); } - async Task Inspect(DialogContextInspector inspector) + async Task InspectAsync(DialogContextInspector inspector) { var di = new DialogInspector(Dialog, resourceExplorer); var activity = new Activity(); @@ -235,7 +235,7 @@ await adapter.ProcessActivityAsync( foreach (var testAction in Script) { - await testAction.ExecuteAsync(adapter, callback, Inspect).ConfigureAwait(false); + await testAction.ExecuteAsync(adapter, callback, InspectAsync).ConfigureAwait(false); } } diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/ResourceExplorer.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/ResourceExplorer.cs index 9c559d40f0..1127b26bed 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/ResourceExplorer.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/ResourceExplorer.cs @@ -747,7 +747,7 @@ private void ResourceProvider_Changed(object sender, IEnumerable resou cancelReloadToken.Cancel(); cancelReloadToken = new CancellationTokenSource(); - Task.Delay(1000, cancelReloadToken.Token) + _ = Task.Delay(1000, cancelReloadToken.Token) .ContinueWith( t => { diff --git a/libraries/Microsoft.Bot.Builder/TurnContext.cs b/libraries/Microsoft.Bot.Builder/TurnContext.cs index 92166d5163..5cbbf72b46 100644 --- a/libraries/Microsoft.Bot.Builder/TurnContext.cs +++ b/libraries/Microsoft.Bot.Builder/TurnContext.cs @@ -351,24 +351,24 @@ public ITurnContext OnDeleteActivity(DeleteActivityHandler handler) // If there are no callbacks registered, bypass the overhead of invoking them and send directly to the adapter if (_onSendActivities.Count == 0) { - return SendActivitiesThroughAdapter(); + return SendActivitiesThroughAdapterAsync(); } // Send through the full callback pipeline - return SendActivitiesThroughCallbackPipeline(); + return SendActivitiesThroughCallbackPipelineAsync(); - Task SendActivitiesThroughCallbackPipeline(int nextCallbackIndex = 0) + Task SendActivitiesThroughCallbackPipelineAsync(int nextCallbackIndex = 0) { // If we've executed the last callback, we now send straight to the adapter if (nextCallbackIndex == _onSendActivities.Count) { - return SendActivitiesThroughAdapter(); + return SendActivitiesThroughAdapterAsync(); } - return _onSendActivities[nextCallbackIndex].Invoke(this, bufferedActivities, () => SendActivitiesThroughCallbackPipeline(nextCallbackIndex + 1)); + return _onSendActivities[nextCallbackIndex].Invoke(this, bufferedActivities, () => SendActivitiesThroughCallbackPipelineAsync(nextCallbackIndex + 1)); } - async Task SendActivitiesThroughAdapter() + async Task SendActivitiesThroughAdapterAsync() { if (Activity.DeliveryMode == DeliveryModes.ExpectReplies) { @@ -453,12 +453,12 @@ public async Task UpdateActivityAsync(IActivity activity, Canc var conversationReference = Activity.GetConversationReference(); var a = activity.ApplyConversationReference(conversationReference); - async Task ActuallyUpdateStuff() + async Task ActuallyUpdateStuffAsync() { return await Adapter.UpdateActivityAsync(this, a, cancellationToken).ConfigureAwait(false); } - return await UpdateActivityInternalAsync(a, _onUpdateActivity, ActuallyUpdateStuff, cancellationToken).ConfigureAwait(false); + return await UpdateActivityInternalAsync(a, _onUpdateActivity, ActuallyUpdateStuffAsync, cancellationToken).ConfigureAwait(false); } /// @@ -484,12 +484,12 @@ async Task ActuallyUpdateStuff() var cr = Activity.GetConversationReference(); cr.ActivityId = activityId; - async Task ActuallyDeleteStuff() + async Task ActuallyDeleteStuffAsync() { await Adapter.DeleteActivityAsync(this, cr, cancellationToken).ConfigureAwait(false); } - await DeleteActivityInternalAsync(cr, _onDeleteActivity, ActuallyDeleteStuff, cancellationToken).ConfigureAwait(false); + await DeleteActivityInternalAsync(cr, _onDeleteActivity, ActuallyDeleteStuffAsync, cancellationToken).ConfigureAwait(false); } /// @@ -514,12 +514,12 @@ async Task ActuallyDeleteStuff() throw new ArgumentNullException(nameof(conversationReference)); } - async Task ActuallyDeleteStuff() + async Task ActuallyDeleteStuffAsync() { await Adapter.DeleteActivityAsync(this, conversationReference, cancellationToken).ConfigureAwait(false); } - await DeleteActivityInternalAsync(conversationReference, _onDeleteActivity, ActuallyDeleteStuff, cancellationToken).ConfigureAwait(false); + await DeleteActivityInternalAsync(conversationReference, _onDeleteActivity, ActuallyDeleteStuffAsync, cancellationToken).ConfigureAwait(false); } /// @@ -574,7 +574,7 @@ private async Task UpdateActivityInternalAsync( } // Default to "No more Middleware after this". - async Task Next() + async Task NextAsync() { // Remove the first item from the list of middleware to call, // so that the next call just has the remaining items to worry about. @@ -586,7 +586,7 @@ async Task Next() // Grab the current middleware, which is the 1st element in the array, and execute it UpdateActivityHandler toCall = updateHandlers.First(); - return await toCall(this, activity, Next).ConfigureAwait(false); + return await toCall(this, activity, NextAsync).ConfigureAwait(false); } private async Task DeleteActivityInternalAsync( @@ -614,7 +614,7 @@ private async Task DeleteActivityInternalAsync( } // Default to "No more Middleware after this". - async Task Next() + async Task NextAsync() { // Remove the first item from the list of middleware to call, // so that the next call just has the remaining items to worry about. @@ -624,7 +624,7 @@ async Task Next() // Grab the current middleware, which is the 1st element in the array, and execute it. DeleteActivityHandler toCall = deleteHandlers.First(); - await toCall(this, cr, Next).ConfigureAwait(false); + await toCall(this, cr, NextAsync).ConfigureAwait(false); } } }