Merge branch 'master' into fixes/1666-filter-pr-solution-explorer

Author: laurentkempe

.editorconfig

@@ -1,6 +1,73 @@
 # top-most EditorConfig file
 root = true
 
-[*.cs]
+[*.{cs,vb}]
+
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+# Organize usings
+dotnet_sort_system_directives_first = true 
+
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Parentheses preferences 
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = never:silent
+dotnet_style_readonly_field = true:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+
+[*.cs]
+
+# var preferences
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+csharp_style_expression_bodied_properties = false:none
+csharp_style_expression_bodied_indexers = false:none
+csharp_style_expression_bodied_accessors = false:none
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Expression-level preferences
+csharp_prefer_braces = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Spacing options
+csharp_space_after_keywords_in_control_flow_statements = true

.ncrunch/GitHub.App.UnitTests.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
+  </Settings>
+</ProjectConfiguration>

.ncrunch/GitHub.Exports.UnitTests.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
+  </Settings>
+</ProjectConfiguration>

Directory.Build.Props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <Product>GitHub Extension for Visual Studio</Product>
-    <Version>2.5.9.0</Version>
+    <Version>2.6.0.0</Version>
     <Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
-</Project>
+</Project>

GitHubVS.sln

@@ -10,6 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2FA6-4A22-8B33-69F698A18CF1}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -39,6 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		appveyor.yml = appveyor.yml
 		scripts\build.ps1 = scripts\build.ps1
 		scripts\Bump-Version.ps1 = scripts\Bump-Version.ps1
 		scripts\common.ps1 = scripts\common.ps1
@@ -133,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Wpf", "submodule
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallAndStart", "test\Launcher\InstallAndStart.csproj", "{79F32BE1-2764-4DBA-97F6-21053DE44270}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.16", "src\GitHub.TeamFoundation.16\GitHub.TeamFoundation.16.csproj", "{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -542,6 +546,16 @@ Global
 		{79F32BE1-2764-4DBA-97F6-21053DE44270}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
 		{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.DebugWithoutVsix|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
+		{F08BD4BC-B5DF-4193-9B01-6D0BBE101BD7}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GitHubVS.v3.ncrunchsolution

@@ -7,7 +7,7 @@
     <AdditionalFilesToIncludeForSolution>
       <Value>lib\**.*</Value>
     </AdditionalFilesToIncludeForSolution>
-    <AllowParallelTestExecution>False</AllowParallelTestExecution>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
     <ProjectConfigStoragePathRelativeToSolutionDir>.ncrunch</ProjectConfigStoragePathRelativeToSolutionDir>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.5.9.{build}'
+version: '2.6.0.{build}'
 skip_tags: true
 install:
 - ps: |
@@ -18,6 +18,8 @@ install:
 
     git submodule update --recursive --force
     nuget restore GitHubVS.sln
+- choco install --no-progress BCC-MSBuildLog
+- choco install --no-progress BCC-Submission
 build_script:
 - ps: scripts\build.ps1 -AppVeyor -BuildNumber:$env:APPVEYOR_BUILD_NUMBER
 test:
@@ -30,6 +32,5 @@ on_success:
       script\Sign-Package -AppVeyor
     }
 on_finish:
-- ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release
-- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-msbuildlog\0.0.2-alpha\tools\net471\BCC.MSBuildLog.exe -i output.binlog -o checkrun.json -c "%APPVEYOR_BUILD_FOLDER%"
-- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-submission\0.0.2-alpha\tools\net471\BCC.Submission.exe -i checkrun.json -t "%BCC_TOKEN%" -h "%APPVEYOR_REPO_COMMIT%"
+- IF NOT "%BCC_TOKEN%x"=="x" BCCMSBuildLog --cloneRoot "%APPVEYOR_BUILD_FOLDER%" --input output.binlog --output checkrun.json --ownerRepo %APPVEYOR_REPO_NAME% --hash %APPVEYOR_REPO_COMMIT%
+- IF NOT "%BCC_TOKEN%x"=="x" BCCSubmission -h %APPVEYOR_REPO_COMMIT% -i checkrun.json -t %BCC_TOKEN%

codecov.yml

@@ -32,3 +32,4 @@ ignore:
   - "*.xaml"
   - "*.xaml.cs"
   - "**/SampleData/*"
+  - "src/GitHub.App/sqlite-net/*"

docs/readme.md

@@ -4,6 +4,10 @@
 
 Get GitHub for Visual Studio set up to bring the GitHub flow to Visual Studio. Authenticate to GitHub.com or GitHub Enterprise, keep the extension up-to-date, and review your preferred settings.
 
-### [Contributing to Projects with GitHub for Visual Studio](contributing/index.md)
+### [Using GitHub for Visual Studio](using/index.md)
 
-Use GitHub for Visual Studio to manage your projects and work with pull requests.
+Use GitHub for Visual Studio to manage your projects and work with pull requests.
+
+### [Developing GitHub for Visual Studio](developer/readme.md)
+
+Documentation for hacking on GitHub for Visual Studio.

docs/using/index.md

@@ -1,4 +1,4 @@
-# Contributing to Projects with GitHub for Visual Studio
+# Using GitHub for Visual Studio
 
 Use GitHub for Visual Studio to manage your projects and work with pull requests.
 

lib/16.0/Microsoft.TeamFoundation.Client.dll

@@ -6,6 +6,7 @@
 [assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.App.Resources.resources")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String)")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String,System.Text.Encoding)")]
