Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 2a73d8d

Browse files
committed
React to HttpAbstractions namespace changes
- aspnet/HttpAbstractions#549 and aspnet/HttpAbstractions#592 - clean up `using`s
1 parent fb81a5e commit 2a73d8d

File tree

131 files changed

+94
-227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+94
-227
lines changed

test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using Microsoft.AspNetCore.Http.Internal;
5+
using Microsoft.AspNetCore.Http;
66
using Moq;
77
using Xunit;
88

test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
7-
using Microsoft.AspNetCore.Http.Internal;
7+
using Microsoft.AspNetCore.Http;
88
using Microsoft.AspNetCore.Mvc.Abstractions;
99
using Microsoft.AspNetCore.Mvc.ActionConstraints;
1010
using Microsoft.AspNetCore.Mvc.Filters;

test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System;
54
using System.IO;
65
using System.Text;
76
using System.Threading.Tasks;
87
using Microsoft.AspNetCore.Http;
98
using Microsoft.AspNetCore.Http.Features;
10-
using Microsoft.AspNetCore.Http.Internal;
119
using Microsoft.AspNetCore.Mvc.Abstractions;
12-
using Microsoft.AspNetCore.Mvc.Formatters;
1310
using Microsoft.AspNetCore.Mvc.TestCommon;
1411
using Microsoft.AspNetCore.Mvc.ViewComponents;
1512
using Microsoft.AspNetCore.Routing;

test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using System.Text;
1010
using System.Threading.Tasks;
1111
using Microsoft.AspNetCore.Http;
12-
using Microsoft.AspNetCore.Http.Internal;
1312
using Microsoft.AspNetCore.Mvc.DataAnnotations;
1413
using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
1514
using Microsoft.AspNetCore.Mvc.Formatters;

test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33

44
using System;
55
using System.Reflection;
6-
using Microsoft.AspNetCore.Http.Internal;
7-
using Microsoft.AspNetCore.Mvc.Abstractions;
8-
using Microsoft.AspNetCore.Mvc.Infrastructure;
6+
using Microsoft.AspNetCore.Http;
97
using Microsoft.AspNetCore.Mvc.Internal;
108
using Microsoft.AspNetCore.Mvc.ModelBinding;
119
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;

test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
using System;
55
using System.Reflection;
6-
using Microsoft.AspNetCore.Http.Internal;
7-
using Microsoft.AspNetCore.Mvc.Infrastructure;
6+
using Microsoft.AspNetCore.Http;
87
using Microsoft.AspNetCore.Mvc.Internal;
98
using Microsoft.AspNetCore.Mvc.ModelBinding;
109
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
@@ -182,7 +181,7 @@ public void CreateController_ThrowsIConstructorCannotBeActivated()
182181
var exception = Assert.Throws<InvalidOperationException>(() => factory.CreateController(context));
183182
Assert.Equal(
184183
$"Unable to resolve service for type '{typeof(TestService).FullName}' while attempting to activate " +
185-
$"'{typeof(ControllerThatCannotBeActivated).FullName}'.",
184+
$"'{typeof(ControllerThatCannotBeActivated).FullName}'.",
186185
exception.Message);
187186
}
188187

test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
using System;
55
using System.Reflection;
6-
using Microsoft.AspNetCore.Http.Internal;
7-
using Microsoft.AspNetCore.Mvc.Abstractions;
6+
using Microsoft.AspNetCore.Http;
87
using Microsoft.AspNetCore.Routing;
98
using Moq;
109
using Xunit;

test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.Collections.Generic;
65
using System.IO;
76
using System.Threading.Tasks;
87
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
108
using Microsoft.AspNetCore.Mvc.Abstractions;
119
using Microsoft.AspNetCore.Mvc.Formatters;
12-
using Microsoft.AspNetCore.Mvc.Infrastructure;
1310
using Microsoft.AspNetCore.Mvc.Internal;
1411
using Microsoft.AspNetCore.Mvc.Routing;
1512
using Microsoft.AspNetCore.Routing;
1613
using Microsoft.AspNetCore.Testing;
1714
using Microsoft.Extensions.DependencyInjection;
18-
using Microsoft.Extensions.Logging;
1915
using Microsoft.Extensions.Logging.Testing;
20-
using Microsoft.Extensions.Options;
2116
using Moq;
2217
using Xunit;
2318

test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
using System.IO;
77
using System.Threading.Tasks;
88
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
109
using Microsoft.AspNetCore.Mvc.Abstractions;
1110
using Microsoft.AspNetCore.Mvc.Formatters;
12-
using Microsoft.AspNetCore.Mvc.Infrastructure;
1311
using Microsoft.AspNetCore.Mvc.Internal;
1412
using Microsoft.AspNetCore.Routing;
1513
using Microsoft.AspNetCore.Testing;
1614
using Microsoft.Extensions.DependencyInjection;
17-
using Microsoft.Extensions.Logging;
1815
using Microsoft.Extensions.Logging.Testing;
19-
using Microsoft.Extensions.Options;
2016
using Moq;
2117
using Xunit;
2218

