Merge pull request #212 from aspnet/rybrande/DevMerge

Merge release/2.1 into dev

src/Microsoft.AspNetCore.Session/baseline.netcore.json

@@ -1,5 +1,5 @@
 {
-  "AssemblyIdentity": "Microsoft.AspNetCore.Session, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "AssemblyIdentity": "Microsoft.AspNetCore.Session, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
   "Types": [
     {
       "Name": "Microsoft.Extensions.DependencyInjection.SessionServiceCollectionExtensions",
@@ -99,6 +99,69 @@
       "Kind": "Class",
       "ImplementedInterfaces": [],
       "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Cookie",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.CookieBuilder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Cookie",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Http.CookieBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IdleTimeout",
+          "Parameters": [],
+          "ReturnType": "System.TimeSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IdleTimeout",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.TimeSpan"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IOTimeout",
+          "Parameters": [],
+          "ReturnType": "System.TimeSpan",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IOTimeout",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.TimeSpan"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
         {
           "Kind": "Method",
           "Name": "get_CookieName",
@@ -185,19 +248,19 @@
         },
         {
           "Kind": "Method",
-          "Name": "get_IdleTimeout",
+          "Name": "get_CookieSecure",
           "Parameters": [],
-          "ReturnType": "System.TimeSpan",
+          "ReturnType": "Microsoft.AspNetCore.Http.CookieSecurePolicy",
           "Visibility": "Public",
           "GenericParameter": []
         },
         {
           "Kind": "Method",
-          "Name": "set_IdleTimeout",
+          "Name": "set_CookieSecure",
           "Parameters": [
             {
               "Name": "value",
-              "Type": "System.TimeSpan"
+              "Type": "Microsoft.AspNetCore.Http.CookieSecurePolicy"
             }
           ],
           "ReturnType": "System.Void",
@@ -326,7 +389,13 @@
         {
           "Kind": "Method",
           "Name": "LoadAsync",
-          "Parameters": [],
+          "Parameters": [
+            {
+              "Name": "cancellationToken",
+              "Type": "System.Threading.CancellationToken",
+              "DefaultValue": "default(System.Threading.CancellationToken)"
+            }
+          ],
           "ReturnType": "System.Threading.Tasks.Task",
           "Sealed": true,
           "Virtual": true,
@@ -337,7 +406,13 @@
         {
           "Kind": "Method",
           "Name": "CommitAsync",
-          "Parameters": [],
+          "Parameters": [
+            {
+              "Name": "cancellationToken",
+              "Type": "System.Threading.CancellationToken",
+              "DefaultValue": "default(System.Threading.CancellationToken)"
+            }
+          ],
           "ReturnType": "System.Threading.Tasks.Task",
           "Sealed": true,
           "Virtual": true,
@@ -361,6 +436,10 @@
               "Name": "idleTimeout",
               "Type": "System.TimeSpan"
             },
+            {
+              "Name": "ioTimeout",
+              "Type": "System.TimeSpan"
+            },
             {
               "Name": "tryEstablishSession",
               "Type": "System.Func<System.Boolean>"
@@ -400,6 +479,10 @@
               "Name": "idleTimeout",
               "Type": "System.TimeSpan"
             },
+            {
+              "Name": "ioTimeout",
+              "Type": "System.TimeSpan"
+            },
             {
               "Name": "tryEstablishSession",
               "Type": "System.Func<System.Boolean>"
@@ -454,6 +537,10 @@
               "Name": "idleTimeout",
               "Type": "System.TimeSpan"
             },
+            {
+              "Name": "ioTimeout",
+              "Type": "System.TimeSpan"
+            },
             {
               "Name": "tryEstablishSession",
               "Type": "System.Func<System.Boolean>"
@@ -596,6 +683,5 @@
       ],
       "GenericParameters": []
     }
-  ],
+  ]
-  "SourceFilters": []
 }

src/Microsoft.AspNetCore.Session/breakingchanges.netcore.json

@@ -1,32 +0,0 @@
-[
-  {
-    "TypeId": "public interface Microsoft.AspNetCore.Session.ISessionStore",
-    "MemberId": "Microsoft.AspNetCore.Http.ISession Create(System.String sessionKey, System.TimeSpan idleTimeout, System.Func<System.Boolean> tryEstablishSession, System.Boolean isNewSessionKey)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public class Microsoft.AspNetCore.Session.DistributedSession : Microsoft.AspNetCore.Http.ISession",
-    "MemberId": "public .ctor(Microsoft.Extensions.Caching.Distributed.IDistributedCache cache, System.String sessionKey, System.TimeSpan idleTimeout, System.Func<System.Boolean> tryEstablishSession, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Boolean isNewSessionKey)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public class Microsoft.AspNetCore.Session.DistributedSession : Microsoft.AspNetCore.Http.ISession",
-    "MemberId": "public System.Threading.Tasks.Task CommitAsync()",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public class Microsoft.AspNetCore.Session.DistributedSession : Microsoft.AspNetCore.Http.ISession",
-    "MemberId": "public System.Threading.Tasks.Task LoadAsync()",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public class Microsoft.AspNetCore.Session.DistributedSessionStore : Microsoft.AspNetCore.Session.ISessionStore",
-    "MemberId": "public Microsoft.AspNetCore.Http.ISession Create(System.String sessionKey, System.TimeSpan idleTimeout, System.Func<System.Boolean> tryEstablishSession, System.Boolean isNewSessionKey)",
-    "Kind": "Removal"
-  },
-  {
-    "TypeId": "public interface Microsoft.AspNetCore.Session.ISessionStore",
-    "MemberId": "Microsoft.AspNetCore.Http.ISession Create(System.String sessionKey, System.TimeSpan idleTimeout, System.TimeSpan ioTimeout, System.Func<System.Boolean> tryEstablishSession, System.Boolean isNewSessionKey)",
-    "Kind": "Addition"
-  }
-]