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

Commit d2f5350

Browse files
authored
Merge branch 'master' into fixes/1364-diff-moved-files
2 parents 845ec37 + bef85ec commit d2f5350

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/GitHub.App/ViewModels/GitHubPane/PullRequestListViewModel.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ public PullRequestListViewModel(
8888
.Where(x => PullRequests != null)
8989
.Subscribe(f => UpdateFilter(SelectedState, SelectedAssignee, SelectedAuthor, f));
9090

91+
this.WhenAnyValue(x => x.SelectedRepository)
92+
.Skip(1)
93+
.Subscribe(_ => ResetAndLoad());
94+
9195
OpenPullRequest = ReactiveCommand.Create();
9296
OpenPullRequest.Subscribe(DoOpenPullRequest);
9397
CreatePullRequest = ReactiveCommand.Create();
@@ -117,9 +121,9 @@ public async Task InitializeAsync(ILocalRepositoryModel repository, IConnection
117121
new[] { remoteRepository.Parent, remoteRepository } :
118122
new[] { remoteRepository };
119123
SelectedState = States.FirstOrDefault(x => x.Name == listSettings.SelectedState) ?? States[0];
124+
125+
// Setting SelectedRepository will cause a Load().
120126
SelectedRepository = Repositories[0];
121-
WebUrl = repository.CloneUrl?.ToRepositoryUrl().Append("pulls");
122-
await Load();
123127
}
124128
finally
125129
{
@@ -321,6 +325,7 @@ void CreatePullRequests()
321325

322326
void ResetAndLoad()
323327
{
328+
WebUrl = SelectedRepository.CloneUrl?.ToRepositoryUrl().Append("pulls");
324329
CreatePullRequests();
325330
UpdateFilter(SelectedState, SelectedAssignee, SelectedAuthor, SearchQuery);
326331
Load().Forget();

src/GitHub.VisualStudio/source.extension.vsixmanifest

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
</Metadata>
1414
<Installation AllUsers="true" Experimental="false">
1515
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0]" />
16+
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
1617
</Installation>
1718
<Dependencies>
1819
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
1920
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0,]" />
21+
<Dependency Id="Microsoft.VisualStudio.TeamFoundation.TeamExplorer.Extensions" DisplayName="Team Explorer" d:Source="Installed" Version="[14.0,16.0)" />
2022
</Dependencies>
2123
<Assets>
2224
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />

0 commit comments

Comments
 (0)