test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
using System.IO;
66
using System.Threading.Tasks;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.AspNetCore.Mvc.Abstractions;
109
using Microsoft.AspNetCore.Mvc.Formatters;
11-
using Microsoft.AspNetCore.Mvc.Infrastructure;
1210
using Microsoft.AspNetCore.Mvc.Internal;
1311
using Microsoft.AspNetCore.Routing;
14-
using Microsoft.AspNetCore.WebUtilities;
1512
using Microsoft.Extensions.DependencyInjection;
16-
using Microsoft.Extensions.Logging;
1713
using Microsoft.Extensions.Logging.Testing;
18-
using Microsoft.Extensions.Options;
1914
using Moq;
2015
using Xunit;
2116

test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Http;
77
using Microsoft.AspNetCore.Http.Features;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.AspNetCore.Mvc.Abstractions;
109
using Microsoft.AspNetCore.Mvc.TestCommon;
1110
using Microsoft.AspNetCore.Routing;

test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.IO;
66
using System.Threading.Tasks;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.AspNetCore.Mvc.Abstractions;
109
using Microsoft.AspNetCore.Routing;
1110
using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Threading.Tasks;
99
using Microsoft.AspNetCore.Http;
1010
using Microsoft.AspNetCore.Http.Features;
11-
using Microsoft.AspNetCore.Http.Internal;
1211
using Microsoft.AspNetCore.Mvc.Abstractions;
1312
using Microsoft.AspNetCore.Mvc.TestCommon;
1413
using Microsoft.AspNetCore.Routing;

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/HttpNotAcceptableOutputFormatterTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Http;
6-
using Microsoft.AspNetCore.Http.Internal;
76
using Xunit;
87

98
namespace Microsoft.AspNetCore.Mvc.Formatters

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.IO;
77
using System.Linq;
88
using System.Threading.Tasks;
9-
using Microsoft.AspNetCore.Http.Internal;
9+
using Microsoft.AspNetCore.Http;
1010
using Microsoft.AspNetCore.Mvc.ModelBinding;
1111
using Microsoft.Net.Http.Headers;
1212
using Xunit;

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
using System.Collections.Generic;
66
using System.Threading.Tasks;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.Extensions.Primitives;
10-
using Microsoft.Net.Http.Headers;
119
using Xunit;
1210

1311
namespace Microsoft.AspNetCore.Mvc.Formatters

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
7-
using System.Text;
87
using System.Threading.Tasks;
98
using Microsoft.AspNetCore.Http;
10-
using Microsoft.AspNetCore.Http.Internal;
11-
using Microsoft.AspNetCore.Mvc.TestCommon;
129
using Microsoft.Extensions.Primitives;
1310
using Microsoft.Net.Http.Headers;
14-
using Moq;
15-
using Moq.Protected;
1611
using Xunit;
1712

1813
namespace Microsoft.AspNetCore.Mvc.Formatters

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
using System.IO;
66
using System.Text;
77
using System.Threading.Tasks;
8+
using Microsoft.AspNetCore.Http;
89
using Microsoft.AspNetCore.Http.Features;
9-
using Microsoft.AspNetCore.Http.Internal;
1010
using Microsoft.Extensions.Primitives;
11-
using Microsoft.Net.Http.Headers;
1211
using Xunit;
1312

1413
namespace Microsoft.AspNetCore.Mvc.Formatters

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Text;
77
using System.Threading.Tasks;
88
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
109
using Microsoft.Extensions.Primitives;
1110
using Moq;
1211
using Xunit;

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.IO;
77
using System.Text;
88
using System.Threading.Tasks;
9-
using Microsoft.AspNetCore.Http.Internal;
9+
using Microsoft.AspNetCore.Http;
1010
using Microsoft.AspNetCore.Mvc.ModelBinding;
1111
using Xunit;
1212

test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System;
54
using System.Collections.Generic;
65
using System.Text;
76
using System.Threading.Tasks;
87
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
108
using Microsoft.Extensions.Primitives;
119
using Microsoft.Net.Http.Headers;
1210
using Moq;

test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
using System.IO;
66
using System.Threading.Tasks;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.AspNetCore.Mvc.Formatters;
10-
using Microsoft.AspNetCore.Mvc.Infrastructure;
119
using Microsoft.AspNetCore.Mvc.Internal;
1210
using Microsoft.Extensions.DependencyInjection;
1311
using Microsoft.Extensions.Logging.Testing;
@@ -49,7 +47,7 @@ public async Task HttpNotFoundObjectResult_ExecuteSuccessful()
4947
};
5048

