Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 2c7f51c

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into fixes/1617-spell-checking
2 parents ef9b30f + 1d801fb commit 2c7f51c

File tree

273 files changed

+8281
-4353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+8281
-4353
lines changed

‎GitHubVS.sln‎

Lines changed: 109 additions & 41 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Beta releases will have `(beta)` in their title in the gallery, following the ve
3535

3636
## Build requirements
3737

38-
* Visual Studio 2015+
38+
* Visual Studio 2017 (15.7.4)+
3939
* Visual Studio SDK
4040

4141
## Build
@@ -50,13 +50,13 @@ git submodule deinit script
5050
git submodule update
5151
```
5252

53-
Open the `GitHubVS.sln` solution with Visual Studio 2015+.
53+
Open the `GitHubVS.sln` solution with Visual Studio 2017+.
5454
To be able to use the GitHub API, you'll need to:
5555

5656
- [Register a new developer application](https://github.com/settings/developers) in your profile.
5757
- Open [src/GitHub.Api/ApiClientConfiguration_User.cs](src/GitHub.Api/ApiClientConfiguration_User.cs) and fill out the clientId/clientSecret fields for your application. **Note this has recently changed location, so you may need to re-do this**
5858

59-
Build using Visual Studio 2015 or:
59+
Build using Visual Studio 2017 or:
6060

6161
```txt
6262
build.cmd
@@ -95,7 +95,7 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
9595

9696
## Copyright
9797

98-
Copyright 2015 - 2017 GitHub, Inc.
98+
Copyright 2015 - 2018 GitHub, Inc.
9999

100100
Licensed under the [MIT License](LICENSE.md)
101101

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
os: Visual Studio 2017
12
version: '2.5.4.{build}'
23
skip_tags: true
34
install:

‎lib/Octokit.GraphQL.0.0.2-alpha.nupkg‎

-161 KB
Binary file not shown.

‎lib/Octokit.GraphQL.0.0.4-alpha.nupkg‎

176 KB
Binary file not shown.

‎lib/Octokit.GraphQL.0.0.5-alpha.nupkg‎

176 KB
Binary file not shown.

‎scripts/modules.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ New-Module -ScriptBlock {
9999

100100
New-Module -ScriptBlock {
101101
function Find-MSBuild() {
102-
if (Test-Path "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe") {
103-
$msbuild = "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"
102+
if (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\MSBuild.exe") {
103+
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\MSBuild.exe"
104104
}
105105
elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe") {
106106
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"

‎scripts/test.ps1‎

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,64 @@ if (!$?) {
3737
$exitcode = 1
3838
}
3939

40-
Write-Output "Running GitHub.UI.UnitTests..."
41-
Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
40+
Write-Output "Running GitHub.Api.UnitTests..."
41+
Run-NUnit test GitHub.Api.UnitTests $TimeoutDuration $config
4242
if (!$?) {
4343
$exitcode = 2
4444
}
4545

46-
Write-Output "Running UnitTests..."
47-
Run-NUnit test UnitTests $TimeoutDuration $config
46+
Write-Output "Running GitHub.App.UnitTests..."
47+
Run-NUnit test GitHub.App.UnitTests $TimeoutDuration $config
4848
if (!$?) {
4949
$exitcode = 3
5050
}
5151

52+
Write-Output "Running GitHub.Exports.Reactive.UnitTests..."
53+
Run-NUnit test GitHub.Exports.Reactive.UnitTests $TimeoutDuration $config
54+
if (!$?) {
55+
$exitcode = 4
56+
}
57+
58+
Write-Output "Running GitHub.Exports.UnitTests..."
59+
Run-NUnit test GitHub.Exports.UnitTests $TimeoutDuration $config
60+
if (!$?) {
61+
$exitcode = 5
62+
}
63+
64+
Write-Output "Running GitHub.Extensions.UnitTests..."
65+
Run-NUnit test GitHub.Extensions.UnitTests $TimeoutDuration $config
66+
if (!$?) {
67+
$exitcode = 6
68+
}
69+
70+
Write-Output "Running GitHub.Primitives.UnitTests..."
71+
Run-NUnit test GitHub.Primitives.UnitTests $TimeoutDuration $config
72+
if (!$?) {
73+
$exitcode = 7
74+
}
75+
76+
Write-Output "Running GitHub.TeamFoundation.UnitTests..."
77+
Run-NUnit test GitHub.TeamFoundation.UnitTests $TimeoutDuration $config
78+
if (!$?) {
79+
$exitcode = 8
80+
}
81+
82+
Write-Output "Running GitHub.UI.UnitTests..."
83+
Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
84+
if (!$?) {
85+
$exitcode = 9
86+
}
87+
88+
Write-Output "Running GitHub.VisualStudio.UnitTests..."
89+
Run-NUnit test GitHub.VisualStudio.UnitTests $TimeoutDuration $config
90+
if (!$?) {
91+
$exitcode = 10
92+
}
93+
5294
Write-Output "Running GitHub.InlineReviews.UnitTests..."
5395
Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config
5496
if (!$?) {
55-
$exitcode = 4
97+
$exitcode = 11
5698
}
5799

58100
if ($exitcode -ne 0) {

‎src/CredentialManagement/CredentialManagement.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>CredentialManagement</RootNamespace>
1111
<AssemblyName>GitHub.CredentialManagement</AssemblyName>
12-
<LangVersion>6</LangVersion>
12+
<LangVersion>7.3</LangVersion>
1313
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>GitHub.Api</RootNamespace>
1111
<AssemblyName>GitHub.Api</AssemblyName>
12-
<LangVersion>6</LangVersion>
12+
<LangVersion>7.3</LangVersion>
1313
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
@@ -51,13 +51,11 @@
5151
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="Octokit.GraphQL, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
56-
<Private>True</Private>
54+
<Reference Include="Octokit.GraphQL, Version=0.0.5.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Octokit.GraphQL.0.0.5-alpha\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
5756
</Reference>
58-
<Reference Include="Octokit.GraphQL.Core, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
60-
<Private>True</Private>
57+
<Reference Include="Octokit.GraphQL.Core, Version=0.0.5.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
58+
<HintPath>..\..\packages\Octokit.GraphQL.0.0.5-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
6159
</Reference>
6260
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6361
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>

0 commit comments

Comments
 (0)