Merge branch 'refactor/sdk-csproj' into refactor/clone

grokys · grokys · commit ad4627b56d2c · 2018-09-05T11:40:36.000+02:00
diff --git a/README.md b/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)
 
diff --git a/appveyor.yml b/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) {
diff --git a/codecov.yml b/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/::"
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "1.6.47"
+        "MSBuild.Sdk.Extras": "1.6.52"
     }
 }
diff --git a/scripts/modules.ps1 b/scripts/modules.ps1
@@ -126,8 +126,8 @@ New-Module -ScriptBlock {
 
         $msbuild = Find-MSBuild
 
-        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2"
-        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2 }
+        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"
+        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }
     }
 
     Export-ModuleMember -Function Find-MSBuild,Build-Solution
diff --git a/src/GitHub.InlineReviews/Services/CommentService.cs b/src/GitHub.InlineReviews/Services/CommentService.cs
@@ -1,4 +1,5 @@
 ﻿using System.ComponentModel.Composition;
+using System.Globalization;
 using System.Windows.Forms;
 
 namespace GitHub.InlineReviews.Services
@@ -9,11 +10,17 @@ public class CommentService:ICommentService
     {
         public bool ConfirmCommentDelete()
         {
+            var options = CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft ?
+                MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign :
+                0;
+
             return MessageBox.Show(
                 VisualStudio.UI.Resources.DeleteCommentConfirmation,
                 VisualStudio.UI.Resources.DeleteCommentConfirmationCaption,
                 MessageBoxButtons.YesNo,
-                MessageBoxIcon.Question) == DialogResult.Yes;
+                MessageBoxIcon.Question,
+                MessageBoxDefaultButton.Button1,
+                options) == DialogResult.Yes;
         }
     }
 }
diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows.Input;
 using GitHub.Extensions;
 using GitHub.VisualStudio.TeamExplorer.Sync;
@@ -19,7 +20,7 @@ public class TeamExplorerServices : ITeamExplorerServices
         /// that instances of this type cannot be created if the TeamFoundation dlls are not available
         /// (otherwise we'll have multiple instances of ITeamExplorerServices exports, and that would be Bad(tm))
         /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         ITeamExplorerNotificationManager manager;
 
         [ImportingConstructor]
@@ -31,14 +32,14 @@ public TeamExplorerServices(IGitHubServiceProvider serviceProvider)
         public void ShowConnectPage()
         {
             var te = serviceProvider.TryGetService<ITeamExplorer>();
-            var foo = te.NavigateToPage(new Guid(TeamExplorerPageIds.Connect), null);
+            te.NavigateToPage(new Guid(TeamExplorerPageIds.Connect), null);
         }
 
         public void ShowPublishSection()
         {
             var te = serviceProvider.TryGetService<ITeamExplorer>();
-            var foo = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null);
-            var publish = foo?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection;
+            var page = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null);
+            var publish = page?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection;
             publish?.Connect();
         }
 