5149
var result = new NotFoundObjectResult("Test Content");
52-
50+
5351
// Act
5452
await result.ExecuteResultAsync(actionContext);
5553

test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@
44
using System;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Http;
7-
using Microsoft.AspNetCore.Http.Internal;
87
using Microsoft.AspNetCore.Mvc.Abstractions;
98
using Microsoft.AspNetCore.Mvc.Formatters;
10-
using Microsoft.AspNetCore.Mvc.Infrastructure;
119
using Microsoft.AspNetCore.Mvc.Internal;
1210
using Microsoft.AspNetCore.Routing;
1311
using Microsoft.Extensions.DependencyInjection;
14-
using Microsoft.Extensions.DependencyInjection.Extensions;
15-
using Microsoft.Extensions.Logging;
1612
using Microsoft.Extensions.Logging.Testing;
17-
using Microsoft.Extensions.Options;
1813
using Xunit;
1914

2015
namespace Microsoft.AspNetCore.Mvc

test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Http;
6-
using Microsoft.AspNetCore.Http.Internal;
76
using Microsoft.AspNetCore.Mvc.Abstractions;
87
using Microsoft.AspNetCore.Routing;
98
using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using Microsoft.AspNetCore.Http;
5-
using Microsoft.AspNetCore.Http.Internal;
65
using Microsoft.AspNetCore.Mvc.Abstractions;
76
using Microsoft.AspNetCore.Routing;
87
using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
using System.Linq;
77
using System.Reflection;
88
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
109
using Microsoft.AspNetCore.Mvc.Abstractions;
1110
using Microsoft.AspNetCore.Mvc.ActionConstraints;
12-
using Microsoft.AspNetCore.Mvc.ApplicationModels;
1311
using Microsoft.AspNetCore.Mvc.Controllers;
1412
using Microsoft.AspNetCore.Mvc.Internal;
1513
using Microsoft.AspNetCore.Mvc.Routing;

test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Text;
77
using System.Threading.Tasks;
88
using Microsoft.AspNetCore.Http;
9-
using Microsoft.AspNetCore.Http.Internal;
109
using Microsoft.AspNetCore.Mvc.Formatters;
1110
using Microsoft.AspNetCore.Mvc.TestCommon;
1211
using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using Microsoft.AspNetCore.Http.Internal;
5+
using Microsoft.AspNetCore.Http;
66
using Microsoft.AspNetCore.Mvc.ActionConstraints;
77
using Microsoft.AspNetCore.Mvc.Controllers;
88
using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.Threading.Tasks;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.AspNetCore.Mvc.Abstractions;
109
using Microsoft.AspNetCore.Mvc.Infrastructure;
1110
using Microsoft.AspNetCore.Mvc.Routing;

test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Reflection;
99
#endif
1010
using System.Threading.Tasks;
11-
using Microsoft.AspNetCore.Http.Internal;
11+
using Microsoft.AspNetCore.Http;
1212
using Microsoft.AspNetCore.Mvc.Abstractions;
1313
using Microsoft.AspNetCore.Mvc.Controllers;
1414
using Microsoft.AspNetCore.Mvc.Infrastructure;

test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
using System;
55
using System.Reflection;
6-
using Microsoft.AspNetCore.Http.Internal;
6+
using Microsoft.AspNetCore.Http;
77
using Microsoft.AspNetCore.Mvc.Controllers;
88
using Microsoft.AspNetCore.Mvc.Filters;
9-
using Microsoft.AspNetCore.Mvc.Infrastructure;
109
using Microsoft.AspNetCore.Routing;
1110
using Microsoft.Extensions.DependencyInjection;
1211
using Xunit;
@@ -172,7 +171,7 @@ public void GetControllerActionMethodExecutor_CachesExecutor()
172171
new RouteData(),
173172
action));
174173

175-
// Act - 1
174+
// Act - 1
176175
var executor1 = cache.GetControllerActionMethodExecutor(context);
177176

178177
Assert.NotNull(executor1);

test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
using System.Reflection;
1010
using System.Threading.Tasks;
1111
using Microsoft.AspNetCore.Http;
12-
using Microsoft.AspNetCore.Http.Internal;
1312
using Microsoft.AspNetCore.Mvc.Abstractions;
1413
using Microsoft.AspNetCore.Mvc.Controllers;
1514
using Microsoft.AspNetCore.Mvc.Filters;
1615
using Microsoft.AspNetCore.Mvc.Formatters;
17-
using Microsoft.AspNetCore.Mvc.Infrastructure;
18-
using Microsoft.AspNetCore.Mvc.Internal;
1916
using Microsoft.AspNetCore.Mvc.ModelBinding;
20-
using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
2117
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
2218
using Microsoft.AspNetCore.Routing;
2319
using Microsoft.AspNetCore.Testing;

0 commit comments

Comments
 (0)