diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs index 7998e7341..8ef95e021 100644 --- a/src/GitHub.App/Services/RepositoryCloneService.cs +++ b/src/GitHub.App/Services/RepositoryCloneService.cs @@ -66,7 +66,7 @@ namespace GitHub.Services var affiliation = new RepositoryAffiliation?[] { - RepositoryAffiliation.Owner + RepositoryAffiliation.Owner, RepositoryAffiliation.Collaborator }; var repositorySelection = new Fragment( @@ -84,6 +84,7 @@ namespace GitHub.Services .Viewer .Select(viewer => new ViewerRepositoriesModel { + Owner = viewer.Login, Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null) .AllPages() .Select(repositorySelection).ToList(), diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs index 87fae2b1d..e48a0b982 100644 --- a/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs +++ b/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs @@ -111,11 +111,16 @@ namespace GitHub.ViewModels.Dialog.Clone var results = await service.ReadViewerRepositories(connection.HostAddress).ConfigureAwait(true); var yourRepositories = results.Repositories + .Where(r => r.Owner == results.Owner) .Select(x => new RepositoryItemViewModel(x, "Your repositories")); + var collaboratorRepositories = results.Repositories + .Where(r => r.Owner != results.Owner) + .OrderBy(r => r.Owner) + .Select(x => new RepositoryItemViewModel(x, "Collaborator repositories")); var orgRepositories = results.OrganizationRepositories .OrderBy(x => x.Key) .SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, x.Key))); - Items = yourRepositories.Concat(orgRepositories).ToList(); + Items = yourRepositories.Concat(collaboratorRepositories).Concat(orgRepositories).ToList(); ItemsView = CollectionViewSource.GetDefaultView(Items); ItemsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(RepositoryItemViewModel.Group))); ItemsView.Filter = FilterItem; @@ -149,7 +154,7 @@ namespace GitHub.ViewModels.Dialog.Clone IRepositoryModel CreateRepository(IRepositoryItemViewModel item) { - return item != null ? + return item != null ? new RepositoryModel(item.Name, UriString.ToUriString(item.Url)) : null; } diff --git a/src/GitHub.Exports/Models/ViewerRepositoriesModel.cs b/src/GitHub.Exports/Models/ViewerRepositoriesModel.cs index ce84c2a55..27cba30bd 100644 --- a/src/GitHub.Exports/Models/ViewerRepositoriesModel.cs +++ b/src/GitHub.Exports/Models/ViewerRepositoriesModel.cs @@ -5,6 +5,7 @@ namespace GitHub.Models { public class ViewerRepositoriesModel { + public string Owner { get; set; } public IReadOnlyList Repositories { get; set; } public IDictionary> OrganizationRepositories { get; set; } } diff --git a/src/GitHub.Extensions/GitHub.Extensions.csproj b/src/GitHub.Extensions/GitHub.Extensions.csproj index 15f475fd1..8f61d95b9 100644 --- a/src/GitHub.Extensions/GitHub.Extensions.csproj +++ b/src/GitHub.Extensions/GitHub.Extensions.csproj @@ -25,7 +25,6 @@ - diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index 1e0c3a3f7..65e7fb038 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -1,7 +1,7 @@  + - $(VisualStudioVersion) @@ -488,11 +488,15 @@ 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}. - - + + + + - + + + $(VisualStudioVersion) $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true + + @@ -192,17 +193,18 @@ + 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}. - - - - + + + + - - + + - - - 14.0 - - - $(MSBuildToolsVersion) @@ -862,13 +856,14 @@ 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}. - - - - + + + + - - + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config index 25b3a34c7..0cd0fc1af 100644 --- a/src/GitHub.VisualStudio/packages.config +++ b/src/GitHub.VisualStudio/packages.config @@ -13,7 +13,7 @@ - + @@ -32,9 +32,10 @@ + - + diff --git a/test/GitHub.Api.UnitTests/packages.config b/test/GitHub.Api.UnitTests/packages.config deleted file mode 100644 index b2455522f..000000000 --- a/test/GitHub.Api.UnitTests/packages.config +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.App.UnitTests/packages.config b/test/GitHub.App.UnitTests/packages.config deleted file mode 100644 index 84d11fa23..000000000 --- a/test/GitHub.App.UnitTests/packages.config +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.Exports.Reactive.UnitTests/packages.config b/test/GitHub.Exports.Reactive.UnitTests/packages.config deleted file mode 100644 index 58eae675b..000000000 --- a/test/GitHub.Exports.Reactive.UnitTests/packages.config +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.Exports.UnitTests/packages.config b/test/GitHub.Exports.UnitTests/packages.config deleted file mode 100644 index 6845f9e0c..000000000 --- a/test/GitHub.Exports.UnitTests/packages.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.Extensions.UnitTests/packages.config b/test/GitHub.Extensions.UnitTests/packages.config deleted file mode 100644 index ab0809708..000000000 --- a/test/GitHub.Extensions.UnitTests/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.InlineReviews.UnitTests/packages.config b/test/GitHub.InlineReviews.UnitTests/packages.config deleted file mode 100644 index d294d83d7..000000000 --- a/test/GitHub.InlineReviews.UnitTests/packages.config +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.TeamFoundation.UnitTests/packages.config b/test/GitHub.TeamFoundation.UnitTests/packages.config deleted file mode 100644 index 997587c79..000000000 --- a/test/GitHub.TeamFoundation.UnitTests/packages.config +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/GitHub.UI.UnitTests/packages.config b/test/GitHub.UI.UnitTests/packages.config deleted file mode 100644 index d6681c84e..000000000 --- a/test/GitHub.UI.UnitTests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/test/GitHub.VisualStudio.UnitTests/packages.config b/test/GitHub.VisualStudio.UnitTests/packages.config deleted file mode 100644 index fac77cd62..000000000 --- a/test/GitHub.VisualStudio.UnitTests/packages.config +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/TrackingCollectionTests/packages.config b/test/TrackingCollectionTests/packages.config deleted file mode 100644 index e212deab8..000000000 --- a/test/TrackingCollectionTests/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file