Merge branch 'master' into feature/pr-conversation

Author: jcansdale

appveyor.yml

@@ -2,17 +2,14 @@ os: Visual Studio 2017
 version: '2.8.0.{build}'
 skip_tags: true
 
-environment:
-  matrix:
-    - BUILD_TYPE: normal
-
 install:
 - choco install --no-progress BCC-MSBuildLog
 - choco install --no-progress BCC-Submission
 - ps: |
     $full_build = Test-Path env:GHFVS_KEY
     $forVSInstaller = $env:BUILD_TYPE -eq "vsinstaller"
-    $package = $full_build -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $env:APPVEYOR_REPO_BRANCH -eq "master" -or $forVSInstaller -or $env:BUILD_TYPE -eq "package")
+    $forPackage = $env:BUILD_TYPE -eq "package"
+    $package = $full_build -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $forVSInstaller -or $forPackage)
 
     $message = "Building "
     if ($package) { $message += "and packaging "}
@@ -53,12 +50,25 @@ on_success:
     }
 
 for:
+-
+  branches:
+    except:
+      - /releases/.*-vsinstaller/
+  environment:
+    matrix:
+      - BUILD_TYPE: normal
 -
   branches:
     only:
       - /releases/.*-vsinstaller/
-      - master
   environment:
     matrix:
       - BUILD_TYPE: package
       - BUILD_TYPE: vsinstaller
+-
+  branches:
+    only:
+      - master
+  environment:
+    matrix:
+      - BUILD_TYPE: package

azure-pipelines.yml

@@ -48,15 +48,14 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
-# VSTest is hanging. Skip tests for now; we're still running Appveyor which will handle the tests.
-#- task: VSTest@2
-#  inputs:
-#    searchFolder: '$(Build.SourcesDirectory)\test'
-#    testAssemblyVer2: '**\bin\**\*Tests.dll'
-#    platform: '$(buildPlatform)'
-#    configuration: '$(buildConfiguration)'
-#    diagnosticsEnabled: true
-#    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
+- task: VSTest@2
+  inputs:
+    searchFolder: '$(Build.SourcesDirectory)\test'
+    testAssemblyVer2: '**\bin\**\*Tests.dll'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+    diagnosticsEnabled: true
+    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
 
 - task: PublishBuildArtifacts@1
   inputs:

docs/using/publishing-an-existing-project-to-github.md

@@ -10,5 +10,5 @@
 5. Click the **Publish to GitHub** button.
 ![Location of the Publish to GitHub button in the Team Explorer pane](images/publish-to-github.png)
 6. Enter a name and description for the repository on GitHub.
-7. Check the **Private Repository** box if you want to upload the repository as a private repository on GitHub. You must have a [Developer, Team or Business account](https://github.com/pricing) to create private repositories.
+7. Check the **Private Repository** box if you want to upload the repository as a private repository on GitHub.
 8. Click the **Publish** button.

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

@@ -50,8 +50,7 @@ public RepositorySelectViewModel(IRepositoryCloneService service, IGitHubContext
 
             var filterRepository = this.WhenAnyValue(x => x.Filter)
                 .Select(f => gitHubContextService.FindContextFromUrl(f))
-                .Where(c => c?.LinkType == LinkType.Repository)
-                .Select(c => new RepositoryModel(c.RepositoryName, c.Url));
+                .Select(CreateRepository);
 
             repository = selectedRepository
                 .Merge(filterRepository)
@@ -179,14 +178,21 @@ bool FilterItem(object obj)
         {
             if (obj is IRepositoryItemViewModel item && !string.IsNullOrWhiteSpace(Filter))
             {
-                var urlString = item.Url.ToString();
-                var urlStringWithGit = urlString + ".git";
-                var urlStringWithSlash = urlString + "/";
-                return
-                    item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase) ||
-                    urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                    urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                    urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
+                if (new UriString(Filter).IsHypertextTransferProtocol)
+                {
+                    var urlString = item.Url.ToString();
+                    var urlStringWithGit = urlString + ".git";
+                    var urlStringWithSlash = urlString + "/";
+                    return
+                        urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
+                }
+                else
+                {
+                    return
+                        item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase);
+                }
             }
 
             return true;
@@ -198,5 +204,17 @@ RepositoryModel CreateRepository(IRepositoryItemViewModel item)
                 new RepositoryModel(item.Name, UriString.ToUriString(item.Url)) :
                 null;
         }
+
+        RepositoryModel CreateRepository(GitHubContext context)
+        {
+            switch (context?.LinkType)
+            {
+                case LinkType.Repository:
+                case LinkType.Blob:
+                    return new RepositoryModel(context.RepositoryName, context.Url);
+            }
+
+            return null;
+        }
     }
 }

src/GitHub.TeamFoundation.14/Services/VSGitServices.cs

