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

Commit 9f15db6

Browse files
committed
Merge branch 'refactor/connection-manager' into refactor/connections/remove-repositoryhosts
Conflicts: src/GitHub.App/Models/RepositoryHost.cs src/GitHub.App/Models/RepositoryHosts.cs src/GitHub.App/Services/ModelService.cs src/GitHub.App/ViewModels/GistCreationViewModel.cs src/GitHub.App/ViewModels/LoginTabViewModel.cs src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs src/GitHub.App/ViewModels/PullRequestListViewModel.cs src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs
2 parents 7e57621 + 32f073a commit 9f15db6

File tree

251 files changed

+39145
-1742
lines changed

Some content is hidden

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

251 files changed

+39145
-1742
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,5 @@ $RECYCLE.BIN/
235235
AkavacheSqliteLinkerOverride.cs
236236
NuGetBuild
237237
WiX.Toolset.DummyFile.txt
238-
nunit-UnitTests.xml
239-
nunit-TrackingCollectionTests.xml
238+
nunit-*.xml
240239
GitHubVS.sln.DotSettings
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
4+
</Settings>
5+
</ProjectConfiguration>

Build-Solution.cmd

Lines changed: 0 additions & 1 deletion
This file was deleted.

Build-Solution.ps1

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)