Skip to content

Commit 6df7bbe

Browse files
author
Tom Laird-McConnell
authored
remove configure awaits (#4582)
* fix OAuth with emulator and no credentials * remove configureawait(False), as we need to keep the callers context for callbacks * bump version to 3.15.2.2
1 parent cc73ce2 commit 6df7bbe

File tree

18 files changed

+39
-39
lines changed

18 files changed

+39
-39
lines changed

‎CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.15.2.1")]
36-
[assembly: AssemblyFileVersion("3.15.2.1")]
35+
[assembly: AssemblyVersion("3.15.2.2")]
36+
[assembly: AssemblyFileVersion("3.15.2.2")]
3737

3838
[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
3939
[assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")]

‎CSharp/Library/Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("3.15.2.1")]
35-
[assembly: AssemblyFileVersion("3.15.2.1")]
34+
[assembly: AssemblyVersion("3.15.2.2")]
35+
[assembly: AssemblyFileVersion("3.15.2.2")]
3636

3737
//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
3838
//[assembly: AssemblyDelaySignAttribute(true)]

‎CSharp/Library/Microsoft.Bot.Builder.FormFlow.Json/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("3.15.2.1")]
37-
[assembly: AssemblyFileVersion("3.15.2.1")]
36+
[assembly: AssemblyVersion("3.15.2.2")]
37+
[assembly: AssemblyFileVersion("3.15.2.2")]
3838

3939
[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
4040
[assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")]

‎CSharp/Library/Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("3.15.2.1")]
35-
[assembly: AssemblyFileVersion("3.15.2.1")]
34+
[assembly: AssemblyVersion("3.15.2.2")]
35+
[assembly: AssemblyFileVersion("3.15.2.2")]
3636

3737
//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
3838
//[assembly: AssemblyDelaySignAttribute(true)]

‎CSharp/Library/Microsoft.Bot.Builder/Dialogs/GetTokenDialog.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ public GetTokenDialog(string connectionName, string signInMessage, string button
7070
public async Task StartAsync(IDialogContext context)
7171
{
7272
// First ask Bot Service if it already has a token for this user
73-
var token = await context.GetUserTokenAsync(_connectionName).ConfigureAwait(false);
73+
var token = await context.GetUserTokenAsync(_connectionName);
7474
if (token != null)
7575
{
7676
context.Done(new GetTokenResponse() { Token = token.Token });
7777
}
7878
else
7979
{
8080
// If Bot Service does not have a token, send an OAuth card to sign in
81-
await SendOAuthCardAsync(context, (Activity)context.Activity).ConfigureAwait(false);
81+
await SendOAuthCardAsync(context, (Activity)context.Activity);
8282
}
8383
}
8484

8585
private async Task SendOAuthCardAsync(IDialogContext context, Activity activity)
8686
{
87-
var reply = await activity.CreateOAuthReplyAsync(_connectionName, _signInMessage, _buttonLabel).ConfigureAwait(false);
88-
await context.PostAsync(reply).ConfigureAwait(false);
87+
var reply = await activity.CreateOAuthReplyAsync(_connectionName, _signInMessage, _buttonLabel);
88+
await context.PostAsync(reply);
8989
context.Wait(WaitForToken);
9090
}
9191

@@ -113,7 +113,7 @@ private async Task WaitForToken(IDialogContext context, IAwaitable<object> resul
113113
verificationCode = activity.Text;
114114
}
115115

116-
tokenResponse = await context.GetUserTokenAsync(_connectionName, verificationCode).ConfigureAwait(false);
116+
tokenResponse = await context.GetUserTokenAsync(_connectionName, verificationCode);
117117
if (tokenResponse != null)
118118
{
119119
context.Done(new GetTokenResponse() { Token = tokenResponse.Token });
@@ -124,8 +124,8 @@ private async Task WaitForToken(IDialogContext context, IAwaitable<object> resul
124124
if (_reties > 0)
125125
{
126126
_reties--;
127-
await context.PostAsync(_retryMessage).ConfigureAwait(false);
128-
await SendOAuthCardAsync(context, activity).ConfigureAwait(false);
127+
await context.PostAsync(_retryMessage);
128+
await SendOAuthCardAsync(context, activity);
129129
}
130130
else
131131
{

‎CSharp/Library/Microsoft.Bot.Builder/Dialogs/LuisDialog.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ protected virtual async Task MessageReceived(IDialogContext context, IAwaitable<
223223
var tasks = this.services.Select(async s =>
224224
{
225225
var request = ModifyLuisRequest(s.ModifyRequest(new LuisRequest(messageText)));
226-
var result = await s.QueryAsync(request, context.CancellationToken).ConfigureAwait(false);
226+
var result = await s.QueryAsync(request, context.CancellationToken);
227227

228228
return Tuple.Create(request, result);
229229
}).ToArray();
@@ -243,7 +243,7 @@ protected virtual async Task MessageReceived(IDialogContext context, IAwaitable<
243243
throw new InvalidOperationException("No winning intent selected from Luis results.");
244244
}
245245

246-
await EmitTraceInfo(context, winner.Result, winner.LuisRequest, winner.LuisService.LuisModel).ConfigureAwait(false);
246+
await EmitTraceInfo(context, winner.Result, winner.LuisRequest, winner.LuisService.LuisModel);
247247

248248
if (winner.Result.Dialog?.Status == DialogResponse.DialogStatus.Question)
249249
{
@@ -329,7 +329,7 @@ private static async Task EmitTraceInfo(IBotContext context, LuisResult luisResu
329329
LuisModel = RemoveSensitiveData(luisModel)
330330
};
331331
var activity = Activity.CreateTraceActivityReply(context.Activity as Activity, LuisTraceName, LuisTraceType, luisTraceInfo, LuisTraceLabel) as IMessageActivity;
332-
await context.PostAsync(activity).ConfigureAwait(false);
332+
await context.PostAsync(activity);
333333
}
334334

335335
public static ILuisModel RemoveSensitiveData(ILuisModel luisModel)

‎CSharp/Library/Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency id="Autofac" version="3.5.2"/>
2929
<dependency id="Chronic.Signed" version="0.3.2" />
3030
<dependency id="Microsoft.AspNet.WebAPI.Core" version="5.2.3" />
31-
<dependency id="Microsoft.Bot.Connector" version="3.15.2.1" />
31+
<dependency id="Microsoft.Bot.Connector" version="3.15.2.2" />
3232
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.2" />
3333
<dependency id="Newtonsoft.Json" version="9.0.1" />
3434
<dependency id="System.IdentityModel.Tokens.Jwt" version="5.1.4" />

‎CSharp/Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("3.15.2.1")]
37-
[assembly: AssemblyFileVersion("3.15.2.1")]
36+
[assembly: AssemblyVersion("3.15.2.2")]
37+
[assembly: AssemblyFileVersion("3.15.2.2")]
3838

3939

4040
[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]

‎CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Microsoft.Bot.Connector.AspNetCore.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Microsoft.Bot.Connector.AspNetCore</id>
5-
<version>1.1.3.14</version>
5+
<version>1.1.3.15</version>
66
<authors>Microsoft</authors>
77
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
88
<iconUrl>https://bots.botframework.com/Client/Images/bot-framework-default-7.png</iconUrl>
@@ -22,7 +22,7 @@
2222
<dependency id="Newtonsoft.Json" version="9.0.1" />
2323
<dependency id="System.IdentityModel.Tokens.Jwt" version="5.1.4" />
2424
<dependency id="Microsoft.AspNetCore.Mvc.Core" version="1.1.4" />
25-
<dependency id="Microsoft.Bot.Connector" version="3.15.2.1" />
25+
<dependency id="Microsoft.Bot.Connector" version="3.15.2.2" />
2626
</group>
2727
</dependencies>
2828
</metadata>

‎CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
[assembly: AssemblyCulture("")]
1313

1414

15-
[assembly: AssemblyVersion("1.1.3.14")]
16-
[assembly: AssemblyFileVersion("1.1.3.14")]
15+
[assembly: AssemblyVersion("1.1.3.15")]
16+
[assembly: AssemblyFileVersion("1.1.3.15")]
1717

1818
//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
1919
//[assembly: AssemblyDelaySignAttribute(true)]

0 commit comments

Comments
 (0)