+
 // This file is used by Code Analysis to maintain SuppressMessage 
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given 

lib/16.0/Microsoft.TeamFoundation.Common.dll

@@ -0,0 +1,15 @@
+using GitHub.ViewModels;
+
+namespace GitHub.Models.Drafts
+{
+    /// <summary>
+    /// Stores a draft for a <see cref="CommentViewModel"/>
+    /// </summary>
+    public class CommentDraft
+    {
+        /// <summary>
+        /// Gets or sets the draft comment body.
+        /// </summary>
+        public string Body { get; set; }
+    }
+}

lib/16.0/Microsoft.TeamFoundation.Controls.dll

@@ -0,0 +1,20 @@
+using GitHub.ViewModels.GitHubPane;
+
+namespace GitHub.Models.Drafts
+{
+    /// <summary>
+    /// Stores a draft for a <see cref="PullRequestCreationViewModel"/>.
+    /// </summary>
+    public class PullRequestDraft
+    {
+        /// <summary>
+        /// Gets or sets the draft pull request title.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets the draft pull request body.
+        /// </summary>
+        public string Body { get; set; }
+    }
+}

lib/16.0/Microsoft.TeamFoundation.Git.Client.dll

@@ -0,0 +1,21 @@
+using System;
+using GitHub.ViewModels;
+
+namespace GitHub.Models.Drafts
+{
+    /// <summary>
+    /// Stores a draft for a <see cref="PullRequestReviewCommentViewModel"/>
+    /// </summary>
+    public class PullRequestReviewCommentDraft : CommentDraft
+    {
+        /// <summary>
+        /// Gets or sets the side of the diff that the draft comment was left on.
+        /// </summary>
+        public DiffSide Side { get; set; }
+
+        /// <summary>
+        /// Gets or sets the time that the draft was last updated.
+        /// </summary>
+        public DateTimeOffset UpdatedAt { get; set; }
+    }
+}

lib/16.0/Microsoft.TeamFoundation.Git.Controls.dll

@@ -0,0 +1,15 @@
+using GitHub.ViewModels.GitHubPane;
+
+namespace GitHub.Models.Drafts
+{
+    /// <summary>
+    /// Stores a draft for a <see cref="PullRequestReviewAuthoringViewModel"/>.
+    /// </summary>
+    public class PullRequestReviewDraft
+    {
+        /// <summary>
+        /// Gets or sets the draft review body.
+        /// </summary>
+        public string Body { get; set; }
+    }
+}

