Skip to content

Commit 85e7a4a

Browse files
committed
Removed all .Wait() methods and replaced them with async-await
1 parent 3ca305b commit 85e7a4a

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

samples/MusicStore/MusicStore.Web/StartupNtlmAuthentication.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Extensions.Logging;
1010
using MusicStore.Components;
1111
using MusicStore.Models;
12+
using System.Threading.Tasks;
1213

1314
namespace MusicStore
1415
{
@@ -143,7 +144,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
143144
});
144145

145146
//Populates the MusicStore sample data
146-
SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices, false).Wait();
147+
Task.Run(async () => await SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices, false)).Wait();
147148
}
148149
}
149150
}

samples/MusicStore/MusicStore.Web/StartupOpenIdConnect.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
99
using MusicStore.Components;
1010
using MusicStore.Models;
11+
using System.Threading.Tasks;
1112

1213
namespace MusicStore
1314
{
@@ -151,7 +152,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
151152
});
152153

153154
//Populates the MusicStore sample data
154-
SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
155+
Task.Run(async () => await SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices)).Wait();
155156
}
156157
}
157158
}

src/MyTested.AspNetCore.Mvc.Core/Internal/Formatters/FormattersHelper.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Utilities;
1616
using Utilities.Extensions;
1717
using Utilities.Validators;
18+
using System.Threading.Tasks;
1819

1920
public static class FormattersHelper
2021
{
@@ -53,7 +54,7 @@ public static TModel ReadFromStream<TModel>(Stream stream, string contentType, E
5354
return formatter;
5455
});
5556

56-
var result = inputFormatter.ReadAsync(inputFormatterContext).Result.Model;
57+
var result = Task.Run(async () => await inputFormatter.ReadAsync(inputFormatterContext)).Result.Model;
5758

5859
try
5960
{
@@ -90,7 +91,7 @@ public static Stream WriteToStream<TBody>(TBody value, string contentType, Encod
9091
return formatter;
9192
});
9293

93-
outputFormatter.WriteAsync(outputFormatterCanWriteContext).Wait();
94+
Task.Run(async () => await outputFormatter.WriteAsync(outputFormatterCanWriteContext)).Wait();
9495

9596
// copy memory stream because formatters close the original one
9697
return new MemoryStream(((MemoryStream)httpContext.Response.Body).ToArray());

src/MyTested.AspNetCore.Mvc.Core/Internal/Routes/InternalRouteResolver.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.AspNetCore.Routing;
1313
using Microsoft.Extensions.DependencyInjection;
1414
using Utilities.Extensions;
15+
using System.Threading.Tasks;
1516

1617
/// <summary>
1718
/// Used for resolving HTTP request to a route.
@@ -82,7 +83,7 @@ public static ResolvedRouteContext Resolve(IServiceProvider services, IRouter ro
8283

8384
try
8485
{
85-
modelBindingActionInvoker.InvokeAsync().Wait();
86+
Task.Run(async() => await modelBindingActionInvoker.InvokeAsync()).Wait();
8687
}
8788
catch (Exception ex)
8889
{
@@ -116,7 +117,7 @@ public static RouteData ResolveRouteData(IRouter router, RouteContext routeConte
116117
return null;
117118
}
118119

119-
router.RouteAsync(routeContext).Wait();
120+
Task.Run(async () => await router.RouteAsync(routeContext)).Wait();
120121

121122
var routeData = routeContext.RouteData;
122123
routeContext.HttpContext.SetRouteData(routeData);

0 commit comments

Comments
 (0)