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

Commit 9e0e2f6

Browse files
grokysgrokys
authored
Merge branch 'master' into fixes/vs-language-pack
2 parents 6ae5aa5 + 3f90793 commit 9e0e2f6

File tree

26 files changed

+63
-337
lines changed

26 files changed

+63
-337
lines changed

‎src/GitHub.App/Services/RepositoryCloneService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
6666

6767
var affiliation = new RepositoryAffiliation?[]
6868
{
69-
RepositoryAffiliation.Owner
69+
RepositoryAffiliation.Owner, RepositoryAffiliation.Collaborator
7070
};
7171

7272
var repositorySelection = new Fragment<Repository, RepositoryListItemModel>(
@@ -84,6 +84,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
8484
.Viewer
8585
.Select(viewer => new ViewerRepositoriesModel
8686
{
87+
Owner = viewer.Login,
8788
Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null)
8889
.AllPages()
8990
.Select(repositorySelection).ToList(),

‎src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,16 @@ public async Task Activate()
111111
var results = await service.ReadViewerRepositories(connection.HostAddress).ConfigureAwait(true);
112112

113113
var yourRepositories = results.Repositories
114+
.Where(r => r.Owner == results.Owner)
114115
.Select(x => new RepositoryItemViewModel(x, "Your repositories"));
116+
var collaboratorRepositories = results.Repositories
117+
.Where(r => r.Owner != results.Owner)
118+
.OrderBy(r => r.Owner)
119+
.Select(x => new RepositoryItemViewModel(x, "Collaborator repositories"));
115120
var orgRepositories = results.OrganizationRepositories
116121
.OrderBy(x => x.Key)
117122
.SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, x.Key)));
118-
Items = yourRepositories.Concat(orgRepositories).ToList();
123+
Items = yourRepositories.Concat(collaboratorRepositories).Concat(orgRepositories).ToList();
119124
ItemsView = CollectionViewSource.GetDefaultView(Items);
120125
ItemsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(RepositoryItemViewModel.Group)));
121126
ItemsView.Filter = FilterItem;
@@ -149,7 +154,7 @@ bool FilterItem(object obj)
149154

150155
IRepositoryModel CreateRepository(IRepositoryItemViewModel item)
151156
{
152-
return item != null ?
157+
return item != null ?
153158
new RepositoryModel(item.Name, UriString.ToUriString(item.Url)) :
154159
null;
155160
}

