diff --git a/Octokit.Reactive/Clients/IObservableUsersClient.cs b/Octokit.Reactive/Clients/IObservableUsersClient.cs
index e5125ca3..1a32ecd8 100644
--- a/Octokit.Reactive/Clients/IObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/IObservableUsersClient.cs
@@ -44,15 +44,6 @@ namespace Octokit.Reactive
///
IObservableUserEmailsClient Email { get; }
- ///
- /// A client for GitHub's User Keys API
- ///
- ///
- /// See the Keys API documentation for more information.
- ///
- [Obsolete("Ssh key information is now available under the GitSshKey property. This will be removed in a future update.")]
- IObservableUserKeysClient Keys { get; }
-
///
/// A client for GitHub's User Keys API
///
diff --git a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
index cf6a5860..ca3bcd85 100644
--- a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
@@ -9,14 +9,6 @@ namespace Octokit.Reactive
{
readonly IMiscellaneousClient _client;
- [Obsolete("Please use the IGitHubClient overload constructor")]
- public ObservableMiscellaneousClient(IMiscellaneousClient client)
- {
- Ensure.ArgumentNotNull(client, "client");
-
- _client = client;
- }
-
public ObservableMiscellaneousClient(IGitHubClient client)
{
Ensure.ArgumentNotNull(client, "client");
diff --git a/Octokit.Reactive/Clients/ObservableUsersClient.cs b/Octokit.Reactive/Clients/ObservableUsersClient.cs
index 79c6c9de..6466a2bf 100644
--- a/Octokit.Reactive/Clients/ObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUsersClient.cs
@@ -16,9 +16,6 @@ namespace Octokit.Reactive
Followers = new ObservableFollowersClient(client);
Email = new ObservableUserEmailsClient(client);
-#pragma warning disable CS0618 // Type or member is obsolete
- Keys = new ObservableUserKeysClient(client);
-#pragma warning restore CS0618 // Type or member is obsolete
GitSshKey = new ObservableUserKeysClient(client);
GpgKey = new ObservableUserGpgKeysClient(client);
Administration = new ObservableUserAdministrationClient(client);
@@ -74,15 +71,6 @@ namespace Octokit.Reactive
///
public IObservableUserEmailsClient Email { get; private set; }
- ///
- /// A client for GitHub's User Keys API
- ///
- ///
- /// See the Keys API documentation for more information.
- ///
- [Obsolete("Ssh key information is now available under the GitSshKey property. This will be removed in a future update.")]
- public IObservableUserKeysClient Keys { get; private set; }
-
///
/// A client for GitHub's User Keys API
///
diff --git a/Octokit/Clients/IUsersClient.cs b/Octokit/Clients/IUsersClient.cs
index 73008554..41e5c4b7 100644
--- a/Octokit/Clients/IUsersClient.cs
+++ b/Octokit/Clients/IUsersClient.cs
@@ -20,15 +20,6 @@ namespace Octokit
///
IUserEmailsClient Email { get; }
- ///
- /// A client for GitHub's User Keys API
- ///
- ///
- /// See the Keys API documentation for more information.
- ///
- [Obsolete("Ssh key information is now available under the GitSshKey property. This will be removed in a future update.")]
- IUserKeysClient Keys { get; }
-
///
/// A client for GitHub's User Keys API
///
diff --git a/Octokit/Clients/UsersClient.cs b/Octokit/Clients/UsersClient.cs
index 3b12832b..fc07ea23 100644
--- a/Octokit/Clients/UsersClient.cs
+++ b/Octokit/Clients/UsersClient.cs
@@ -21,9 +21,6 @@ namespace Octokit
{
Email = new UserEmailsClient(apiConnection);
Followers = new FollowersClient(apiConnection);
-#pragma warning disable CS0618 // Type or member is obsolete
- Keys = new UserKeysClient(apiConnection);
-#pragma warning restore CS0618 // Type or member is obsolete
GitSshKey = new UserKeysClient(apiConnection);
GpgKey = new UserGpgKeysClient(apiConnection);
@@ -38,15 +35,6 @@ namespace Octokit
///
public IUserEmailsClient Email { get; private set; }
- ///
- /// A client for GitHub's User Keys API
- ///
- ///
- /// See the Keys API documentation for more information.
- ///
- [Obsolete("Ssh key information is now available under the GitSshKey property. This will be removed in a future update.")]
- public IUserKeysClient Keys { get; private set; }
-
///
/// A client for GitHub's User Keys API
///
diff --git a/Octokit/Helpers/ApiExtensions.cs b/Octokit/Helpers/ApiExtensions.cs
index b0afbd42..abfcafec 100644
--- a/Octokit/Helpers/ApiExtensions.cs
+++ b/Octokit/Helpers/ApiExtensions.cs
@@ -74,15 +74,6 @@ namespace Octokit
return connection.Get(uri, null, null);
}
- [Obsolete("Octokit's HTTP library now follows redirects by default - this API will be removed in a future release")]
- public static Task> GetRedirect(this IConnection connection, Uri uri)
- {
- Ensure.ArgumentNotNull(connection, "connection");
- Ensure.ArgumentNotNull(uri, "uri");
-
- return connection.Get(uri, null, null);
- }
-
///
/// Gets the API resource at the specified URI.
///
diff --git a/Octokit/Helpers/ApiUrls.cs b/Octokit/Helpers/ApiUrls.cs
index aa8a98fa..e119e364 100644
--- a/Octokit/Helpers/ApiUrls.cs
+++ b/Octokit/Helpers/ApiUrls.cs
@@ -1297,18 +1297,6 @@ namespace Octokit
return "repos/{0}/{1}/pulls/comments".FormatUri(owner, name);
}
- ///
- /// Returns the for a specific blob.
- ///
- /// The owner of the blob
- /// The name of the organization
- ///
- [Obsolete("This method is obsolete. Please use ApiUrls.Blobs(owner, name) instead.")]
- public static Uri Blob(string owner, string name)
- {
- return Blob(owner, name, "");
- }
-
///
/// Returns the for a specific blob.
///
diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
index 988d7f0d..0d609033 100644
--- a/Octokit/Http/ApiConnection.cs
+++ b/Octokit/Http/ApiConnection.cs
@@ -493,28 +493,6 @@ namespace Octokit
return Connection.Delete(uri, data, accepts);
}
- ///
- /// Executes a GET to the API object at the specified URI. This operation is appropriate for
- /// API calls which wants to return the redirect URL.
- /// It expects the API to respond with a 302 Found.
- ///
- /// URI of the API resource to get
- /// The URL returned by the API in the Location header
- /// Thrown when an API error occurs, or the API does not respond with a 302 Found
- [Obsolete("Octokit's HTTP library now follows redirects by default - this API will be removed in a future release")]
- public async Task GetRedirect(Uri uri)
- {
- Ensure.ArgumentNotNull(uri, "uri");
- var response = await Connection.GetRedirect(uri).ConfigureAwait(false);
-
- if (response.HttpResponse.StatusCode == HttpStatusCode.Redirect)
- {
- return response.HttpResponse.Headers["Location"];
- }
-
- throw new ApiException("Redirect Operation expect status code of Redirect.",
- response.HttpResponse.StatusCode);
- }
///
/// Executes a GET to the API object at the specified URI. This operation is appropriate for API calls which
diff --git a/Octokit/Http/IApiConnection.cs b/Octokit/Http/IApiConnection.cs
index 72c4f742..a7ff7505 100644
--- a/Octokit/Http/IApiConnection.cs
+++ b/Octokit/Http/IApiConnection.cs
@@ -320,17 +320,6 @@ namespace Octokit
/// The returned
Task Delete(Uri uri, object data, string accepts);
- ///
- /// Executes a GET to the API object at the specified URI. This operation is appropriate for
- /// API calls which wants to return the redirect URL.
- /// It expects the API to respond with a 302 Found.
- ///
- /// URI of the API resource to get
- /// The URL returned by the API in the Location header
- /// Thrown when an API error occurs, or the API does not respond with a 302 Found
- [Obsolete("Octokit's HTTP library now follows redirects by default - this API will be removed in a future release")]
- Task GetRedirect(Uri uri);
-
///
/// Executes a GET to the API object at the specified URI. This operation is appropriate for API calls which
/// queue long running calculations and return a collection of a resource.
diff --git a/Octokit/Models/Request/SearchIssuesRequest.cs b/Octokit/Models/Request/SearchIssuesRequest.cs
index a1392aed..e615f334 100644
--- a/Octokit/Models/Request/SearchIssuesRequest.cs
+++ b/Octokit/Models/Request/SearchIssuesRequest.cs
@@ -435,9 +435,6 @@ namespace Octokit
public enum IssueTypeQualifier
{
- [Obsolete("Use IssueTypeQualifier.PullRequest instead")]
- [Parameter(Value = "pr")]
- PR,
[Parameter(Value = "pr")]
PullRequest,
[Parameter(Value = "issue")]
diff --git a/Octokit/Models/Request/SearchRepositoriesRequest.cs b/Octokit/Models/Request/SearchRepositoriesRequest.cs
index 3c2990e7..8a08c357 100644
--- a/Octokit/Models/Request/SearchRepositoriesRequest.cs
+++ b/Octokit/Models/Request/SearchRepositoriesRequest.cs
@@ -482,10 +482,6 @@ namespace Octokit
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Elixir")]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Elixir")]
Elixir,
- [Obsolete("This item is incorrect and will be removed in a future update. Use Elixir instead.")]
- [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Elixer")]
- [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Elixer")]
- Elixer,
Elm,
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Emacs")]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Emacs")]
@@ -716,10 +712,6 @@ namespace Octokit
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Parallel")]
[Parameter(Value = "Unified Parallel C")]
UnifiedParallelC,
- [Obsolete("This item is incorrect and will be removed in a future update. Use UnifiedParallelC instead.")]
- [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Paralel")]
- [Parameter(Value = "Unified Paralel C")]
- UnifiedParalelC,
Unknown,
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Vala")]
Vala,
diff --git a/Octokit/Models/Response/CompareResult.cs b/Octokit/Models/Response/CompareResult.cs
index bd47b7ce..895bbd35 100644
--- a/Octokit/Models/Response/CompareResult.cs
+++ b/Octokit/Models/Response/CompareResult.cs
@@ -33,8 +33,6 @@ namespace Octokit
public string DiffUrl { get; protected set; }
public string PatchUrl { get; protected set; }
public GitHubCommit BaseCommit { get; protected set; }
- [Obsolete("This property is obsolete. Use MergeBaseCommit instead.", false)]
- public GitHubCommit MergedBaseCommit { get; protected set; }
public GitHubCommit MergeBaseCommit { get; protected set; }
public string Status { get; protected set; }
public int AheadBy { get; protected set; }