From 475712d613adf2b3c98c0a07cb0c4978bb762d21 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Fri, 22 Sep 2017 14:11:44 -0700
Subject: [PATCH] Update API Check baselines

---
 .../baseline.netcore.json                     |   2 +-
 .../baseline.netcore.json                     | 380 +++++++++++++++---
 .../breakingchanges.netcore.json              |  32 --
 .../breakingchanges.netframework.json         |  32 --
 4 files changed, 318 insertions(+), 128 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Routing/breakingchanges.netcore.json
 delete mode 100644 src/Microsoft.AspNetCore.Routing/breakingchanges.netframework.json

diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json b/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json
index 471613a070..64e892b7ea 100644
--- a/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json
@@ -1,5 +1,5 @@
 {
-  "AssemblyIdentity": "Microsoft.AspNetCore.Routing.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "AssemblyIdentity": "Microsoft.AspNetCore.Routing.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
   "Types": [
     {
       "Name": "Microsoft.AspNetCore.Routing.IRouteConstraint",
diff --git a/src/Microsoft.AspNetCore.Routing/baseline.netcore.json b/src/Microsoft.AspNetCore.Routing/baseline.netcore.json
index 4711ae30cb..e49eb9f396 100644
--- a/src/Microsoft.AspNetCore.Routing/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.Routing/baseline.netcore.json
@@ -1,37 +1,6 @@
 {
-  "AssemblyIdentity": "Microsoft.AspNetCore.Routing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "AssemblyIdentity": "Microsoft.AspNetCore.Routing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
   "Types": [
-    {
-      "Name": "Microsoft.AspNetCore.Builder.RoutingBuilderExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseRouter",
-          "Parameters": [
-            {
-              "Name": "builder",
-              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
-            },
-            {
-              "Name": "router",
-              "Type": "Microsoft.AspNetCore.Routing.IRouter"
-            }
-          ],
-          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
     {
       "Name": "Microsoft.AspNetCore.Builder.MapRouteRouteBuilderExtensions",
       "Visibility": "Public",
@@ -202,6 +171,56 @@
       ],
       "GenericParameters": []
     },
+    {
+      "Name": "Microsoft.AspNetCore.Builder.RoutingBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "UseRouter",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
+            },
+            {
+              "Name": "router",
+              "Type": "Microsoft.AspNetCore.Routing.IRouter"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UseRouter",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
     {
       "Name": "Microsoft.AspNetCore.Routing.DefaultInlineConstraintResolver",
       "Visibility": "Public",
@@ -422,7 +441,7 @@
         },
         {
           "Kind": "Method",
-          "Name": "MapRoute",
+          "Name": "MapMiddlewareRoute",
           "Parameters": [
             {
               "Name": "builder",
@@ -466,6 +485,29 @@
           "Visibility": "Public",
           "GenericParameter": []
         },
+        {
+          "Kind": "Method",
+          "Name": "MapMiddlewareDelete",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
         {
           "Kind": "Method",
           "Name": "MapDelete",
@@ -479,8 +521,8 @@
               "Type": "System.String"
             },
             {
-              "Name": "action",
-              "Type": "System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>"
+              "Name": "handler",
+              "Type": "System.Func<Microsoft.AspNetCore.Http.HttpRequest, Microsoft.AspNetCore.Http.HttpResponse, Microsoft.AspNetCore.Routing.RouteData, System.Threading.Tasks.Task>"
             }
           ],
           "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
@@ -512,9 +554,78 @@
           "Visibility": "Public",
           "GenericParameter": []
         },
+        {
+          "Kind": "Method",
+          "Name": "MapMiddlewareGet",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
         {
           "Kind": "Method",
           "Name": "MapGet",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "handler",
+              "Type": "System.Func<Microsoft.AspNetCore.Http.HttpRequest, Microsoft.AspNetCore.Http.HttpResponse, Microsoft.AspNetCore.Routing.RouteData, System.Threading.Tasks.Task>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapPost",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "handler",
+              "Type": "Microsoft.AspNetCore.Http.RequestDelegate"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapMiddlewarePost",
           "Parameters": [
             {
               "Name": "builder",
@@ -538,6 +649,29 @@
         {
           "Kind": "Method",
           "Name": "MapPost",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "handler",
+              "Type": "System.Func<Microsoft.AspNetCore.Http.HttpRequest, Microsoft.AspNetCore.Http.HttpResponse, Microsoft.AspNetCore.Routing.RouteData, System.Threading.Tasks.Task>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapPut",
           "Parameters": [
             {
               "Name": "builder",
@@ -560,7 +694,7 @@
         },
         {
           "Kind": "Method",
-          "Name": "MapPost",
+          "Name": "MapMiddlewarePut",
           "Parameters": [
             {
               "Name": "builder",
@@ -595,7 +729,7 @@
             },
             {
               "Name": "handler",
-              "Type": "Microsoft.AspNetCore.Http.RequestDelegate"
+              "Type": "System.Func<Microsoft.AspNetCore.Http.HttpRequest, Microsoft.AspNetCore.Http.HttpResponse, Microsoft.AspNetCore.Routing.RouteData, System.Threading.Tasks.Task>"
             }
           ],
           "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
@@ -606,19 +740,23 @@
         },
         {
           "Kind": "Method",
-          "Name": "MapPut",
+          "Name": "MapVerb",
           "Parameters": [
             {
               "Name": "builder",
               "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
             },
+            {
+              "Name": "verb",
+              "Type": "System.String"
+            },
             {
               "Name": "template",
               "Type": "System.String"
             },
             {
-              "Name": "action",
-              "Type": "System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder>"
+              "Name": "handler",
+              "Type": "System.Func<Microsoft.AspNetCore.Http.HttpRequest, Microsoft.AspNetCore.Http.HttpResponse, Microsoft.AspNetCore.Routing.RouteData, System.Threading.Tasks.Task>"
             }
           ],
           "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
@@ -656,7 +794,7 @@
         },
         {
           "Kind": "Method",
-          "Name": "MapVerb",
+          "Name": "MapMiddlewareVerb",
           "Parameters": [
             {
               "Name": "builder",
@@ -1434,6 +1572,44 @@
       ],
       "GenericParameters": []
     },
+    {
+      "Name": "Microsoft.AspNetCore.Routing.RouteCreationException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "innerException",
+              "Type": "System.Exception"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
     {
       "Name": "Microsoft.AspNetCore.Routing.RouteHandler",
       "Visibility": "Public",
@@ -1643,6 +1819,51 @@
       ],
       "GenericParameters": []
     },
+    {
+      "Name": "Microsoft.AspNetCore.Routing.RoutingFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Routing.IRoutingFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Routing.IRoutingFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteData"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Routing.IRoutingFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
     {
       "Name": "Microsoft.AspNetCore.Routing.Tree.InboundMatch",
       "Visibility": "Public",
@@ -3283,28 +3504,6 @@
       ],
       "GenericParameters": []
     },
-    {
-      "Name": "Microsoft.AspNetCore.Routing.Internal.TaskCache",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Field",
-          "Name": "CompletedTask",
-          "Parameters": [],
-          "ReturnType": "System.Threading.Tasks.Task",
-          "Static": true,
-          "ReadOnly": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
     {
       "Name": "Microsoft.AspNetCore.Routing.Internal.UriBuilderContextPooledObjectPolicy",
       "Visibility": "Public",
@@ -4632,6 +4831,61 @@
       ],
       "GenericParameters": []
     },
+    {
+      "Name": "Microsoft.AspNetCore.Routing.Constraints.StringRouteConstraint",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Routing.IRouteConstraint"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Match",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "route",
+              "Type": "Microsoft.AspNetCore.Routing.IRouter"
+            },
+            {
+              "Name": "routeKey",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            },
+            {
+              "Name": "routeDirection",
+              "Type": "Microsoft.AspNetCore.Routing.RouteDirection"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Routing.IRouteConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
     {
       "Name": "Microsoft.Extensions.DependencyInjection.RoutingServiceCollectionExtensions",
       "Visibility": "Public",
diff --git a/src/Microsoft.AspNetCore.Routing/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Routing/breakingchanges.netcore.json
deleted file mode 100644
index fc2594074d..0000000000
--- a/src/Microsoft.AspNetCore.Routing/breakingchanges.netcore.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapDelete(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapGet(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapPost(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapPut(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapRoute(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapVerb(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String verb, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  }
-]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Routing/breakingchanges.netframework.json b/src/Microsoft.AspNetCore.Routing/breakingchanges.netframework.json
deleted file mode 100644
index fc2594074d..0000000000
--- a/src/Microsoft.AspNetCore.Routing/breakingchanges.netframework.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapDelete(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapGet(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapPost(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapPut(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapRoute(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public static class Microsoft.AspNetCore.Routing.RequestDelegateRouteBuilderExtensions",
-    "MemberId": "public static Microsoft.AspNetCore.Routing.IRouteBuilder MapVerb(this Microsoft.AspNetCore.Routing.IRouteBuilder builder, System.String verb, System.String template, System.Action<Microsoft.AspNetCore.Builder.IApplicationBuilder> action)",
-    "Kind": "Removal"
-  }
-]
\ No newline at end of file