From 97e9ee566ecdecccf3d95b9c8abe934c95be7ddf Mon Sep 17 00:00:00 2001
From: Mordechai Zuber <mez613@gmail.com>
Date: Sun, 20 Dec 2015 14:05:20 +0200
Subject: [PATCH 1/2] Move INotificationsClient to under IActivitiesClient

per #1015.

Top level client obsoleted.
---
 .../Clients/IObservableActivitiesClient.cs       |   1 +
 .../Clients/ObservableActivitiesClient.cs        |   2 ++
 .../Clients/ObservableNotificationsClient.cs     |   2 +-
 Octokit.Reactive/IObservableGitHubClient.cs      |   1 +
 Octokit/Clients/ActivitiesClient.cs              |   5 +++++
 Octokit/Clients/IActivitiesClient.cs             |   5 +++++
 Octokit/IGitHubClient.cs                         |   1 +
 .../System.Net.Http.2.0.20710.0.nupkg            | Bin 0 -> 2624 bytes
 8 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg

diff --git a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
index f14a93fa..4f93f640 100644
--- a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs
@@ -6,5 +6,6 @@
         IObservableWatchedClient Watching { get; }
         IObservableStarredClient Starring { get; }
         IObservableFeedsClient Feeds { get; }
+        IObservableNotificationsClient Notifications { get; }
     }
 }
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
index df53cf7d..bf521354 100644
--- a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
@@ -10,6 +10,7 @@
             Watching = new ObservableWatchedClient(client);
             Starring = new ObservableStarredClient(client);
             Feeds = new ObservableFeedsClient(client);
+            Notifications = new ObservableNotificationsClient(client);
         }
         public IObservableEventsClient Events { get; private set; }
 
@@ -18,5 +19,6 @@
         public IObservableStarredClient Starring { get; private set; }
 
         public IObservableFeedsClient Feeds { get; private set; }
+        public IObservableNotificationsClient Notifications { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
index 025b3216..1ba1bf72 100644
--- a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
@@ -15,7 +15,7 @@ namespace Octokit.Reactive
             Ensure.ArgumentNotNull(client, "client");
 
             _connection = client.Connection;
-            _notificationsClient = client.Notification;
+            _notificationsClient = client.Activity.Notifications;
         }
 
         /// <summary>
diff --git a/Octokit.Reactive/IObservableGitHubClient.cs b/Octokit.Reactive/IObservableGitHubClient.cs
index be317491..63d070c0 100644
--- a/Octokit.Reactive/IObservableGitHubClient.cs
+++ b/Octokit.Reactive/IObservableGitHubClient.cs
@@ -16,6 +16,7 @@
         IObservableReleasesClient Release { get; }
         IObservableSshKeysClient SshKey { get; }
         IObservableUsersClient User { get; }
+        [System.Obsolete("The Notifications API belongs under the Activities client")]
         IObservableNotificationsClient Notification { get; }
         IObservableGitDatabaseClient GitDatabase { get; }
         IObservableSearchClient Search { get; }
diff --git a/Octokit/Clients/ActivitiesClient.cs b/Octokit/Clients/ActivitiesClient.cs
index 87e98e49..a921cf2e 100644
--- a/Octokit/Clients/ActivitiesClient.cs
+++ b/Octokit/Clients/ActivitiesClient.cs
@@ -19,6 +19,7 @@
             Starring = new StarredClient(apiConnection);
             Watching = new WatchedClient(apiConnection);
             Feeds = new FeedsClient(apiConnection);
+            Notifications = new NotificationsClient(apiConnection);
         }
 
         /// <summary>
@@ -37,5 +38,9 @@
         /// Client for the Feeds API
         /// </summary>
         public IFeedsClient Feeds { get; private set; }
+        /// <summary>
+        /// Client for the Notifications API
+        /// </summary>
+        public INotificationsClient Notifications { get; private set; }
     }
 }