@@ -86,14 +86,22 @@ public async Task Clone(
             NavigateToHomePage(teamExplorer); // Show progress on Team Explorer - Home
             await WaitForCloneOnHomePageAsync(teamExplorer);
 #elif TEAMEXPLORER15 || TEAMEXPLORER16
+            // IGitActionsExt is proffered by SccProviderPackage, but isn't advertised.
+            // To ensure that getting IGitActionsExt doesn't return null, we first request the
+            // IGitExt service which is advertised. This forces SccProviderPackage to load
+            // and proffer IGitActionsExt.
+            var gitExt = serviceProvider.GetService(typeof(IGitExt));
+            Assumes.NotNull(gitExt);
+            var gitActionsExt = serviceProvider.GetService<IGitActionsExt>();
+            Assumes.NotNull(gitActionsExt);
+
             // The progress parameter uses the ServiceProgressData type which is defined in
             // Microsoft.VisualStudio.Shell.Framework. Referencing this assembly directly
             // would cause type conflicts, so we're using reflection to call CloneAsync.
-            var gitExt = serviceProvider.GetService<IGitActionsExt>();
             var cloneAsyncMethod = typeof(IGitActionsExt).GetMethod(nameof(IGitActionsExt.CloneAsync));
             Assumes.NotNull(cloneAsyncMethod);
             var cloneParameters = new object[] { cloneUrl, clonePath, recurseSubmodules, cancellationToken, progress };
-            var cloneTask = (Task)cloneAsyncMethod.Invoke(gitExt, cloneParameters);
+            var cloneTask = (Task)cloneAsyncMethod.Invoke(gitActionsExt, cloneParameters);
 
             NavigateToHomePage(teamExplorer); // Show progress on Team Explorer - Home
             await cloneTask;

test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositorySelectViewModelTests.cs

@@ -26,6 +26,7 @@ public class TheFilterProperty
         [TestCase("https://github.com/jcansdale/TestDriven.Net", "owner", "name", "https://github.com/jcansdale/TestDriven.Net-issues", 1)]
         [TestCase("https://github.com/owner/name/", "owner", "name", "https://github.com/owner/name", 1, Description = "Trailing slash")]
         [TestCase("https://github.com/owner/name.git", "owner", "name", "https://github.com/owner/name", 1, Description = "Trailing .git")]
+        [TestCase("github.com", "owner", "name", "https://github.com/owner/name", 0, Description = "Don't include host name in search")]
         public async Task Filter(string filter, string owner, string name, string url, int expectCount)
         {
             var contributedToRepositories = new[]
@@ -57,6 +58,8 @@ public async Task Filter(string filter, string owner, string name, string url, i
         [TestCase("filter", null)]
         [TestCase("https://github.com", null)]
         [TestCase("https://github.com/github/VisualStudio", "https://github.com/github/VisualStudio")]
+        [TestCase("https://github.com/github/VisualStudio/blob/master/README.md", "https://github.com/github/VisualStudio/blob/master/README.md")]
+        [TestCase("https://github.com/github/VisualStudio/pull/2208", null)]
         public void Set_Repository_When_Filter_Is_Url(string url, string expectUrl)
         {
             var expectCloneUrl = expectUrl != null ? new UriString(expectUrl) : null;
@@ -69,6 +72,24 @@ public void Set_Repository_When_Filter_Is_Url(string url, string expectUrl)
 
             Assert.That(target.Repository?.CloneUrl, Is.EqualTo(expectCloneUrl));
         }
+
+        [TestCase("filter;https://github.com/github/VisualStudio", "https://github.com/github/VisualStudio")]
+        [TestCase("https://github.com/github/VisualStudio;filter", null)]
+        public void Change_Filters(string filters, string expectUrl)
+        {
+            var expectCloneUrl = expectUrl != null ? new UriString(expectUrl) : null;
+            var repositoryCloneService = CreateRepositoryCloneService();
+            var gitHubContextService = new GitHubContextService(Substitute.For<IGitHubServiceProvider>(),
+                Substitute.For<IGitService>(), Substitute.For<IVSServices>());
+            var target = new RepositorySelectViewModel(repositoryCloneService, gitHubContextService);
+
+            foreach (var filter in filters.Split(';'))
+            {
+                target.Filter = filter;
+            }
+
+            Assert.That(target.Repository?.CloneUrl, Is.EqualTo(expectCloneUrl));
+        }
     }
 
     static IGitHubContextService CreateGitHubContextService()

test/GitHub.InlineReviews.UnitTests/GlobalTestAttributes.cs

@@ -0,0 +1,3 @@
+using NUnit.Framework;
+
+[assembly: Timeout(10000)] // Set a 10 second timeout for all tests

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs

@@ -445,6 +445,7 @@ Line 2
             }
 
             [Test, NUnit.Framework.Category("CodeCoverageFlake")]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task UpdatesInlineCommentThreadsFromEditorContent()
             {
                 var baseContents = @"Line 1
@@ -500,6 +501,7 @@ Line 2
             }
 
             [Test, NUnit.Framework.Category("CodeCoverageFlake")]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task UpdatesReviewCommentWithNewBody()
             {
                 var baseContents = @"Line 1
@@ -553,6 +555,7 @@ Line 2
             }
 
             [Test]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task AddsNewReviewCommentToThread()
             {
                 var baseContents = @"Line 1

test/test.runsettings

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TestSessionTimeout>120000</TestSessionTimeout>
+    <TestSessionTimeout>600000</TestSessionTimeout> <!-- 10 minutes -->
   </RunConfiguration>
 </RunSettings>