From c8b5a48b767efbd4048e9335f20951f93396909e Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Thu, 3 Nov 2016 19:48:25 -0700 Subject: [PATCH] Fixed trackAllCaptures enum naming --- .../Internal/IISUrlRewrite/RewriteTags.cs | 2 +- .../Internal/IISUrlRewrite/UrlRewriteFileParser.cs | 4 ++-- .../Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs | 4 ++-- .../IISUrlRewrite/FormatExceptionHandlingTests.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs index 5b60674d41..9b62b26511 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs +++ b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite public const string Rule = "rule"; public const string Rules = "rules"; public const string StopProcessing = "stopProcessing"; - public const string TrackingAllCaptures = "trackingAllCaptures"; + public const string TrackAllCaptures = "trackAllCaptures"; public const string Type = "type"; public const string Url = "url"; } diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs index 90ea82a770..c8d20bedb8 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs +++ b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs @@ -109,8 +109,8 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite } var grouping = ParseEnum(conditions, RewriteTags.LogicalGrouping, LogicalGrouping.MatchAll); - var trackingAllCaptures = ParseBool(conditions, RewriteTags.TrackingAllCaptures, defaultValue: false); - builder.AddUrlConditions(grouping, trackingAllCaptures); + var trackAllCaptures = ParseBool(conditions, RewriteTags.TrackAllCaptures, defaultValue: false); + builder.AddUrlConditions(grouping, trackAllCaptures); foreach (var cond in conditions.Elements(RewriteTags.Add)) { diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs index 311a503cca..f6603b2df8 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs +++ b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs @@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite // If there are no conditions specified if (_conditions == null) { - AddUrlConditions(LogicalGrouping.MatchAll, trackingAllCaptures: false); + AddUrlConditions(LogicalGrouping.MatchAll, trackAllCaptures: false); } switch (patternSyntax) @@ -144,7 +144,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite } } - public void AddUrlConditions(LogicalGrouping logicalGrouping, bool trackingAllCaptures) + public void AddUrlConditions(LogicalGrouping logicalGrouping, bool trackAllCaptures) { _conditions = new List(); _matchAny = logicalGrouping == LogicalGrouping.MatchAny; diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs index 6e8be8053c..c14f062e64 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs @@ -240,14 +240,14 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite - + ", - "Could not parse the UrlRewrite file. Message: 'The trackingAllCaptures parameter 'foo' was not recognized'. Line number '5': '14'.")] + "Could not parse the UrlRewrite file. Message: 'The trackAllCaptures parameter 'foo' was not recognized'. Line number '5': '14'.")] [InlineData( @"