diff --git a/Octokit.Tests.Integration/Clients/SearchClientTests.cs b/Octokit.Tests.Integration/Clients/SearchClientTests.cs index c4f6042d..3f4600e0 100644 --- a/Octokit.Tests.Integration/Clients/SearchClientTests.cs +++ b/Octokit.Tests.Integration/Clients/SearchClientTests.cs @@ -46,9 +46,10 @@ public class SearchClientTests [Fact] public async Task SearchForFileNameInCode() { - var request = new SearchCodeRequest("swag") + var request = new SearchCodeRequest("GitHub") { - FileName = "readme.md" + FileName = "readme.md", + Repos = new RepositoryCollection { "octokit/octokit.net" } }; var repos = await _gitHubClient.Search.SearchCode(request); diff --git a/Octokit/Http/RateLimit.cs b/Octokit/Http/RateLimit.cs index e44a8727..d2e93eda 100644 --- a/Octokit/Http/RateLimit.cs +++ b/Octokit/Http/RateLimit.cs @@ -26,7 +26,7 @@ namespace Octokit Limit = (int) GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Limit"); Remaining = (int) GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Remaining"); - Reset = GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Reset").FromUnixTime(); + ResetAsUtcEpochSeconds = GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Reset"); } public RateLimit(int limit, int remaining, long reset) @@ -37,7 +37,7 @@ namespace Octokit Limit = limit; Remaining = remaining; - Reset = reset.FromUnixTime(); + ResetAsUtcEpochSeconds = reset; } /// @@ -54,14 +54,14 @@ namespace Octokit /// The date and time at which the current rate limit window resets /// [Parameter(Key = "ignoreThisField")] - public DateTimeOffset Reset { get; private set; } + public DateTimeOffset Reset { get { return ResetAsUtcEpochSeconds.FromUnixTime(); } } /// /// The date and time at which the current rate limit window resets - in UTC epoch seconds /// [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [Parameter(Key = "reset")] - public long ResetAsUtcEpochSeconds { get { return Reset.ToUnixTime(); } } + public long ResetAsUtcEpochSeconds { get; private set; } static long GetHeaderValueAsInt32Safe(IDictionary responseHeaders, string key) { @@ -79,7 +79,7 @@ namespace Octokit Limit = info.GetInt32("Limit"); Remaining = info.GetInt32("Remaining"); - Reset = new DateTimeOffset(info.GetInt64("Reset"), TimeSpan.Zero); + ResetAsUtcEpochSeconds = info.GetInt64("ResetAsUtcEpochSeconds"); } public virtual void GetObjectData(SerializationInfo info, StreamingContext context) @@ -88,7 +88,7 @@ namespace Octokit info.AddValue("Limit", Limit); info.AddValue("Remaining", Remaining); - info.AddValue("Reset", Reset.Ticks); + info.AddValue("ResetAsUtcEpochSeconds", ResetAsUtcEpochSeconds); } #endif @@ -110,7 +110,7 @@ namespace Octokit { Limit = this.Limit, Remaining = this.Remaining, - Reset = this.Reset + ResetAsUtcEpochSeconds = this.ResetAsUtcEpochSeconds }; } diff --git a/Octokit/Models/Response/GitHubCommitFile.cs b/Octokit/Models/Response/GitHubCommitFile.cs index 65bde71e..e29f4db9 100644 --- a/Octokit/Models/Response/GitHubCommitFile.cs +++ b/Octokit/Models/Response/GitHubCommitFile.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; +using Octokit.Internal; namespace Octokit { @@ -83,6 +84,7 @@ namespace Octokit /// /// The previous filename for a renamed file. /// + [Parameter(Key = "previous_filename")] public string PreviousFileName { get; protected set; } internal string DebuggerDisplay