Merge branch 'master' into enhancements/add-user-guid-to-metrics

# Conflicts:
#	src/GitHub.Exports/Models/UsageModel.cs
#	src/GitHub.VisualStudio/Services/UsageService.cs
#	src/GitHub.VisualStudio/Services/UsageTracker.cs
#	test/UnitTests/GitHub.VisualStudio/Services/UsageTrackerTests.cs

Author: StanleyGoldman

CONTRIBUTING.md

@@ -7,6 +7,8 @@
 
 Hi there! We're thrilled that you'd like to contribute to the __GitHub Extension for Visual Studio__. Your help is essential for keeping it great.
 
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md).
+
 This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
 
 ## Submitting a pull request

ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Hello! Please read the contributing guidelines before submitting an issue regarding the GitHub Extension for Visual Studio.
 
-- GitHub Extension for Visual Studio  version:
+- GitHub Extension for Visual Studio version:
 - Visual Studio version:
 
 __What happened__ (with steps, logs and screenshots, if possible)

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.4.0.{build}'
+version: '2.4.3.{build}'
 skip_tags: true
 install:
 - ps: |
@@ -19,8 +19,10 @@ install:
     nuget restore GitHubVS.sln
 build_script:
 - ps: scripts\build.ps1 -AppVeyor -BuildNumber:$env:APPVEYOR_BUILD_NUMBER
-test_script:
-- ps: scripts\test.ps1 -AppVeyor
+test:
+  categories:
+    except:
+      - Timings
 on_success:
 - ps: |
     if ($full_build) {

lib/NUnit.Extension.AppVeyor.NUnit3ResultWriter.0.1.0.nupkg

@@ -18,9 +18,6 @@ Param(
     $TimeoutDuration = 180
     ,
     [switch]
-    $AppVeyor = $false
-    ,
-    [switch]
     $Trace = $false
 
 )
@@ -35,30 +32,30 @@ $env:PATH = "$PSScriptRoot;$env:PATH"
 $exitcode = 0
 
 Write-Output "Running Tracking Collection Tests..."
-Run-NUnit test TrackingCollectionTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test TrackingCollectionTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 1
 }
 
 Write-Output "Running GitHub.UI.UnitTests..."
-Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 2
 }
 
 Write-Output "Running UnitTests..."
-Run-NUnit test UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 3
 }
 
 Write-Output "Running GitHub.InlineReviews.UnitTests..."
-Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 4
 }
 
-if ($exitcode -ne 0 -and $AppVeyor) {
+if ($exitcode -ne 0) {
     $host.SetShouldExit($exitcode)
 }
 exit $exitcode

scripts/test.ps1

@@ -72,7 +72,7 @@ async Task<Repository> GetRepositoryInternal()
                         if (repo != null)
                         {
                             hasWiki = await HasWikiInternal(repo);
-                            isEnterprise = await IsEnterpriseInternal();
+                            isEnterprise = isEnterprise ?? await IsEnterpriseInternal();
                             repositoryCache = repo;
                         }
                         owner = ownerLogin;
@@ -99,9 +99,14 @@ public bool HasWiki()
             return hasWiki.HasValue && hasWiki.Value;
         }
 
-        public bool IsEnterprise()
+        public async Task<bool> IsEnterprise()
         {
-            return isEnterprise.HasValue && isEnterprise.Value;
+            if (!isEnterprise.HasValue)
+            {
+                isEnterprise = await IsEnterpriseInternal();
+            }
+
+            return isEnterprise ?? false;
         }
 
         async Task<bool> HasWikiInternal(Repository repo)

src/GitHub.Api/SimpleApiClient.cs

@@ -157,7 +157,7 @@ static string GetMachineNameSafe()
             }
             catch (Exception e)
             {
-                log.Information(e, "Failed to retrieve host name using `DNS.GetHostName`");
+                log.Warning(e, "Failed to retrieve host name using `DNS.GetHostName`");
                 try
                 {
                     return Environment.MachineName;
@@ -242,7 +242,8 @@ public IObservable<PullRequest> GetPullRequestsForRepository(string owner, strin
             Guard.ArgumentNotEmptyString(name, nameof(name));
 
             return gitHubClient.PullRequest.GetAllForRepository(owner, name,
-                new PullRequestRequest {
+                new PullRequestRequest
+                {
                     State = ItemStateFilter.All,
                     SortProperty = PullRequestSort.Updated,
                     SortDirection = SortDirection.Descending
@@ -268,7 +269,7 @@ public IObservable<Branch> GetBranches(string owner, string repo)
             Guard.ArgumentNotEmptyString(owner, nameof(owner));
             Guard.ArgumentNotEmptyString(repo, nameof(repo));
 
-#pragma warning disable CS0618
+#pragma warning disable 618
             // GetAllBranches is obsolete, but don't want to introduce the change to fix the
             // warning in the PR, so disabling for now.
             return gitHubClient.Repository.GetAllBranches(owner, repo);

src/GitHub.App/Api/ApiClient.cs

@@ -62,6 +62,7 @@ public static IObservable<CacheIndex> AddAndSaveToIndex(IBlobCache cache, string
             Guard.ArgumentNotNull(item, nameof(item));
 
             return cache.GetOrCreateObject(indexKey, () => Create(indexKey))
+                .Select(x => x.IndexKey == null ? Create(indexKey) : x)
                 .Do(index =>
                 {
                     var k = string.Format(CultureInfo.InvariantCulture, "{0}|{1}", index.IndexKey, item.Key);

src/GitHub.App/Caches/CacheIndex.cs

@@ -200,7 +200,11 @@ static IObservable<T> GetAndFetchLatestFromIndex<T>(this IBlobCache This,
             bool shouldInvalidateOnError = false)
                 where T : CacheItem
         {
-            var idx = Observable.Defer(() => This.GetOrCreateObject(key, () => CacheIndex.Create(key))).Replay().RefCount();
+            var idx = Observable.Defer(() => This
+                                            .GetOrCreateObject(key, () => CacheIndex.Create(key)))
+                                            .Select(x => x.IndexKey == null ? CacheIndex.Create(key) : x)
+                                            .Replay()
+                                            .RefCount();
 
 
             var fetch = idx
@@ -264,6 +268,7 @@ public static IObservable<T> PutAndUpdateIndex<T>(this IBlobCache blobCache,
             {
                 var absoluteExpiration = blobCache.Scheduler.Now + maxCacheDuration;
                 return blobCache.GetOrCreateObject(key, () => CacheIndex.Create(key))
+                    .Select(x => x.IndexKey == null ? CacheIndex.Create(key) : x)
                     .SelectMany(index => fetchFunc()
                             .Catch<T, Exception>(Observable.Throw<T>)
                             .SelectMany(x => x.Save<T>(blobCache, key, absoluteExpiration))

src/GitHub.App/Extensions/AkavacheExtensions.cs

@@ -61,6 +61,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
       <Private>True</Private>
@@ -69,10 +73,18 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
@@ -142,6 +154,7 @@
     <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="Services\EnterpriseCapabilitiesService.cs" />
     <Compile Include="Services\GlobalConnection.cs" />
+    <Compile Include="Services\PullRequestEditorService.cs" />
     <Compile Include="Services\TeamExplorerContext.cs" />
     <Compile Include="Services\OAuthCallbackListener.cs" />
     <Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />