diff --git a/build/dependencies.props b/build/dependencies.props index 86fd5a65a7..fd93915bce 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,7 +5,7 @@ 2.1.0-* 4.7.1 $(BundledNETStandardPackageVersion) - 15.0.0 - 2.2.0 + 15.3.0-* + 2.3.0-beta2-* diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj index 6bde7978b8..0c7d442db4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj @@ -18,8 +18,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs index 8dfcc6066b..764f773e16 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs @@ -229,8 +229,17 @@ namespace Microsoft.AspNetCore.Routing.Tests Assert.IsType(dict._storage); Assert.Collection( dict.OrderBy(kvp => kvp.Key), - kvp => { Assert.Equal("CoolnessFactor", kvp.Key); Assert.Equal(73, kvp.Value); }, - kvp => { Assert.Equal("IsAwesome", kvp.Key); Assert.Equal(false, kvp.Value); }); + kvp => + { + Assert.Equal("CoolnessFactor", kvp.Key); + Assert.Equal(73, kvp.Value); + }, + kvp => + { + Assert.Equal("IsAwesome", kvp.Key); + var value = Assert.IsType(kvp.Value); + Assert.False(value); + }); } [Fact] @@ -246,7 +255,12 @@ namespace Microsoft.AspNetCore.Routing.Tests Assert.IsType(dict._storage); Assert.Collection( dict.OrderBy(kvp => kvp.Key), - kvp => { Assert.Equal("IsPublic", kvp.Key); Assert.Equal(true, kvp.Value); }); + kvp => + { + Assert.Equal("IsPublic", kvp.Key); + var value = Assert.IsType(kvp.Value); + Assert.True(value); + }); } [Fact] @@ -290,8 +304,18 @@ namespace Microsoft.AspNetCore.Routing.Tests Assert.IsType(dict._storage); Assert.Collection( dict.OrderBy(kvp => kvp.Key), - kvp => { Assert.Equal("DerivedProperty", kvp.Key); Assert.Equal(false, kvp.Value); }, - kvp => { Assert.Equal("TotallySweetProperty", kvp.Key); Assert.Equal(true, kvp.Value); }); + kvp => + { + Assert.Equal("DerivedProperty", kvp.Key); + var value = Assert.IsType(kvp.Value); + Assert.False(value); + }, + kvp => + { + Assert.Equal("TotallySweetProperty", kvp.Key); + var value = Assert.IsType(kvp.Value); + Assert.True(value); + }); } [Fact] diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj index 403b28e550..def5b888b6 100644 --- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj +++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj @@ -21,8 +21,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj index 836fefbf0c..f0e2361026 100644 --- a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj @@ -20,8 +20,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs index 5ef942d184..fb34db3994 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs @@ -34,11 +34,10 @@ namespace Microsoft.AspNetCore.Routing.Tests [InlineData("Apr 5 2009 11:45:00 PM", true)] [InlineData("April 5 2009 11:45:00 PM", true)] [InlineData("12/25/2009 11:45:00 PM", true)] - [InlineData("11:45:00 PM", true)] [InlineData("2009-05-12T11:45:00Z", true)] [InlineData("not-parseable-as-date", false)] [InlineData(false, false)] - [MemberData("GetDateTimeObject")] + [MemberData(nameof(GetDateTimeObject))] public void DateTimeRouteConstraint(object parameterValue, bool expected) { // Arrange diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs index c8233a95be..3975317fac 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Routing.Tests [InlineData("1.79769313486232E+300", false)] [InlineData("not-parseable-as-decimal", false)] [InlineData(false, false)] - [MemberData("GetDecimalObject")] + [MemberData(nameof(GetDecimalObject))] public void DecimalRouteConstraint_ApplyConstraint(object parameterValue, bool expected) { // Arrange diff --git a/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs index 696d98ad4a..0e570c49cc 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs @@ -917,7 +917,7 @@ namespace Microsoft.AspNetCore.Routing.Tests // Assert Assert.Equal("p1", templatePart.Name); - Assert.Equal(templatePart.DefaultValue, "123-456-7890"); + Assert.Equal("123-456-7890", templatePart.DefaultValue); Assert.False(templatePart.IsOptional); var constraint = Assert.Single(templatePart.InlineConstraints); diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj index 05046d72a4..b801539965 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj +++ b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj @@ -23,8 +23,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs index fefd735a81..9eca4d7759 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs @@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Routing Assert.IsType(Assert.Single(result).Value); var optionalConstraint = (OptionalRouteConstraint)result.First().Value; var compositeConstraint = Assert.IsType(optionalConstraint.InnerConstraint); ; - Assert.Equal(compositeConstraint.Constraints.Count(), 2); + Assert.Equal(2, compositeConstraint.Constraints.Count()); Assert.Single(compositeConstraint.Constraints, c => c is MinLengthRouteConstraint); Assert.Single(compositeConstraint.Constraints, c => c is AlphaRouteConstraint); diff --git a/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs index e7ce265e48..53b271e405 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs @@ -324,7 +324,7 @@ namespace Microsoft.AspNetCore.Routing var innerConstraint = ((OptionalRouteConstraint)route.Constraints["id"]).InnerConstraint; Assert.IsType(innerConstraint); var compositeConstraint = (CompositeRouteConstraint)innerConstraint; - Assert.Equal(compositeConstraint.Constraints.Count(), 2); + Assert.Equal(2, compositeConstraint.Constraints.Count()); Assert.Single(compositeConstraint.Constraints, c => c is IntRouteConstraint); Assert.Single(compositeConstraint.Constraints, c => c is RangeRouteConstraint); @@ -720,7 +720,7 @@ namespace Microsoft.AspNetCore.Routing } [Theory] - [MemberData("DataTokensTestData")] + [MemberData(nameof(DataTokensTestData))] public void GetVirtualPath_ReturnsDataTokens_WhenTargetReturnsVirtualPathData( RouteValueDictionary dataTokens) { @@ -764,7 +764,7 @@ namespace Microsoft.AspNetCore.Routing } [Theory] - [MemberData("DataTokensTestData")] + [MemberData(nameof(DataTokensTestData))] public void GetVirtualPath_ReturnsDataTokens_WhenTargetReturnsNullVirtualPathData( RouteValueDictionary dataTokens) { @@ -1529,7 +1529,7 @@ namespace Microsoft.AspNetCore.Routing } [Theory] - [MemberData("DataTokens")] + [MemberData(nameof(DataTokens))] public void RegisteringRoute_WithDataTokens_AbleToAddTheRoute(object dataToken, IDictionary expectedDictionary) { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs index 507dc07d0c..f1e93d3420 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs @@ -403,6 +403,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests Assert.Equal(expected, actual, new TemplateEqualityComparer()); } + [Fact(Skip = "Fails")] public void Parse_ComplexSegment_OptionalParameterFollowingPeriod_LastSegment() { // Arrange @@ -544,6 +545,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests + Environment.NewLine + "Parameter name: routeTemplate"); } + [Theory(Skip = "Skipped because it causes the test framework to crash")] [InlineData("{p1}-{p2?}", "-")] [InlineData("{p1}..{p2?}", "..")] [InlineData("..{p2?}", "..")] diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs index eabd339948..e58aee9a97 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs @@ -1678,7 +1678,7 @@ namespace Microsoft.AspNetCore.Routing.Tree } [Theory] - [MemberData("OptionalParamValues")] + [MemberData(nameof(OptionalParamValues))] public void TreeRouter_GenerateLink_Match_WithOptionalParameters( string template, object ambientValues,