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

Commit fb726dd

Browse files
author
Meaghan Lewis
authored
Merge branch 'master' into fixes/1305-better-failures
2 parents de9f992 + 5e27021 commit fb726dd

File tree

81 files changed

+1103
-233
lines changed

Some content is hidden

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

81 files changed

+1103
-233
lines changed

‎ISSUE_TEMPLATE.md‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
Hello! Please read the contributing guidelines before submitting an issue regarding the GitHub Extension for Visual Studio.
1+
<!-- Hello! Please read the [contributing guidelines](https://github.com/github/VisualStudio/blob/master/CONTRIBUTING.md) before submitting an issue regarding the GitHub Extension for Visual Studio. -->
2+
3+
## Version
24

35
- GitHub Extension for Visual Studio version:
46
- Visual Studio version:
57

6-
__What happened__ (with steps, logs and screenshots, if possible)
8+
## What happened
9+
10+
**Steps to Reproduce**
11+
12+
1. [First Step]
13+
2. [Second Step]
14+
3. [and so on...]
15+
16+
**Expected behavior:** [What you expect to happen]
17+
18+
**Actual behavior:** [What actually happens]
19+
20+
**Screenshot or GIF:**
21+
22+
**Log file:**
23+
24+
<!-- Include the log file. Logs can be found at: `%LOCALAPPDATA%\GitHubVisualStudio\extension.log` -->

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ To build and install a `Release` configuration VSIX:
8585
build.cmd Release
8686
install.cmd Release
8787
```
88+
## Logs
89+
Logs can be viewed at the following location:
90+
91+
`%LOCALAPPDATA%\GitHubVisualStudio\extension.log`
8892

8993
## More information
9094
- Andreia Gaita's [presentation](https://www.youtube.com/watch?v=hz2hCO8e_8w) at Codemania 2016 about this extension.

‎lib/Octokit.GraphQL.0.1.1-beta.nupkg‎

194 KB
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5151
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Octokit.GraphQL, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
53+
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
54+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Octokit.GraphQL.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
56+
<Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6060
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>

‎src/GitHub.Api/GraphQLKeychainCredentialStore.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading;
23
using System.Threading.Tasks;
34
using GitHub.Extensions;
45
using GitHub.Primitives;
@@ -23,7 +24,7 @@ public GraphQLKeychainCredentialStore(IKeychain keychain, HostAddress address)
2324
this.address = address;
2425
}
2526

26-
public async Task<string> GetCredentials()
27+
public async Task<string> GetCredentials(CancellationToken cancellationToken = default)
2728
{
2829
var userPass = await keychain.Load(address).ConfigureAwait(false);
2930
return userPass?.Item2;

‎src/GitHub.Api/ILoginManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Task<User> LoginWithToken(
7272
/// Logs out of GitHub server.
7373
/// </summary>
7474
/// <param name="hostAddress">The address of the server.</param>
75+
/// <param name="client">An octokit client configured to access the server.</param>
7576
Task Logout(HostAddress hostAddress, IGitHubClient client);
7677
}
7778
}

‎src/GitHub.Api/LoginManager.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ public class LoginManager : ILoginManager
3434
/// </summary>
3535
/// <param name="keychain">The keychain in which to store credentials.</param>
3636
/// <param name="twoFactorChallengeHandler">The handler for 2FA challenges.</param>
37+
/// <param name="oauthListener">The callback listener to signal successful login.</param>
3738
/// <param name="clientId">The application's client API ID.</param>
3839
/// <param name="clientSecret">The application's client API secret.</param>
40+
/// <param name="scopes">List of scopes to authenticate for</param>
3941
/// <param name="authorizationNote">An note to store with the authorization.</param>
4042
/// <param name="fingerprint">The machine fingerprint.</param>
4143
public LoginManager(

‎src/GitHub.Api/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
4-
<package id="Octokit.GraphQL" version="0.1.0-beta" targetFramework="net461" />
4+
<package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
55
<package id="Serilog" version="2.5.0" targetFramework="net461" />
66
</packages>

‎src/GitHub.App/Extensions/AkavacheExtensions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,12 @@ static IObservable<T> GetAndFetchLatestFromIndex<T>(this IBlobCache This,
252252
/// <typeparam name="T"></typeparam>
253253
/// <param name="blobCache">The cache to retrieve the object from.</param>
254254
/// <param name="key">The key to look up the cache value with.</param>
255-
/// <param name="item">The item to add to the database</param>
255+
/// <param name="fetchFunc">The fetch function.</param>
256256
/// <param name="maxCacheDuration">
257257
/// The maximum age of a cache object before the object is treated as
258258
/// expired and unusable. Cache objects older than this will be treated
259259
/// as a cache miss.
260+
/// </param>
260261
/// <returns></returns>
261262
public static IObservable<T> PutAndUpdateIndex<T>(this IBlobCache blobCache,
262263
string key,

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
145145
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
146146
</Reference>
147-
<Reference Include="Octokit.GraphQL, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
148-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
147+
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
149149
</Reference>
150-
<Reference Include="Octokit.GraphQL.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
151-
<HintPath>..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
150+
<Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
151+
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
152152
</Reference>
153153
<Reference Include="PresentationCore" />
154154
<Reference Include="PresentationFramework" />
@@ -197,6 +197,7 @@
197197
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
198198
</Reference>
199199
<Reference Include="System.Web" />
200+
<Reference Include="System.Windows.Forms" />
200201
<Reference Include="System.Xaml" />
201202
<Reference Include="System.Xml.Linq" />
202203
<Reference Include="System.Data.DataSetExtensions" />
@@ -228,6 +229,7 @@
228229
<Compile Include="SampleData\PullRequestUserReviewsViewModelDesigner.cs" />
229230
<Compile Include="SampleData\UserFilterViewModelDesigner.cs" />
230231
<Compile Include="Services\EnterpriseCapabilitiesService.cs" />
232+
<Compile Include="Services\FromGraphQlExtensions.cs" />
231233
<Compile Include="Services\GitHubContextService.cs" />
232234
<Compile Include="Services\GlobalConnection.cs" />
233235
<Compile Include="Services\RepositoryForkService.cs" />
@@ -259,6 +261,7 @@
259261
<Compile Include="ViewModels\GitHubPane\GitHubPaneViewModel.cs" />
260262
<Compile Include="SampleData\PullRequestCheckViewModelDesigner.cs" />
261263
<Compile Include="ViewModels\GitHubPane\LoginFailedViewModel.cs" />
264+
<Compile Include="ViewModels\GitHubPane\PullRequestCheckType.cs" />
262265
<Compile Include="ViewModels\GitHubPane\PullRequestFilesViewModel.cs" />
263266
<Compile Include="ViewModels\GitHubPane\PullRequestListItemViewModel.cs" />
264267
<Compile Include="ViewModels\GitHubPane\PullRequestListViewModel.cs" />

0 commit comments

Comments
 (0)