lib/16.0/Microsoft.TeamFoundation.Git.Provider.dll

@@ -1,23 +1,21 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using GitHub.ViewModels;
 using ReactiveUI;
 
 namespace GitHub.SampleData
 {
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    public class CommentThreadViewModelDesigner : ICommentThreadViewModel
+    public class CommentThreadViewModelDesigner : ViewModelBase, ICommentThreadViewModel
     {
-        public ObservableCollection<ICommentViewModel> Comments { get; }
-            = new ObservableCollection<ICommentViewModel>();
+        public IReadOnlyReactiveList<ICommentViewModel> Comments { get; }
+            = new ReactiveList<ICommentViewModel>();
 
         public IActorViewModel CurrentUser { get; set; }
             = new ActorViewModel { Login = "shana" };
 
-        public ReactiveCommand<string, Unit> PostComment { get; }
-        public ReactiveCommand<Tuple<string, string>, Unit> EditComment { get; }
-        public ReactiveCommand<Tuple<int, int>, Unit> DeleteComment { get; }
+        public Task DeleteComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task EditComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task PostComment(ICommentViewModel comment) => Task.CompletedTask;
     }
 }

src/GitHub.App/GlobalSuppressions.cs

@@ -24,7 +24,7 @@ public CommentViewModelDesigner()
         public bool IsSubmitting { get; set; }
         public bool CanDelete { get; } = true;
         public ICommentThreadViewModel Thread { get; }
-        public DateTimeOffset UpdatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
+        public DateTimeOffset CreatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
         public IActorViewModel Author { get; set; }
         public Uri WebUrl { get; }
 

src/GitHub.App/Models/Drafts/CommentDraft.cs

@@ -38,7 +38,7 @@ public SelectPageViewModelDesigner()
         public IReadOnlyList<IRepositoryItemViewModel> Items { get; }
         public ICollectionView ItemsView { get; }
         public IRepositoryItemViewModel SelectedItem { get; set; }
-        public IRepositoryModel Repository { get; }
+        public RepositoryModel Repository { get; }
 
         public void Initialize(IConnection connection)
         {

src/GitHub.App/Models/Drafts/PullRequestDraft.cs

@@ -35,9 +35,9 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public string Title => null;
 
-        public IRepositoryModel SourceRepository { get; set; }
+        public RepositoryModel SourceRepository { get; set; }
 
-        public IRepositoryModel DestinationRepository { get; set; }
+        public RepositoryModel DestinationRepository { get; set; }
 
         public IAccount DestinationAccount { get; }
 
@@ -57,7 +57,7 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public string Error { get; } = "I AM ERROR";
 
-        public Task InitializeAsync(ILocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
+        public Task InitializeAsync(LocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
         {
             return Task.CompletedTask;
         }

src/GitHub.App/Models/Drafts/PullRequestReviewCommentDraft.cs

@@ -33,17 +33,17 @@ public ForkRepositorySelectViewModelDesigner()
 
         public IObservable<object> Done => null;
 
-        public IReadOnlyList<IRemoteRepositoryModel> ExistingForks { get; set; }
+        public IReadOnlyList<RemoteRepositoryModel> ExistingForks { get; set; }
 
         public bool IsLoading { get; set; }
 
         public string Title => null;
 
-        public ReactiveCommand<IAccount, Unit> SelectedAccount => null;
+        public ReactiveCommand<IAccount, IAccount> SelectedAccount => null;
 
-        public ReactiveCommand<IRemoteRepositoryModel, Unit> SwitchOrigin => null;
+        public ReactiveCommand<RemoteRepositoryModel, Unit> SwitchOrigin => null;
 
-        public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection)
+        public Task InitializeAsync(LocalRepositoryModel repository, IConnection connection)
         {
             return Task.CompletedTask;
         }