Merge branch 'master' into refactor/sdk-csproj

Author: grokys

README.md

@@ -19,6 +19,7 @@ Official builds of this extension are available at [the official website](https:
 
 
 [![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
+[![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
 
 [![Join the chat at freenode:github-vs](https://img.shields.io/badge/irc-freenode:%20%23github--vs-blue.svg)](http://webchat.freenode.net/?channels=%23github-vs) [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.5.5.{build}'
+version: '2.5.6.{build}'
 skip_tags: true
 install:
 - ps: |
@@ -24,6 +24,11 @@ test:
   categories:
     except:
       - Timings
+after_test:
+- ps: |  
+    choco install --no-progress opencover.portable codecov
+    OpenCover.Console.exe --% "-target:nunit3-console.exe" "-targetargs: test\GitHub.Api.UnitTests\bin\Release\GitHub.Api.UnitTests.dll test\GitHub.App.UnitTests\bin\Release\GitHub.App.UnitTests.dll test\GitHub.Exports.Reactive.UnitTests\bin\Release\GitHub.Exports.Reactive.UnitTests.dll test\GitHub.Exports.UnitTests\bin\Release\GitHub.Exports.UnitTests.dll test\GitHub.Extensions.UnitTests\bin\Release\GitHub.Extensions.UnitTests.dll test\GitHub.InlineReviews.UnitTests\bin\Release\GitHub.InlineReviews.UnitTests.dll test\GitHub.Primitives.UnitTests\bin\Release\GitHub.Primitives.UnitTests.dll test\GitHub.TeamFoundation.UnitTests\bin\Release\GitHub.TeamFoundation.UnitTests.dll test\GitHub.UI.UnitTests\bin\Release\GitHub.UI.UnitTests.dll test\GitHub.VisualStudio.UnitTests\bin\Release\GitHub.VisualStudio.UnitTests.dll test\MetricsTests\MetricsTests\bin\Release\MetricsTests.dll test\TrackingCollectionTests\bin\Release\TrackingCollectionTests.dll --where cat!=Timings --inprocess --noresult" -filter:"+[GitHub*]* -[GitHub*UnitTests]*" -register:user -output:".\coverage.xml"
+    codecov -f "coverage.xml"
 on_success:
 - ps: |
     if ($full_build) {

codecov.yml

@@ -0,0 +1,29 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: yes
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "header, reach, diff, files"
+  behavior: new
+  require_changes: no
+  
+fixes:
+  - "/C/projects/visualstudio/::"

src/GitHub.VisualStudio/GitHub.VisualStudio.vsct

@@ -3,6 +3,9 @@
   xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
+  <!-- Import the standard ImageCatalogGuid monikers -->
+  <Include href="KnownImageIds.vsct"/>
+  
   <!--  This is the file that defines the actual layout and type of the commands.
         It is divided in different sections (e.g. command definition, command
         placement, ...), with each defining a specific set of properties.
@@ -138,7 +141,7 @@
 
       <!--- Toolbar buttons -->
       <Button guid="guidGitHubToolbarCmdSet" id="backCommand" type="Button">
-        <Icon guid="guidImages" id="arrow_left" />
+        <Icon guid="ImageCatalogGuid" id="Backwards" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
@@ -149,7 +152,7 @@
       </Button>
 
       <Button guid="guidGitHubToolbarCmdSet" id="forwardCommand" type="Button">
-        <Icon guid="guidImages" id="arrow_right" />
+        <Icon guid="ImageCatalogGuid" id="Forwards" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
@@ -171,7 +174,7 @@
       </Button>
 
       <Button guid="guidGitHubToolbarCmdSet" id="refreshCommand" type="Button">
-        <Icon guid="guidImages" id="refresh" />
+        <Icon guid="ImageCatalogGuid" id="Refresh" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
@@ -182,7 +185,7 @@
       </Button>
 
       <Button guid="guidGitHubToolbarCmdSet" id="githubCommand" type="Button">
-        <Icon guid="guidImages" id="logo_toolbar" />
+        <Icon guid="ImageCatalogGuid" id="OpenWebSite" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultDisabled</CommandFlag>
         <Strings>
@@ -193,7 +196,7 @@
       </Button>
 
       <Button guid="guidGitHubToolbarCmdSet" id="helpCommand" type="Button">
-        <Icon guid="guidImages" id="question" />
+        <Icon guid="ImageCatalogGuid" id="StatusHelp" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>Help</ButtonText>
@@ -227,7 +230,7 @@
       </Button>
 
       <Button guid="guidContextMenuSet" id="openLinkCommand" type="Button">
-        <Icon guid="guidImages" id="link_external" />
+        <Icon guid="ImageCatalogGuid" id="OpenWebSite" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DefaultInvisible</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>

src/GitHub.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.5.0" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.6.0" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>

src/common/SolutionInfo.cs

@@ -18,6 +18,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.5.5.0";
+        internal const string Version = "2.5.6.0";
     }
 }