diff --git a/Octokit/Clients/IActivitiesClient.cs b/Octokit/Clients/IActivitiesClient.cs
index b64f39a9..47a98769 100644
--- a/Octokit/Clients/IActivitiesClient.cs
+++ b/Octokit/Clients/IActivitiesClient.cs
@@ -27,5 +27,10 @@
         /// Client for the Feeds API
         /// </summary>
         IFeedsClient Feeds { get; }
+
+        /// <summary>
+        /// Client for the Notifications API
+        /// </summary>
+        INotificationsClient Notifications { get; }
     }
 }
\ No newline at end of file
diff --git a/Octokit/IGitHubClient.cs b/Octokit/IGitHubClient.cs
index 0c74bfeb..4a8b1c08 100644
--- a/Octokit/IGitHubClient.cs
+++ b/Octokit/IGitHubClient.cs
@@ -116,6 +116,7 @@
         /// <remarks>
         /// Refer to the API docmentation for more information: https://developer.github.com/v3/activity/notifications/
         /// </remarks>
+        [System.Obsolete("The Notifications API belongs under the Activities client")]
         INotificationsClient Notification { get; }
 
         /// <summary>
diff --git a/packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg b/packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..44e77b8a1bf70e64adce1c28d728e23c34469a73
GIT binary patch
literal 2624
zcmb_e32YQq7#@0PrCbJ55L!EqQ53o}v)g5NOLi9;p;T#WZ9$NRG_!Bs?hfo6&b;k`
zQH+96+DHJQv4B`&FltE}+JFjG%I(3SG!PC8f=BCt8VFh;=$qN2+odJdu$!68%=`cE
z|KEH6|9!7`c4E>{LjR%FDY*;A9?Q5kgdp@Ql}IPbRT$71TECN9#}SXcJ;pGNzx}rR
zQ|GiQF+f&8RTE^%MVV=qBB2CiUXXk)Du}!$2Q|&@EP(+IVGGSKC>n`fB+W(n5mKfy
zj0XHr<TP4VpoB-fvMO>2zp6e);lN_f2N?^?+8CToF9y{Ylblnnz}pZ-0jRPjdl3y}
zF${+D!f<AmVeO2_NrD$@h$823st+O;#gtZS2#RzOM07q*kCuX(0s%!n$-Af$JDcq>
zTUZWeTfA1AH-{pb!KCq@CdP;maXg1O2FNNjDJu3>kpQ)rBqPhBLA62vP#e&Pv9rJn
z><(yk*f}ehV)0lw=-_Q0nB(=>?N%$TXd(}k@cgE*4x2T{Yqnc#*;cE~Y|M}8vv=-d
zTsUKh1R}*KocnxvX-jd@JeWujX}ECuU%orlP_U$M_5pTOTk5S9Cu&m~y6IQQGpkl!
z%xyce<d5b9=zQKr>!YPV-+H0c{>}E?OH%mGJ$veVM%9;Z^KR*SRr)1s<L}PhStCX+
zTldpKdd<P6;Vn&+I+n<t>*p`#O}?<~hxH#W8rJmDS(<BjT0L^SeP?^)rSirvw~hn*
z$j?gF-mLL#8dm%G@gD26E#EoEvM<*>T=xF>%vCqq3-%I^<ehx(W?_E*=cgAm4tM++
zTr;%mW9i4M8J}D`EbQI6LHP%@Im)h`K6rHhrg?l)9ly5u>d^_4&fdSF{rTFCFE&5*
zZgQQ!o2wZi);ueuzm$_Vub{pqP&#ty^h>+GBF`0dRd?(dZTo)R<+^rq<kGIxg=wol
znC`c!3Dkxi@4R>D#eL(8(pP70zh1TL%Kr5wUHJ=^C-<Z!-`v<aCgY9Mum63f^V^a`
zmXk|1H)nuti7kbPTjvJLJP$B+llWOTTsh-sRFz*p_0XHIof_9Y?_6ic*Yvr3=EPga
zGB3|r@s}@`Yi*=NYuW{UJ9~NHe8>C|D-#Gpzn;O{dDjc=PL(itHqkqyINBH?I+@CY
zX#XogHDK@u4;UDLB9xHEm}xUZMQssO#a;@EbudPvmQ|V%g{`ctq${%xU`$A6W`1Eo
zsli<)LDCQ>0T{-QdJLA@2JCsalLu3Q3OOXJ?!pM2IhmNRx&;q4pbCo4u<ior<3KeT
z-nuL@t|du9BPF?#6eJJ`@{q?5B=SRYViY|}eiI`gv=J~ih#pkn@wy6L0jln}7>0Sw
zursU=ZVS!Q7S?WNY1YX^KI&KjPVxmY)4QQ$np<l4M?X0i!|F;|<u#pcu`Lo%0QMU)
zG@{#RLC+!xkh>^23nH>OBqQX^DkXqRM>X&xCQgHBd&|jSxR{n`ZMd==Gn{^n#w}6y
zge)OE@p4^pw1u=Te|JS94ZQy;jUbeh3F$duX`BJQTrhy}gmJ1NW!ANvBE!jt)RI$_
zfB+0lWhx{-PJm6}3eryjy}COY&)1NJenLdFa=;)mKoE;9-o}2sBT6)&_Z?D<lgen4
zjIpSAM~5Vsh~7Qzd)$dX)x;crLXHE;U94jcX3V%Q2%jC|gZJgwSd5e;;_fr<ZQ=XW
db8Pqt_Y(b8ck%4xdvvoT{CD9d_%%g;`xmEZdyD`8

literal 0
HcmV?d00001


From fe3976246cec17e5410cd29c50d16adb70377edc Mon Sep 17 00:00:00 2001
From: Mordechai Zuber <mez613@gmail.com>
Date: Mon, 21 Dec 2015 09:10:14 +0200
Subject: [PATCH 2/2] Fix Obsolete messages

also remove unwanted .nupkg
---
 Octokit.Reactive/IObservableGitHubClient.cs      |   2 +-
 Octokit/IGitHubClient.cs                         |   2 +-
 .../System.Net.Http.2.0.20710.0.nupkg            | Bin 2624 -> 0 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg

diff --git a/Octokit.Reactive/IObservableGitHubClient.cs b/Octokit.Reactive/IObservableGitHubClient.cs
index 63d070c0..4bb181cf 100644
--- a/Octokit.Reactive/IObservableGitHubClient.cs
+++ b/Octokit.Reactive/IObservableGitHubClient.cs
@@ -16,7 +16,7 @@
         IObservableReleasesClient Release { get; }
         IObservableSshKeysClient SshKey { get; }
         IObservableUsersClient User { get; }
-        [System.Obsolete("The Notifications API belongs under the Activities client")]
+        [System.Obsolete("Notifications are now available under the Activities client. This will be removed in a future update.")]
         IObservableNotificationsClient Notification { get; }
         IObservableGitDatabaseClient GitDatabase { get; }
         IObservableSearchClient Search { get; }
diff --git a/Octokit/IGitHubClient.cs b/Octokit/IGitHubClient.cs
index 4a8b1c08..07aae0a5 100644
--- a/Octokit/IGitHubClient.cs
+++ b/Octokit/IGitHubClient.cs
@@ -116,7 +116,7 @@
         /// <remarks>
         /// Refer to the API docmentation for more information: https://developer.github.com/v3/activity/notifications/
         /// </remarks>
-        [System.Obsolete("The Notifications API belongs under the Activities client")]
+        [System.Obsolete("Notifications are now available under the Activities client. This will be removed in a future update.")]
         INotificationsClient Notification { get; }
 
         /// <summary>
diff --git a/packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg b/packages/System.Net.Http.2.0.20710.0/System.Net.Http.2.0.20710.0.nupkg
deleted file mode 100644
index 44e77b8a1bf70e64adce1c28d728e23c34469a73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2624
zcmb_e32YQq7#@0PrCbJ55L!EqQ53o}v)g5NOLi9;p;T#WZ9$NRG_!Bs?hfo6&b;k`
zQH+96+DHJQv4B`&FltE}+JFjG%I(3SG!PC8f=BCt8VFh;=$qN2+odJdu$!68%=`cE
z|KEH6|9!7`c4E>{LjR%FDY*;A9?Q5kgdp@Ql}IPbRT$71TECN9#}SXcJ;pGNzx}rR
zQ|GiQF+f&8RTE^%MVV=qBB2CiUXXk)Du}!$2Q|&@EP(+IVGGSKC>n`fB+W(n5mKfy
zj0XHr<TP4VpoB-fvMO>2zp6e);lN_f2N?^?+8CToF9y{Ylblnnz}pZ-0jRPjdl3y}
zF${+D!f<AmVeO2_NrD$@h$823st+O;#gtZS2#RzOM07q*kCuX(0s%!n$-Af$JDcq>
zTUZWeTfA1AH-{pb!KCq@CdP;maXg1O2FNNjDJu3>kpQ)rBqPhBLA62vP#e&Pv9rJn
z><(yk*f}ehV)0lw=-_Q0nB(=>?N%$TXd(}k@cgE*4x2T{Yqnc#*;cE~Y|M}8vv=-d
zTsUKh1R}*KocnxvX-jd@JeWujX}ECuU%orlP_U$M_5pTOTk5S9Cu&m~y6IQQGpkl!
z%xyce<d5b9=zQKr>!YPV-+H0c{>}E?OH%mGJ$veVM%9;Z^KR*SRr)1s<L}PhStCX+
zTldpKdd<P6;Vn&+I+n<t>*p`#O}?<~hxH#W8rJmDS(<BjT0L^SeP?^)rSirvw~hn*
z$j?gF-mLL#8dm%G@gD26E#EoEvM<*>T=xF>%vCqq3-%I^<ehx(W?_E*=cgAm4tM++
zTr;%mW9i4M8J}D`EbQI6LHP%@Im)h`K6rHhrg?l)9ly5u>d^_4&fdSF{rTFCFE&5*
zZgQQ!o2wZi);ueuzm$_Vub{pqP&#ty^h>+GBF`0dRd?(dZTo)R<+^rq<kGIxg=wol
znC`c!3Dkxi@4R>D#eL(8(pP70zh1TL%Kr5wUHJ=^C-<Z!-`v<aCgY9Mum63f^V^a`
zmXk|1H)nuti7kbPTjvJLJP$B+llWOTTsh-sRFz*p_0XHIof_9Y?_6ic*Yvr3=EPga
zGB3|r@s}@`Yi*=NYuW{UJ9~NHe8>C|D-#Gpzn;O{dDjc=PL(itHqkqyINBH?I+@CY
zX#XogHDK@u4;UDLB9xHEm}xUZMQssO#a;@EbudPvmQ|V%g{`ctq${%xU`$A6W`1Eo
zsli<)LDCQ>0T{-QdJLA@2JCsalLu3Q3OOXJ?!pM2IhmNRx&;q4pbCo4u<ior<3KeT
z-nuL@t|du9BPF?#6eJJ`@{q?5B=SRYViY|}eiI`gv=J~ih#pkn@wy6L0jln}7>0Sw
zursU=ZVS!Q7S?WNY1YX^KI&KjPVxmY)4QQ$np<l4M?X0i!|F;|<u#pcu`Lo%0QMU)
zG@{#RLC+!xkh>^23nH>OBqQX^DkXqRM>X&xCQgHBd&|jSxR{n`ZMd==Gn{^n#w}6y
zge)OE@p4^pw1u=Te|JS94ZQy;jUbeh3F$duX`BJQTrhy}gmJ1NW!ANvBE!jt)RI$_
zfB+0lWhx{-PJm6}3eryjy}COY&)1NJenLdFa=;)mKoE;9-o}2sBT6)&_Z?D<lgen4
zjIpSAM~5Vsh~7Qzd)$dX)x;crLXHE;U94jcX3V%Q2%jC|gZJgwSd5e;;_fr<ZQ=XW
db8Pqt_Y(b8ck%4xdvvoT{CD9d_%%g;`xmEZdyD`8