‎src/GitHub.Exports/Models/ViewerRepositoriesModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace GitHub.Models
55
{
66
public class ViewerRepositoriesModel
77
{
8+
public string Owner { get; set; }
89
public IReadOnlyList<RepositoryListItemModel> Repositories { get; set; }
910
public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> OrganizationRepositories { get; set; }
1011
}

‎src/GitHub.Extensions/GitHub.Extensions.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<None Include="packages.config" />
2928
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj" />
3029
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj" />
3130
</ItemGroup>

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" />
34
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
4-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" />
55
<PropertyGroup>
66
<!-- This is added to prevent forced migrations in Visual Studio 2012 and newer -->
77
<MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' != ''">$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -488,11 +488,15 @@
488488
<PropertyGroup>
489489
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
490490
</PropertyGroup>
491-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props'))" />
492-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets'))" />
493491
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
492+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
493+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
494+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props'))" />
495+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets'))" />
494496
</Target>
495-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" />
497+
<Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
498+
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
499+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" />
496500
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
497501
Other similar extension points exist, see Microsoft.Common.targets.
498502
<Target Name="BeforeBuild">

‎src/GitHub.InlineReviews/packages.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.25407" targetFramework="net461" />
1212
<package id="Microsoft.VisualStudio.Language.Intellisense" version="14.3.25407" targetFramework="net461" />
1313
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
14+
<package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.8.33" targetFramework="net461" />
1415
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net452" />
1516
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net452" />
1617
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net452" />
@@ -30,9 +31,10 @@
3031
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" />
3132
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" />
3233
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
34+
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.8.122" targetFramework="net461" />
3335
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" />
3436
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
35-
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
37+
<package id="Microsoft.VSSDK.BuildTools" version="15.8.3252" targetFramework="net461" developmentDependency="true" />
3638
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
3739
<package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
3840
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />

‎src/GitHub.Resources/Resources.zh-CN.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@
779779
<value>删除注释</value>
780780
</data>
781781
<data name="Retry" xml:space="preserve">
782-
<value>Retry</value>
782+
<value>重试</value>
783783
</data>
784784
<data name="ThereArenTAnyOpenPullRequests" xml:space="preserve">
785785
<value>这里没有任何打开的推送请求</value>

‎src/GitHub.StartPage/GitHub.StartPage.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
4-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="'$(VisualStudioVersion)' == '15.0' And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
3+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" />
54
<PropertyGroup>
65
<!-- This is added to prevent forced migrations in Visual Studio 2012 and newer -->
76
<MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' != ''">$(VisualStudioVersion)</MinimumVisualStudioVersion>
87
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
98
<UseCodeBase>true</UseCodeBase>
9+
<NuGetPackageImportStamp>
10+
</NuGetPackageImportStamp>
1011
</PropertyGroup>
1112
<Import Project="$(SolutionDir)\src\common\signing.props" />
1213
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -192,17 +193,18 @@
192193
</ItemGroup>
193194
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
194195
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
196+
<Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
195197
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
196198
<PropertyGroup>
197199
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
198200
</PropertyGroup>
199-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
200-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
201-
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
202-
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
201+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
202+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
203+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.props'))" />
204+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets'))" />
203205
</Target>
204-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="'$(VisualStudioVersion)' == '15.0' And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
205-
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
206+
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
207+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" />
206208
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
207209
Other similar extension points exist, see Microsoft.Common.targets.
208210
<Target Name="BeforeBuild">

‎src/GitHub.StartPage/packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Microsoft.VisualStudio.CoreUtility" version="15.0.25901-RC" targetFramework="net452" />
44
<package id="Microsoft.VisualStudio.Imaging" version="15.0.25901-RC" targetFramework="net452" />
55
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
6-
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.215" targetFramework="net461" developmentDependency="true" />
6+
<package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.8.33" targetFramework="net461" />
77
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.25901-RC" targetFramework="net452" />
88
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.25901-RC" targetFramework="net452" />
99
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
@@ -15,9 +15,10 @@
1515
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" />
1616
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" />
1717
<package id="Microsoft.VisualStudio.Threading" version="15.0.20-pre" targetFramework="net452" />
18+
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.8.122" targetFramework="net461" />
1819
<package id="Microsoft.VisualStudio.Utilities" version="15.0.25901-RC" targetFramework="net452" />
1920
<package id="Microsoft.VisualStudio.Validation" version="15.0.11-pre" targetFramework="net452" />
20-
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net461" developmentDependency="true" />
21+
<package id="Microsoft.VSSDK.BuildTools" version="15.8.3252" targetFramework="net461" developmentDependency="true" />
2122
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />
2223
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net461" />
2324
<package id="Serilog" version="2.5.0" targetFramework="net461" />

‎src/GitHub.TeamFoundation.14/Services/VSGitExt.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using Microsoft.VisualStudio.Threading;
1313
using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
1414
using Task = System.Threading.Tasks.Task;
15-
using static Microsoft.VisualStudio.VSConstants;
1615

1716
namespace GitHub.VisualStudio.Base
1817
{
@@ -52,9 +51,15 @@ public VSGitExt(IAsyncServiceProvider asyncServiceProvider, IVSUIContextFactory
5251
// Start with empty array until we have a chance to initialize.
5352
ActiveRepositories = Array.Empty<ILocalRepositoryModel>();
5453

55-
// Initialize when we enter the context of a Git repository
56-
var context = factory.GetUIContext(UICONTEXT.RepositoryOpen_guid);
57-
context.WhenActivated(() => JoinableTaskFactory.RunAsync(InitializeAsync).Task.Forget(log));
54+
// The IGitExt service isn't available when a TFS based solution is opened directly.
55+
// It will become available when moving to a Git based solution (and cause a UIContext event to fire).
56+
// NOTE: I tried using the RepositoryOpen context, but it didn't work consistently.
57+
var context = factory.GetUIContext(new Guid(Guids.GitSccProviderId));
58+
context.WhenActivated(() =>
59+
{
60+
log.Debug("WhenActivated");
61+
JoinableTaskFactory.RunAsync(InitializeAsync).Task.Forget(log);
62+
});
5863
}
5964

6065
async Task InitializeAsync()

0 commit comments

Comments
 (0)