diff --git a/build/dependencies.props b/build/dependencies.props index 09cfb1fe04..ed2c89867f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,7 @@ 4.3.0 2.1.0-* $(BundledNETStandardPackageVersion) - 15.0.0 - 2.2.0 + 15.3.0-* + 2.3.0-beta2-* diff --git a/test/Microsoft.AspNetCore.Authentication.Core.Test/Microsoft.AspNetCore.Authentication.Core.Test.csproj b/test/Microsoft.AspNetCore.Authentication.Core.Test/Microsoft.AspNetCore.Authentication.Core.Test.csproj index 493e57568c..b197458c5c 100644 --- a/test/Microsoft.AspNetCore.Authentication.Core.Test/Microsoft.AspNetCore.Authentication.Core.Test.csproj +++ b/test/Microsoft.AspNetCore.Authentication.Core.Test/Microsoft.AspNetCore.Authentication.Core.Test.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Authentication.Core.Test/TokenExtensionTests.cs b/test/Microsoft.AspNetCore.Authentication.Core.Test/TokenExtensionTests.cs index d9e050fe82..a203afadf0 100644 --- a/test/Microsoft.AspNetCore.Authentication.Core.Test/TokenExtensionTests.cs +++ b/test/Microsoft.AspNetCore.Authentication.Core.Test/TokenExtensionTests.cs @@ -50,9 +50,9 @@ namespace Microsoft.AspNetCore.Authentication props.StoreTokens(new[] { new AuthenticationToken { Name = "Zero", Value = "0" } }); Assert.Equal("0", props.GetTokenValue("Zero")); - Assert.Equal(null, props.GetTokenValue("One")); - Assert.Equal(null, props.GetTokenValue("Two")); - Assert.Equal(null, props.GetTokenValue("Three")); + Assert.Null(props.GetTokenValue("One")); + Assert.Null(props.GetTokenValue("Two")); + Assert.Null(props.GetTokenValue("Three")); Assert.Equal(1, props.GetTokens().Count()); } diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/FragmentStringTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/FragmentStringTests.cs index eb0c955e3d..4f5fe20916 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/FragmentStringTests.cs +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/FragmentStringTests.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Http.Abstractions.Tests public void Equals_EmptyFragmentStringAndDefaultFragmentString() { // Act and Assert - Assert.Equal(FragmentString.Empty, default(FragmentString)); + Assert.Equal(default(FragmentString), FragmentString.Empty); Assert.Equal(default(FragmentString), FragmentString.Empty); // explicitly checking == operator Assert.True(FragmentString.Empty == default(FragmentString)); @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Http.Abstractions.Tests var fragmentString = new FragmentString("#col=1"); // Act and Assert - Assert.NotEqual(fragmentString, default(FragmentString)); + Assert.NotEqual(default(FragmentString), fragmentString); } [Fact] diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/HostStringTest.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/HostStringTest.cs index b5d5f3e392..d529ed76d2 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/HostStringTest.cs +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/HostStringTest.cs @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Http var result = hostString.Port; // Assert - Assert.Equal(null, result); + Assert.Null(result); } [Theory] @@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Http public void Equals_EmptyHostStringAndDefaultHostString() { // Act and Assert - Assert.Equal(new HostString(string.Empty), default(HostString)); + Assert.Equal(default(HostString), new HostString(string.Empty)); Assert.Equal(default(HostString), new HostString(string.Empty)); // explicitly checking == operator Assert.True(new HostString(string.Empty) == default(HostString)); @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Http var hostString = new HostString("example.com"); // Act and Assert - Assert.NotEqual(hostString, default(HostString)); + Assert.NotEqual(default(HostString), hostString); } [Fact] diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj index 7a31ffb37c..0942ec9578 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj @@ -17,8 +17,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs index f5cbe052dd..60a1a9b017 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/PathStringTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Http public void Equals_EmptyPathStringAndDefaultPathString() { // Act and Assert - Assert.Equal(PathString.Empty, default(PathString)); + Assert.Equal(default(PathString), PathString.Empty); Assert.Equal(default(PathString), PathString.Empty); Assert.True(PathString.Empty == default(PathString)); Assert.True(default(PathString) == PathString.Empty); @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Http var pathString = new PathString("/hello"); // Act and Assert - Assert.NotEqual(pathString, default(PathString)); + Assert.NotEqual(default(PathString), pathString); } [Fact] diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs index ec3a36cbe2..01532d45ab 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/QueryStringTests.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Http.Abstractions public void Equals_EmptyQueryStringAndDefaultQueryString() { // Act and Assert - Assert.Equal(QueryString.Empty, default(QueryString)); + Assert.Equal(default(QueryString), QueryString.Empty); Assert.Equal(default(QueryString), QueryString.Empty); // explicitly checking == operator Assert.True(QueryString.Empty == default(QueryString)); @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Http.Abstractions var queryString = new QueryString("?foo=1"); // Act and Assert - Assert.NotEqual(queryString, default(QueryString)); + Assert.NotEqual(default(QueryString), queryString); } [Fact] diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs index 6ba21da298..e00b3ead76 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs @@ -224,8 +224,8 @@ namespace Microsoft.AspNetCore.Http sp.AddService(typeof(IMiddlewareFactory), middlewareFactory); context.RequestServices = sp; await app(context); - Assert.Equal(true, context.Items["before"]); - Assert.Equal(true, context.Items["after"]); + Assert.True(Assert.IsType(context.Items["before"])); + Assert.True(Assert.IsType(context.Items["after"])); Assert.NotNull(middlewareFactory.Created); Assert.NotNull(middlewareFactory.Released); Assert.IsType(typeof(Middleware), middlewareFactory.Created); @@ -374,4 +374,4 @@ namespace Microsoft.AspNetCore.Http public Task InvokeAsync(HttpContext context) => TaskCache.CompletedTask; } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.csproj b/test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.csproj index 914c592b03..05bbaf148f 100644 --- a/test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.csproj +++ b/test/Microsoft.AspNetCore.Http.Extensions.Tests/Microsoft.AspNetCore.Http.Extensions.Tests.csproj @@ -18,8 +18,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.csproj b/test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.csproj index 457ac55c05..1851cf26e0 100644 --- a/test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.csproj +++ b/test/Microsoft.AspNetCore.Http.Features.Tests/Microsoft.AspNetCore.Http.Features.Tests.csproj @@ -16,8 +16,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs b/test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs index 7a73c1f446..9cf4f872ce 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs +++ b/test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs @@ -202,7 +202,7 @@ namespace Microsoft.AspNetCore.Http.Features { Assert.True(body.CanSeek); var content = reader.ReadToEnd(); - Assert.Equal(content, "Hello World"); + Assert.Equal("Hello World", content); } await responseFeature.CompleteAsync(); @@ -250,7 +250,7 @@ namespace Microsoft.AspNetCore.Http.Features { Assert.True(body.CanSeek); var content = reader.ReadToEnd(); - Assert.Equal(content, "Hello World"); + Assert.Equal("Hello World", content); } await responseFeature.CompleteAsync(); @@ -297,7 +297,7 @@ namespace Microsoft.AspNetCore.Http.Features { Assert.True(body.CanSeek); var content = reader.ReadToEnd(); - Assert.Equal(content, "Hello World"); + Assert.Equal("Hello World", content); } await responseFeature.CompleteAsync(); @@ -324,7 +324,7 @@ namespace Microsoft.AspNetCore.Http.Features context.Features.Set(formFeature); var exception = await Assert.ThrowsAsync (() => context.Request.ReadFormAsync()); - Assert.Equal(exception.Message, "Form value count limit 2 exceeded."); + Assert.Equal("Form value count limit 2 exceeded.", exception.Message); } [Theory] @@ -349,7 +349,7 @@ namespace Microsoft.AspNetCore.Http.Features context.Features.Set(formFeature); var exception = await Assert.ThrowsAsync (() => context.Request.ReadFormAsync()); - Assert.Equal(exception.Message, "Form value count limit 2 exceeded."); + Assert.Equal("Form value count limit 2 exceeded.", exception.Message); } [Theory] diff --git a/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs b/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs index 976d9bf7e1..e1336c82ba 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs +++ b/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Builder.Internal var httpContext = new DefaultHttpContext(); app.Invoke(httpContext); - Assert.Equal(httpContext.Response.StatusCode, 404); + Assert.Equal(404, httpContext.Response.StatusCode); } [Fact] @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Builder.Internal var builder2 = builder1.New(); builder2.Properties["test"] = "value2"; - Assert.Equal(builder1.Properties["test"], "value1"); + Assert.Equal("value1", builder1.Properties["test"]); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.csproj b/test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.csproj index 96e9eb66c5..b5db0529d5 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.csproj +++ b/test/Microsoft.AspNetCore.Http.Tests/Microsoft.AspNetCore.Http.Tests.csproj @@ -4,8 +4,6 @@ netcoreapp2.0 - true - true @@ -18,8 +16,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.csproj b/test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.csproj index f12a45f2bb..98a2f4889f 100644 --- a/test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.csproj +++ b/test/Microsoft.AspNetCore.Owin.Tests/Microsoft.AspNetCore.Owin.Tests.csproj @@ -18,8 +18,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs index 792d854854..b2755961c8 100644 --- a/test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs +++ b/test/Microsoft.AspNetCore.Owin.Tests/OwinFeatureCollectionTests.cs @@ -35,9 +35,9 @@ namespace Microsoft.AspNetCore.Owin var requestFeature = Get(features); Assert.Equal(requestFeature.Method, HttpMethods.Post); - Assert.Equal(requestFeature.Path, "/path"); - Assert.Equal(requestFeature.PathBase, "/pathBase"); - Assert.Equal(requestFeature.QueryString, "?name=value"); + Assert.Equal("/path", requestFeature.Path); + Assert.Equal("/pathBase", requestFeature.PathBase); + Assert.Equal("?name=value", requestFeature.QueryString); } [Fact] diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs index d163f2b526..82163c2b54 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpRequestStreamReaderTest.cs @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.WebUtilities.Test var read = await reader.ReadAsync(chars, 4, 3); // Assert - Assert.Equal(read, 3); + Assert.Equal(3, read); for (var i = 0; i < 3; i++) { Assert.Equal(CharData[i], chars[i + 4]); diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.csproj b/test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.csproj index b3bb954826..863c4e3c91 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.csproj +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/Microsoft.AspNetCore.WebUtilities.Tests.csproj @@ -16,8 +16,4 @@ - - - - diff --git a/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.csproj b/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.csproj index 84323cd28e..55476bcdcf 100644 --- a/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.csproj +++ b/test/Microsoft.Net.Http.Headers.Tests/Microsoft.Net.Http.Headers.Tests.csproj @@ -16,8 +16,4 @@ - - - - diff --git a/test/Microsoft.Net.Http.Headers.Tests/NameValueHeaderValueTest.cs b/test/Microsoft.Net.Http.Headers.Tests/NameValueHeaderValueTest.cs index c90a922574..9a8396f79d 100644 --- a/test/Microsoft.Net.Http.Headers.Tests/NameValueHeaderValueTest.cs +++ b/test/Microsoft.Net.Http.Headers.Tests/NameValueHeaderValueTest.cs @@ -72,7 +72,7 @@ namespace Microsoft.Net.Http.Headers // Change one value and verify the other is unchanged. pair0.Value = "othervalue"; Assert.Equal("othervalue", pair0.Value); - Assert.Equal(null, pair1.Value); + Assert.Null(pair1.Value); } [Fact] @@ -90,7 +90,7 @@ namespace Microsoft.Net.Http.Headers // Change one value and verify the other is unchanged. pair0.Value = "othervalue"; Assert.Equal("othervalue", pair0.Value); - Assert.Equal(null, pair1.Value); + Assert.Null(pair1.Value); Assert.Throws(() => { pair1.Value = "othervalue"; }); }