Use TaskCache class from Microsoft.Extensions.TaskCache.Sources (#361)
Instead of Task.FromResult(0)
This commit is contained in:
parent
2fe646ca27
commit
032bcf43b2
|
|
@ -1,16 +0,0 @@
|
||||||
// Copyright (c) .NET Foundation. All rights reserved.
|
|
||||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
|
||||||
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Microsoft.AspNetCore.Routing.Internal
|
|
||||||
{
|
|
||||||
public static class TaskCache
|
|
||||||
{
|
|
||||||
#if NETSTANDARD1_3
|
|
||||||
public static readonly Task CompletedTask = Task.CompletedTask;
|
|
||||||
#else
|
|
||||||
public static readonly Task CompletedTask = Task.FromResult(0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Routing.Internal;
|
||||||
using Microsoft.AspNetCore.Routing.Logging;
|
using Microsoft.AspNetCore.Routing.Logging;
|
||||||
using Microsoft.AspNetCore.Routing.Template;
|
using Microsoft.AspNetCore.Routing.Template;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Internal;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.ObjectPool;
|
using Microsoft.Extensions.ObjectPool;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Routing.Internal;
|
using Microsoft.Extensions.Internal;
|
||||||
|
|
||||||
namespace Microsoft.AspNetCore.Routing
|
namespace Microsoft.AspNetCore.Routing
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,10 @@
|
||||||
"Microsoft.Extensions.PropertyHelper.Sources": {
|
"Microsoft.Extensions.PropertyHelper.Sources": {
|
||||||
"type": "build",
|
"type": "build",
|
||||||
"version": "1.1.0-*"
|
"version": "1.1.0-*"
|
||||||
|
},
|
||||||
|
"Microsoft.Extensions.TaskCache.Sources": {
|
||||||
|
"version": "1.1.0-*",
|
||||||
|
"type": "build"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Builder.Internal;
|
using Microsoft.AspNetCore.Builder.Internal;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Routing;
|
using Microsoft.AspNetCore.Routing;
|
||||||
using Microsoft.AspNetCore.Routing.Internal;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Moq;
|
using Moq;
|
||||||
using Xunit;
|
using Xunit;
|
||||||
|
|
@ -60,7 +59,7 @@ namespace Microsoft.AspNetCore.Builder
|
||||||
var router = new Mock<IRouter>(MockBehavior.Strict);
|
var router = new Mock<IRouter>(MockBehavior.Strict);
|
||||||
router
|
router
|
||||||
.Setup(r => r.RouteAsync(It.IsAny<RouteContext>()))
|
.Setup(r => r.RouteAsync(It.IsAny<RouteContext>()))
|
||||||
.Returns(TaskCache.CompletedTask)
|
.Returns(Task.FromResult(0))
|
||||||
.Verifiable();
|
.Verifiable();
|
||||||
|
|
||||||
app.UseRouter(router.Object);
|
app.UseRouter(router.Object);
|
||||||
|
|
@ -85,7 +84,7 @@ namespace Microsoft.AspNetCore.Builder
|
||||||
var router = new Mock<IRouter>(MockBehavior.Strict);
|
var router = new Mock<IRouter>(MockBehavior.Strict);
|
||||||
router
|
router
|
||||||
.Setup(r => r.RouteAsync(It.IsAny<RouteContext>()))
|
.Setup(r => r.RouteAsync(It.IsAny<RouteContext>()))
|
||||||
.Returns(TaskCache.CompletedTask)
|
.Returns(Task.FromResult(0))
|
||||||
.Verifiable();
|
.Verifiable();
|
||||||
|
|
||||||
app.UseRouter(b =>
|
app.UseRouter(b =>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Routing.Internal;
|
using Microsoft.AspNetCore.Routing.Internal;
|
||||||
using Microsoft.AspNetCore.Routing.Template;
|
using Microsoft.AspNetCore.Routing.Template;
|
||||||
|
using Microsoft.Extensions.Internal;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.Logging.Testing;
|
using Microsoft.Extensions.Logging.Testing;
|
||||||
using Microsoft.Extensions.ObjectPool;
|
using Microsoft.Extensions.ObjectPool;
|
||||||
|
|
@ -1531,7 +1532,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
|
||||||
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
||||||
c.Handler = null; // Not a match
|
c.Handler = null; // Not a match
|
||||||
})
|
})
|
||||||
.Returns(TaskCache.CompletedTask);
|
.Returns(Task.FromResult(0));
|
||||||
|
|
||||||
var builder = CreateBuilder();
|
var builder = CreateBuilder();
|
||||||
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
||||||
|
|
@ -1568,7 +1569,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
|
||||||
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
||||||
c.Handler = null; // Not a match
|
c.Handler = null; // Not a match
|
||||||
})
|
})
|
||||||
.Returns(TaskCache.CompletedTask);
|
.Returns(Task.FromResult(0));
|
||||||
|
|
||||||
var builder = CreateBuilder();
|
var builder = CreateBuilder();
|
||||||
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
||||||
|
|
@ -1612,7 +1613,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
|
||||||
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
nestedRouters = new List<IRouter>(c.RouteData.Routers);
|
||||||
throw new Exception();
|
throw new Exception();
|
||||||
})
|
})
|
||||||
.Returns(TaskCache.CompletedTask);
|
.Returns(Task.FromResult(0));
|
||||||
|
|
||||||
var builder = CreateBuilder();
|
var builder = CreateBuilder();
|
||||||
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
MapInboundEntry(builder, "api/Store", handler: next.Object);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue