From cf4031e82e6b49f2ddef2a281fb8ad1a8e0b9e22 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 17 Sep 2018 16:50:40 +0200 Subject: [PATCH 1/3] Moved views to GitHub.VisualStudio.UI. This will be needed to prevent circular references when we move the views from GitHub.InlineReviews out of that assembly. --- .../GitHub.VisualStudio.UI.csproj | 10 +- .../Views/ActorAvatarView.cs | 0 .../Views/ContentView.cs | 0 .../Dialog/Clone/RepositoryCloneView.xaml | 3 +- .../Dialog/Clone/RepositoryCloneView.xaml.cs | 0 .../Views/Dialog/Clone/SelectPageView.xaml | 0 .../Views/Dialog/Clone/SelectPageView.xaml.cs | 0 .../Dialog/ForkRepositoryExecuteView.xaml | 0 .../Dialog/ForkRepositoryExecuteView.xaml.cs | 0 .../Dialog/ForkRepositorySelectView.xaml | 0 .../Dialog/ForkRepositorySelectView.xaml.cs | 0 .../Views/Dialog/GistCreationView.xaml | 0 .../Views/Dialog/GistCreationView.xaml.cs | 0 .../Views/Dialog/GitHubDialogWindow.xaml | 0 .../Views/Dialog/GitHubDialogWindow.xaml.cs | 0 .../Views/Dialog/LogOutRequiredView.xaml | 0 .../Views/Dialog/LogOutRequiredView.xaml.cs | 0 .../Views/Dialog/Login2FaView.xaml | 0 .../Views/Dialog/Login2FaView.xaml.cs | 0 .../Views/Dialog/LoginCredentialsView.xaml | 0 .../Views/Dialog/LoginCredentialsView.xaml.cs | 0 .../Views/Dialog/RepositoryCreationView.xaml | 0 .../Dialog/RepositoryCreationView.xaml.cs | 0 .../Views/Dialog/RepositoryRecloneView.xaml | 0 .../Dialog/RepositoryRecloneView.xaml.cs | 0 ...ectoryIsExpandedToImageMonikerConverter.cs | 0 .../FileNameToImageMonikerConverter.cs | 0 .../Views/GitHubPane/GitHubPaneView.xaml | 3 +- .../Views/GitHubPane/GitHubPaneView.xaml.cs | 0 .../Views/GitHubPane/LoggedOutView.xaml | 0 .../Views/GitHubPane/LoggedOutView.xaml.cs | 0 .../Views/GitHubPane/LoginFailedView.xaml | 0 .../Views/GitHubPane/LoginFailedView.xaml.cs | 0 .../GitHubPane/NotAGitHubRepositoryView.xaml | 0 .../NotAGitHubRepositoryView.xaml.cs | 0 .../GitHubPane/NotAGitRepositoryView.xaml | 0 .../GitHubPane/NotAGitRepositoryView.xaml.cs | 0 .../GitHubPane/PullRequestCheckView.xaml | 0 .../GitHubPane/PullRequestCheckView.xaml.cs | 0 .../GitHubPane/PullRequestCreationView.xaml | 0 .../PullRequestCreationView.xaml.cs | 0 .../GitHubPane/PullRequestDetailView.xaml | 0 .../GitHubPane/PullRequestDetailView.xaml.cs | 0 .../PullRequestFileCommentsView.xaml | 0 .../PullRequestFileCommentsView.xaml.cs | 0 .../GitHubPane/PullRequestFilesView.xaml | 0 .../GitHubPane/PullRequestFilesView.xaml.cs | 0 .../GitHubPane/PullRequestListItemView.xaml | 0 .../PullRequestListItemView.xaml.cs | 0 .../Views/GitHubPane/PullRequestListView.xaml | 0 .../GitHubPane/PullRequestListView.xaml.cs | 0 .../PullRequestReviewAuthoringView.xaml | 0 .../PullRequestReviewAuthoringView.xaml.cs | 0 .../PullRequestReviewSummaryView.xaml | 0 .../PullRequestReviewSummaryView.xaml.cs | 0 .../PullRequestUserReviewsView.xaml | 3 +- .../PullRequestUserReviewsView.xaml.cs | 0 .../TeamExplorer/RepositoryPublishView.xaml | 0 .../RepositoryPublishView.xaml.cs | 0 .../Views/UserFilterView.xaml | 0 .../Views/UserFilterView.xaml.cs | 0 .../Views/ViewLocator.cs | 0 src/GitHub.VisualStudio.UI/packages.config | 7 - .../GitHub.VisualStudio.csproj | 199 ------------------ src/GitHub.VisualStudio/GitHubPanePackage.cs | 2 + .../source.extension.vsixmanifest | 1 + 66 files changed, 17 insertions(+), 211 deletions(-) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/ActorAvatarView.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/ContentView.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Clone/RepositoryCloneView.xaml (97%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Clone/RepositoryCloneView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Clone/SelectPageView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Clone/SelectPageView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/ForkRepositoryExecuteView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/ForkRepositoryExecuteView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/ForkRepositorySelectView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/ForkRepositorySelectView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/GistCreationView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/GistCreationView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/GitHubDialogWindow.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/GitHubDialogWindow.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/LogOutRequiredView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/LogOutRequiredView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Login2FaView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/Login2FaView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/LoginCredentialsView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/LoginCredentialsView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/RepositoryCreationView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/RepositoryCreationView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/RepositoryRecloneView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/Dialog/RepositoryRecloneView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/DirectoryIsExpandedToImageMonikerConverter.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/FileNameToImageMonikerConverter.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/GitHubPaneView.xaml (97%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/GitHubPaneView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/LoggedOutView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/LoggedOutView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/LoginFailedView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/LoginFailedView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/NotAGitHubRepositoryView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/NotAGitRepositoryView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/NotAGitRepositoryView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestCheckView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestCheckView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestCreationView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestCreationView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestDetailView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestDetailView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestFileCommentsView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestFilesView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestFilesView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestListItemView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestListItemView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestListView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestListView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestReviewAuthoringView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestReviewSummaryView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestUserReviewsView.xaml (97%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/TeamExplorer/RepositoryPublishView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/TeamExplorer/RepositoryPublishView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/UserFilterView.xaml (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/UserFilterView.xaml.cs (100%) rename src/{GitHub.VisualStudio => GitHub.VisualStudio.UI}/Views/ViewLocator.cs (100%) delete mode 100644 src/GitHub.VisualStudio.UI/packages.config diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index 96356ce104..4756b9ba42 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -7,6 +7,7 @@ + @@ -15,12 +16,17 @@ - - + + + + + + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio/Views/ActorAvatarView.cs b/src/GitHub.VisualStudio.UI/Views/ActorAvatarView.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/ActorAvatarView.cs rename to src/GitHub.VisualStudio.UI/Views/ActorAvatarView.cs diff --git a/src/GitHub.VisualStudio/Views/ContentView.cs b/src/GitHub.VisualStudio.UI/Views/ContentView.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/ContentView.cs rename to src/GitHub.VisualStudio.UI/Views/ContentView.cs diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml similarity index 97% rename from src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml rename to src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml index a517feeda5..796455a16e 100644 --- a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml +++ b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml @@ -5,6 +5,7 @@ xmlns:ghfvs="https://github.com/github/VisualStudio" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone" + xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls" mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440"> @@ -21,7 +22,7 @@ - + - diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml similarity index 97% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml index 63429db4cc..51cdd9f07a 100644 --- a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml +++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml @@ -6,6 +6,7 @@ xmlns:ghfvs="https://github.com/github/VisualStudio" xmlns:local="clr-namespace:GitHub.VisualStudio.Views.GitHubPane" xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf" + xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls" mc:Ignorable="d" d:DesignHeight="500" d:DesignWidth="300"> @@ -40,7 +41,7 @@ Text="{Binding PullRequestTitle}" TextWrapping="Wrap"/> - + diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml rename to src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml diff --git a/src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/UserFilterView.xaml b/src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml similarity index 100% rename from src/GitHub.VisualStudio/Views/UserFilterView.xaml rename to src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml diff --git a/src/GitHub.VisualStudio/Views/UserFilterView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/UserFilterView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml.cs diff --git a/src/GitHub.VisualStudio/Views/ViewLocator.cs b/src/GitHub.VisualStudio.UI/Views/ViewLocator.cs similarity index 100% rename from src/GitHub.VisualStudio/Views/ViewLocator.cs rename to src/GitHub.VisualStudio.UI/Views/ViewLocator.cs diff --git a/src/GitHub.VisualStudio.UI/packages.config b/src/GitHub.VisualStudio.UI/packages.config deleted file mode 100644 index eff341d4fa..0000000000 --- a/src/GitHub.VisualStudio.UI/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index f459410743..4240c4528c 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -382,95 +382,6 @@ OptionsControl.xaml - - - - RepositoryCloneView.xaml - - - SelectPageView.xaml - - - ForkRepositoryExecuteView.xaml - - - ForkRepositorySelectView.xaml - - - GistCreationView.xaml - - - GitHubDialogWindow.xaml - - - LoginCredentialsView.xaml - - - Login2FaView.xaml - - - LogOutRequiredView.xaml - - - RepositoryCreationView.xaml - - - RepositoryRecloneView.xaml - - - - - LoggedOutView.xaml - - - GitHubPaneView.xaml - - - LoginFailedView.xaml - - - PullRequestFileCommentsView.xaml - - - PullRequestListItemView.xaml - - - PullRequestReviewAuthoringView.xaml - - - PullRequestCheckView.xaml - - - PullRequestReviewSummaryView.xaml - - - PullRequestFilesView.xaml - - - PullRequestListView.xaml - - - PullRequestDetailView.xaml - - - PullRequestCreationView.xaml - - - NotAGitHubRepositoryView.xaml - - - NotAGitRepositoryView.xaml - - - PullRequestUserReviewsView.xaml - - - RepositoryPublishView.xaml - - - UserFilterView.xaml - - @@ -568,116 +479,6 @@ MSBuild:Compile GitHub.VisualStudio.UI - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - diff --git a/src/GitHub.VisualStudio/GitHubPanePackage.cs b/src/GitHub.VisualStudio/GitHubPanePackage.cs index a92afcef08..3738e32a40 100644 --- a/src/GitHub.VisualStudio/GitHubPanePackage.cs +++ b/src/GitHub.VisualStudio/GitHubPanePackage.cs @@ -1,7 +1,9 @@ using System; using System.Runtime.InteropServices; using GitHub.VisualStudio.UI; +using Microsoft.VisualStudio.Imaging; using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; namespace GitHub.VisualStudio { diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 9e293cf42b..c6d3ba159b 100644 --- a/src/GitHub.VisualStudio/source.extension.vsixmanifest +++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest @@ -36,6 +36,7 @@ + From 1a295e2c2cd7c33120c3a45504819fe66d98aa25 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 17 Sep 2018 17:06:15 +0200 Subject: [PATCH 2/3] Moved comment view models to GitHub.App. --- .../Services/CommentService.cs | 2 +- .../ViewModels/CommentThreadViewModel.cs | 0 .../ViewModels/CommentViewModel.cs | 3 +-- .../Services/ICommentService.cs | 2 +- .../ViewModels/ICommentThreadViewModel.cs | 7 ++----- .../ViewModels/ICommentViewModel.cs | 4 +--- src/GitHub.InlineReviews/GitHub.InlineReviews.csproj | 6 ------ .../ViewModels/IPullRequestReviewCommentViewModel.cs | 1 + .../ViewModels/InlineCommentPeekViewModel.cs | 1 + src/GitHub.InlineReviews/Views/CommentView.xaml.cs | 1 + .../ViewModels/InlineCommentPeekViewModelTests.cs | 1 + .../ViewModels/InlineCommentThreadViewModelTests.cs | 1 + .../ViewModels/NewInlineCommentThreadViewModelTests.cs | 1 + 13 files changed, 12 insertions(+), 18 deletions(-) rename src/{GitHub.InlineReviews => GitHub.App}/Services/CommentService.cs (95%) rename src/{GitHub.InlineReviews => GitHub.App}/ViewModels/CommentThreadViewModel.cs (100%) rename src/{GitHub.InlineReviews => GitHub.App}/ViewModels/CommentViewModel.cs (99%) rename src/{GitHub.InlineReviews => GitHub.Exports.Reactive}/Services/ICommentService.cs (90%) rename src/{GitHub.InlineReviews => GitHub.Exports.Reactive}/ViewModels/ICommentThreadViewModel.cs (88%) rename src/{GitHub.InlineReviews => GitHub.Exports.Reactive}/ViewModels/ICommentViewModel.cs (97%) diff --git a/src/GitHub.InlineReviews/Services/CommentService.cs b/src/GitHub.App/Services/CommentService.cs similarity index 95% rename from src/GitHub.InlineReviews/Services/CommentService.cs rename to src/GitHub.App/Services/CommentService.cs index 90d723fa72..0b03bab799 100644 --- a/src/GitHub.InlineReviews/Services/CommentService.cs +++ b/src/GitHub.App/Services/CommentService.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows.Forms; -namespace GitHub.InlineReviews.Services +namespace GitHub.Services { [Export(typeof(ICommentService))] [PartCreationPolicy(CreationPolicy.NonShared)] diff --git a/src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs b/src/GitHub.App/ViewModels/CommentThreadViewModel.cs similarity index 100% rename from src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs rename to src/GitHub.App/ViewModels/CommentThreadViewModel.cs diff --git a/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs b/src/GitHub.App/ViewModels/CommentViewModel.cs similarity index 99% rename from src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs rename to src/GitHub.App/ViewModels/CommentViewModel.cs index 3565682991..714244921b 100644 --- a/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs +++ b/src/GitHub.App/ViewModels/CommentViewModel.cs @@ -3,11 +3,10 @@ using System.Reactive; using System.Reactive.Linq; using System.Threading.Tasks; -using System.Windows; using GitHub.Extensions; -using GitHub.InlineReviews.Services; using GitHub.Logging; using GitHub.Models; +using GitHub.Services; using GitHub.ViewModels; using ReactiveUI; using Serilog; diff --git a/src/GitHub.InlineReviews/Services/ICommentService.cs b/src/GitHub.Exports.Reactive/Services/ICommentService.cs similarity index 90% rename from src/GitHub.InlineReviews/Services/ICommentService.cs rename to src/GitHub.Exports.Reactive/Services/ICommentService.cs index a206eb2ac4..7c7330163e 100644 --- a/src/GitHub.InlineReviews/Services/ICommentService.cs +++ b/src/GitHub.Exports.Reactive/Services/ICommentService.cs @@ -1,4 +1,4 @@ -namespace GitHub.InlineReviews.Services +namespace GitHub.Services { /// /// This service allows for functionality to be injected into the chain of different peek Comment ViewModel types. diff --git a/src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs similarity index 88% rename from src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs rename to src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs index b17290de59..5a328da0bb 100644 --- a/src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs +++ b/src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.ObjectModel; +using System.Collections.ObjectModel; using System.Reactive; -using GitHub.Models; -using GitHub.ViewModels; using ReactiveUI; -namespace GitHub.InlineReviews.ViewModels +namespace GitHub.ViewModels { /// /// A comment thread. diff --git a/src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs similarity index 97% rename from src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs rename to src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs index 9bb64b0bfb..34c238fba1 100644 --- a/src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs +++ b/src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs @@ -1,10 +1,8 @@ using System; using System.Reactive; -using GitHub.Models; -using GitHub.ViewModels; using ReactiveUI; -namespace GitHub.InlineReviews.ViewModels +namespace GitHub.ViewModels { public enum CommentEditState { diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index 1e0c3a3f7c..9dc8d2d5fc 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -84,8 +84,6 @@ - - @@ -111,9 +109,6 @@ - - - @@ -144,7 +139,6 @@ - CommentThreadView.xaml diff --git a/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs b/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs index 63bb86d96d..1c21cfa67b 100644 --- a/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs +++ b/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Reactive; +using GitHub.ViewModels; using ReactiveUI; namespace GitHub.InlineReviews.ViewModels diff --git a/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs b/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs index 91bef39588..0ed39c58a3 100644 --- a/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs +++ b/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs @@ -16,6 +16,7 @@ using GitHub.Models; using GitHub.Primitives; using GitHub.Services; +using GitHub.ViewModels; using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.Text; using ReactiveUI; diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs b/src/GitHub.InlineReviews/Views/CommentView.xaml.cs index 271fac0502..7227731bc7 100644 --- a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs +++ b/src/GitHub.InlineReviews/Views/CommentView.xaml.cs @@ -3,6 +3,7 @@ using GitHub.InlineReviews.ViewModels; using GitHub.Services; using GitHub.UI; +using GitHub.ViewModels; using Microsoft.VisualStudio.Shell; using ReactiveUI; diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs index 53debb849f..ab17a72813 100644 --- a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs +++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs @@ -20,6 +20,7 @@ using Octokit; using NUnit.Framework; using GitHub.Commands; +using GitHub.ViewModels; namespace GitHub.InlineReviews.UnitTests.ViewModels { diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs index 7704bde7cf..21188162cb 100644 --- a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs +++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs @@ -5,6 +5,7 @@ using GitHub.InlineReviews.ViewModels; using GitHub.Models; using GitHub.Services; +using GitHub.ViewModels; using NSubstitute; using NUnit.Framework; diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs index c1e8383801..beb3e27785 100644 --- a/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs +++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs @@ -4,6 +4,7 @@ using GitHub.InlineReviews.ViewModels; using GitHub.Models; using GitHub.Services; +using GitHub.ViewModels; using NSubstitute; using NUnit.Framework; From 91cb7f874a606488b624059763385c2d343ef925 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 17 Sep 2018 17:28:01 +0200 Subject: [PATCH 3/3] Moved comment views to GitHub.VisualStudio.UI. --- .../CommentThreadViewModelDesigner.cs | 9 ++--- .../SampleData/CommentViewModelDesigner.cs | 9 ++--- .../GitHub.InlineReviews.csproj | 20 ++-------- .../Views/CommentThreadView.xaml | 40 ------------------- .../Views/InlineCommentPeekView.xaml | 2 +- .../Properties/AssemblyInfo.cs | 3 ++ .../Views/CommentThreadView.xaml | 40 +++++++++++++++++++ .../Views/CommentThreadView.xaml.cs | 2 +- .../Views/CommentView.xaml | 15 ++++--- .../Views/CommentView.xaml.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 -- 11 files changed, 63 insertions(+), 83 deletions(-) rename src/{GitHub.InlineReviews => GitHub.App}/SampleData/CommentThreadViewModelDesigner.cs (73%) rename src/{GitHub.InlineReviews => GitHub.App}/SampleData/CommentViewModelDesigner.cs (89%) delete mode 100644 src/GitHub.InlineReviews/Views/CommentThreadView.xaml create mode 100644 src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml rename src/{GitHub.InlineReviews => GitHub.VisualStudio.UI}/Views/CommentThreadView.xaml.cs (89%) rename src/{GitHub.InlineReviews => GitHub.VisualStudio.UI}/Views/CommentView.xaml (96%) rename src/{GitHub.InlineReviews => GitHub.VisualStudio.UI}/Views/CommentView.xaml.cs (98%) diff --git a/src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs b/src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs similarity index 73% rename from src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs rename to src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs index eac1dca542..eede15b161 100644 --- a/src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs +++ b/src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.ObjectModel; +using System.Collections.ObjectModel; using System.Diagnostics.CodeAnalysis; using System.Reactive; -using GitHub.InlineReviews.ViewModels; -using GitHub.Models; using GitHub.ViewModels; using ReactiveUI; -namespace GitHub.InlineReviews.SampleData +namespace GitHub.SampleData { [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")] - class CommentThreadViewModelDesigner : ICommentThreadViewModel + public class CommentThreadViewModelDesigner : ICommentThreadViewModel { public ObservableCollection Comments { get; } = new ObservableCollection(); diff --git a/src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs b/src/GitHub.App/SampleData/CommentViewModelDesigner.cs similarity index 89% rename from src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs rename to src/GitHub.App/SampleData/CommentViewModelDesigner.cs index ddd907015c..5c4be54c25 100644 --- a/src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs +++ b/src/GitHub.App/SampleData/CommentViewModelDesigner.cs @@ -1,14 +1,13 @@ using System; -using System.Reactive; using System.Diagnostics.CodeAnalysis; -using GitHub.InlineReviews.ViewModels; -using ReactiveUI; +using System.Reactive; using GitHub.ViewModels; +using ReactiveUI; -namespace GitHub.InlineReviews.SampleData +namespace GitHub.SampleData { [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")] - class CommentViewModelDesigner : ReactiveObject, ICommentViewModel + public class CommentViewModelDesigner : ReactiveObject, ICommentViewModel { public CommentViewModelDesigner() { diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index 9dc8d2d5fc..a382d65014 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -100,7 +100,6 @@ - @@ -123,7 +122,6 @@ InlineCommentPeekView.xaml - @@ -139,12 +137,6 @@ - - CommentThreadView.xaml - - - CommentView.xaml - PullRequestStatusView.xaml @@ -454,14 +446,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - Designer MSBuild:Compile @@ -475,7 +459,9 @@ PreserveNewest - + + + diff --git a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml b/src/GitHub.InlineReviews/Views/CommentThreadView.xaml deleted file mode 100644 index 6d8c904166..0000000000 --- a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml index 4822211b73..e8a7a4269a 100644 --- a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml +++ b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml @@ -105,7 +105,7 @@ VerticalScrollBarVisibility="Auto" Background="{DynamicResource GitHubPeekViewBackground}"> - + diff --git a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs index 42ad4ae77e..83e5092a04 100644 --- a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs +++ b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs @@ -3,3 +3,6 @@ [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Controls")] [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Views")] +[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")] +[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")] +[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")] diff --git a/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml new file mode 100644 index 0000000000..86d1616bb9 --- /dev/null +++ b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + diff --git a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs similarity index 89% rename from src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs index 3143ef3e42..4fb4fc78d5 100644 --- a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs +++ b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs @@ -2,7 +2,7 @@ using System.Windows.Controls; using GitHub.VisualStudio.UI.Helpers; -namespace GitHub.InlineReviews.Views +namespace GitHub.VisualStudio.Views { public partial class CommentThreadView : UserControl { diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml similarity index 96% rename from src/GitHub.InlineReviews/Views/CommentView.xaml rename to src/GitHub.VisualStudio.UI/Views/CommentView.xaml index bc70450a96..9bf463a44a 100644 --- a/src/GitHub.InlineReviews/Views/CommentView.xaml +++ b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml @@ -1,22 +1,21 @@ - - - + + You can use a `CompositeDisposable` type here, it's designed to handle disposables in an optimal way (you can just call `Dispose()` on it and it will handle disposing everything it holds). - - + + diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs similarity index 98% rename from src/GitHub.InlineReviews/Views/CommentView.xaml.cs rename to src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs index 7227731bc7..dea2a99bac 100644 --- a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs +++ b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs @@ -7,7 +7,7 @@ using Microsoft.VisualStudio.Shell; using ReactiveUI; -namespace GitHub.InlineReviews.Views +namespace GitHub.VisualStudio.Views { public class GenericCommentView : ViewBase { } diff --git a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs index 9b8e052f21..adb135bd5e 100644 --- a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs +++ b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs @@ -6,7 +6,3 @@ [assembly: AssemblyTitle("GitHub.VisualStudio")] [assembly: AssemblyDescription("GitHub for Visual Studio VSPackage")] [assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")] - -[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")] -[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")] -[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")]