Merge pull request #760 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

benchmarks/Microsoft.AspNetCore.Routing.Performance/Matching/JumpTableSingleEntryBenchmark.cs

@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
             var segments = _segments;
 
             int destination = 0;
-            for (int i = 0; i < strings.Length; i++)
+            for (var i = 0; i < strings.Length; i++)
             {
                 var @string = strings[i];
                 var segment = segments[i];
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
             var segments = _segments;
 
             var destination = 0;
-            for (int i = 0; i < strings.Length; i++)
+            for (var i = 0; i < strings.Length; i++)
             {
                 destination = _implementation.GetDestination(strings[i], segments[i]);
             }
@@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
             var segments = _segments;
 
             var destination = 0;
-            for (int i = 0; i < strings.Length; i++)
+            for (var i = 0; i < strings.Length; i++)
             {
                 destination = _prototype.GetDestination(strings[i], segments[i]);
             }

src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj

@@ -38,7 +38,5 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" PrivateAssets="All" />
-    <PackageReference Condition="'$(ILEmitBackendSaveAssemblies)'=='true'" Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" PrivateAssets="All" />
-    <PackageReference Condition="'$(ILEmit)'=='true'" Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>

test/Microsoft.AspNetCore.Routing.Tests/Matching/BarebonesMatcherConformanceTest.cs

@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
         internal override Matcher CreateMatcher(params RouteEndpoint[] endpoints)
         {
             var builder = new BarebonesMatcherBuilder();
-            for (int i = 0; i < endpoints.Length; i++)
+            for (var i = 0; i < endpoints.Length; i++)
             {
                 builder.AddEndpoint(endpoints[i]);
             }

test/Microsoft.AspNetCore.Routing.Tests/Matching/DfaMatcherConformanceTest.cs

@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
                 .BuildServiceProvider();
 
             var builder = services.GetRequiredService<DfaMatcherBuilder>();
-            for (int i = 0; i < endpoints.Length; i++)
+            for (var i = 0; i < endpoints.Length; i++)
             {
                 builder.AddEndpoint(endpoints[i]);
             }

test/Microsoft.AspNetCore.Routing.Tests/Matching/RouteMatcherConformanceTest.cs

@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Routing.Matching
         internal override Matcher CreateMatcher(params RouteEndpoint[] endpoints)
         {
             var builder = new RouteMatcherBuilder();
-            for (int i = 0; i < endpoints.Length; i++)
+            for (var i = 0; i < endpoints.Length; i++)
             {
                 builder.AddEndpoint(endpoints[i]); 
             }

test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj

@@ -28,7 +28,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
-    <PackageReference Condition="'$(ILEmit)'=='true'" Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

test/Microsoft.AspNetCore.Routing.Tests/Patterns/RoutePatternParserTest.cs

@@ -665,7 +665,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns
                         return false;
                     }
 
-                    for (int i = 0; i < x.PathSegments.Count; i++)
+                    for (var i = 0; i < x.PathSegments.Count; i++)
                     {
                         if (x.PathSegments[i].Parts.Count != y.PathSegments[i].Parts.Count)
                         {
@@ -686,7 +686,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns
                         return false;
                     }
 
-                    for (int i = 0; i < x.Parameters.Count; i++)
+                    for (var i = 0; i < x.Parameters.Count; i++)
                     {
                         if (!Equals(x.Parameters[i], y.Parameters[i]))
                         {

test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs

@@ -840,7 +840,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests
                         return false;
                     }
 
-                    for (int i = 0; i < x.Segments.Count; i++)
+                    for (var i = 0; i < x.Segments.Count; i++)
                     {
                         if (x.Segments[i].Parts.Count != y.Segments[i].Parts.Count)
                         {
@@ -861,7 +861,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests
                         return false;
                     }
 
-                    for (int i = 0; i < x.Parameters.Count; i++)
+                    for (var i = 0; i < x.Parameters.Count; i++)
                     {
                         if (!Equals(x.Parameters[i], y.Parameters[i]))
                         {

test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs

@@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
             var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{*parameter4=4}");
             var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" };
             var expectedRouteValues = new RouteValueDictionary();
-            for (int i = 0; i < routeValueKeys.Length; i++)
+            for (var i = 0; i < routeValueKeys.Length; i++)
             {
                 expectedRouteValues.Add(routeValueKeys[i], routeValues[i]);
             }
@@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
             var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{parameter4=4}");
             var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" };
             var expectedRouteValues = new RouteValueDictionary();
-            for (int i = 0; i < routeValueKeys.Length; i++)
+            for (var i = 0; i < routeValueKeys.Length; i++)
             {
                 expectedRouteValues.Add(routeValueKeys[i], routeValues[i]);
             }
@@ -262,7 +262,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
             var expectedRouteGroup = CreateRouteGroup(0, "{parameter1:int=1}/{parameter2:int=2}/{parameter3:int=3}/{parameter4:int=4}");
             var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" };
             var expectedRouteValues = new RouteValueDictionary();
-            for (int i = 0; i < routeValueKeys.Length; i++)
+            for (var i = 0; i < routeValueKeys.Length; i++)
             {
                 expectedRouteValues.Add(routeValueKeys[i], routeValues[i]);
             }
@@ -305,7 +305,7 @@ namespace Microsoft.AspNetCore.Routing.Tree
             var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{*parameter4=4}");
             var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" };
             var expectedRouteValues = new RouteValueDictionary();
-            for (int i = 0; i < routeValueKeys.Length; i++)
+            for (var i = 0; i < routeValueKeys.Length; i++)
             {
                 expectedRouteValues.Add(routeValueKeys[i], routeValues[i]);
             }