diff --git a/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs b/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs
@@ -237,7 +237,7 @@ bool TryNavigateFromHistoryFile(IVsTextView sourceView)
             if (teamExplorerContext.Value.ActiveRepository?.LocalPath is string repositoryDir &&
                 FindObjectishForTFSTempFile(sourceView) is string objectish)
             {
-                var (commitSha, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish);
+                var (_, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish);
                 if (blobPath is string)
                 {
                     var workingFile = Path.Combine(repositoryDir, blobPath);
diff --git a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs
@@ -20,7 +20,6 @@ public class OpenFromUrlCommand : VsCommand<string>, IOpenFromUrlCommand
     {
         readonly Lazy<IGitHubContextService> gitHubContextService;
         readonly Lazy<IRepositoryCloneService> repositoryCloneService;
-        readonly Lazy<IPullRequestEditorService> pullRequestEditorService;
         readonly Lazy<ITeamExplorerContext> teamExplorerContext;
         readonly Lazy<IGitHubToolWindowManager> gitHubToolWindowManager;
         readonly Lazy<DTE> dte;
@@ -40,14 +39,12 @@ public class OpenFromUrlCommand : VsCommand<string>, IOpenFromUrlCommand
         public OpenFromUrlCommand(
             Lazy<IGitHubContextService> gitHubContextService,
             Lazy<IRepositoryCloneService> repositoryCloneService,
-            Lazy<IPullRequestEditorService> pullRequestEditorService,
             Lazy<ITeamExplorerContext> teamExplorerContext,
             [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider) :
             base(CommandSet, CommandId)
         {
             this.gitHubContextService = gitHubContextService;
             this.repositoryCloneService = repositoryCloneService;
-            this.pullRequestEditorService = pullRequestEditorService;
             this.teamExplorerContext = teamExplorerContext;
             this.serviceProvider = serviceProvider;
             dte = new Lazy<DTE>(() => (DTE)serviceProvider.GetService(typeof(DTE)));
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.vsct b/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>
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs
@@ -17,6 +17,7 @@
 
 namespace GitHub.VisualStudio.Views.GitHubPane
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
     [ExportViewFor(typeof(IPullRequestListViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class PullRequestListView : UserControl
diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/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>
diff --git a/src/common/SolutionInfo.cs b/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";
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ Official builds of this extension are available at [the official website](https:`
`19`	`19`
`20`	`20`
`21`	`21`	`[![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)`
	`22`	`+[![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)`
`22`	`23`
`23`	`24`	`[![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)`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "MSBuild.Sdk.Extras": "1.6.47"`
	`3`	`+ "MSBuild.Sdk.Extras": "1.6.52"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ New-Module -ScriptBlock {`
`126`	`126`
`127`	`127`	`$msbuild = Find-MSBuild`
`128`	`128`
`129`		`- Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2"`
`130`		`- Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2 }`
	`129`	`+ Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"`
	`130`	`+ Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`Export-ModuleMember -Function Find-MSBuild,Build-Solution`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.ComponentModel.Composition;`
	`2`	`+using System.Globalization;`
`2`	`3`	`using System.Windows.Forms;`
`3`	`4`
`4`	`5`	`namespace GitHub.InlineReviews.Services`
`@@ -9,11 +10,17 @@ public class CommentService:ICommentService`
`9`	`10`	`{`
`10`	`11`	`public bool ConfirmCommentDelete()`
`11`	`12`	`{`
	`13`	`+ var options = CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft ?`
	`14`	`+ MessageBoxOptions.RtlReading \| MessageBoxOptions.RightAlign :`
	`15`	`+ 0;`
	`16`	`+`
`12`	`17`	`return MessageBox.Show(`
`13`	`18`	`VisualStudio.UI.Resources.DeleteCommentConfirmation,`
`14`	`19`	`VisualStudio.UI.Resources.DeleteCommentConfirmationCaption,`
`15`	`20`	`MessageBoxButtons.YesNo,`
`16`		`- MessageBoxIcon.Question) == DialogResult.Yes;`
	`21`	`+ MessageBoxIcon.Question,`
	`22`	`+ MessageBoxDefaultButton.Button1,`
	`23`	`+ options) == DialogResult.Yes;`
`17`	`24`	`}`
`18`	`25`	`}`
`19`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ bool TryNavigateFromHistoryFile(IVsTextView sourceView)`
`237`	`237`	`if (teamExplorerContext.Value.ActiveRepository?.LocalPath is string repositoryDir &&`
`238`	`238`	`FindObjectishForTFSTempFile(sourceView) is string objectish)`
`239`	`239`	`{`
`240`		`- var (commitSha, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish);`
	`240`	`+ var (_, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish);`
`241`	`241`	`if (blobPath is string)`
`242`	`242`	`{`
`243`	`243`	`var workingFile = Path.Combine(repositoryDir, blobPath);`