Skip to content

Commit

Permalink
Merge branch 'master' into download-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
heytherewill committed Oct 15, 2015
2 parents 2f4eedc + 068511b commit 56b8174
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 8 deletions.
1 change: 1 addition & 0 deletions Octokit.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
</group>
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System" targetFramework="net45" />
<frameworkAssembly assemblyName="System.Net.Http" targetFramework="net45, netcore45" />
</frameworkAssemblies>
</metadata>
Expand Down
7 changes: 4 additions & 3 deletions Octokit/Exceptions/PrivateRepositoryQuotaExceededException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ public override string Message
get
{
// TODO: Would be nice to show the actual numbers, but that requires another request.
return "You are currently at your limit of private repositories. Either delete a private repository "
+ "you no longer use or upgrade your account to a plan that allows for more private repositories.";
return "You are currently at your limit of private repositories. Either delete a private repository you no "
+ "longer use (https://help.github.com/articles/deleting-a-repository/) or upgrade your account to a plan "
+ "that allows for more private repositories (https://help.github.com/articles/what-plan-should-i-choose/).";
}
}

Expand All @@ -52,4 +53,4 @@ protected PrivateRepositoryQuotaExceededException(SerializationInfo info, Stream
}
#endif
}
}
}
2 changes: 1 addition & 1 deletion Octokit/Models/Request/NewRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public NewRepository(string name)
/// <summary>
/// Optional. Gets or sets whether to enable issues for the new repository. The default is true.
/// </summary>
public bool HasIssues { get; set; }
public bool? HasIssues { get; set; }

/// <summary>
/// Optional. Gets or sets whether to enable the wiki for the new repository. The default is true.
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Octokit - GitHub API Client Library for .NET [![Build Status](https://ci.appveyor.com/api/projects/status/github/octokit/octokit.net?branch=master)](https://ci.appveyor.com/project/Haacked15676/octokit-net)

![logo](octokit-dotnet_2.png)


Octokit is a client library targeting .NET 4.5 and above that provides an easy
way to interact with the [GitHub API](http://developer.github.com/v3/).

Expand Down
8 changes: 4 additions & 4 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Target "Clean" (fun _ ->
)

open Fake.AssemblyInfoFile
open Fake.XUnit2Helper
open Fake.Testing

Target "AssemblyInfo" (fun _ ->
CreateCSharpAssemblyInfo "./SolutionInfo.cs"
Expand Down Expand Up @@ -88,22 +88,22 @@ Target "ConventionTests" (fun _ ->
!! (sprintf "./Octokit.Tests.Conventions/bin/%s/**/Octokit.Tests.Conventions.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir })
HtmlOutputPath = Some (testResultsDir @@ "xunit.html") })
)

Target "UnitTests" (fun _ ->
!! (sprintf "./Octokit.Tests/bin/%s/**/Octokit.Tests*.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir })
HtmlOutputPath = Some (testResultsDir @@ "xunit.html") })
)

Target "IntegrationTests" (fun _ ->
if hasBuildParam "OCTOKIT_GITHUBUSERNAME" && hasBuildParam "OCTOKIT_GITHUBPASSWORD" then
!! (sprintf "./Octokit.Tests.Integration/bin/%s/**/Octokit.Tests.Integration.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir
HtmlOutputPath = Some (testResultsDir @@ "xunit.html")
TimeOut = TimeSpan.FromMinutes 10.0 })
else
"The integration tests were skipped because the OCTOKIT_GITHUBUSERNAME and OCTOKIT_GITHUBPASSWORD environment variables are not set. " +
Expand Down
16 changes: 16 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
if test "$OS" = "Windows_NT"
then
# use .Net

"./tools/nuget/nuget.exe" "install" "xunit.runner.console" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.0.0"
"./tools/nuget/nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "4.4.2"
"./tools/nuget/nuget.exe" "install" "SourceLink.Fake" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "1.1.0"
packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
# use mono
mono "./tools/nuget/nuget.exe" "install" "xunit.runner.console" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.0.0"
mono "./tools/nuget/nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "4.4.2"
mono "./tools/nuget/nuget.exe" "install" "SourceLink.Fake" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "1.1.0"
mono ./tools/FAKE.Core/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
fi
Binary file added octokit-dotnet_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 56b8174

Please sign in to comment.