Merge branch 'master' into feature/pr-conversation

Author: grokys

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

@@ -40,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

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%

src/GitHub.App/GlobalSuppressions.cs

@@ -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 

src/GitHub.App/SampleData/Dialog/Clone/SelectPageViewModelDesigner.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/SampleData/Documents/PullRequestPageViewModelDesigner.cs

@@ -93,15 +93,15 @@ Depends on #1993
         public int CommitCount { get; set; } = 2;
         public string Body { get; set; }
         public int Number { get; set; } = 1994;
-        public ILocalRepositoryModel LocalRepository { get; }
-        public IRemoteRepositoryModel Repository { get; set; }
+        public LocalRepositoryModel LocalRepository { get; }
+        public RemoteRepositoryModel Repository { get; set; }
         public string Title { get; set; } = "Save drafts of comments";
         public Uri WebUrl { get; set; }
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
         public ReactiveCommand<string, Unit> ShowCommit { get; }
 
 
-        public Task InitializeAsync(IRemoteRepositoryModel repository, ILocalRepositoryModel localRepository, ActorModel currentUser, PullRequestDetailModel model)
+        public Task InitializeAsync(RemoteRepositoryModel repository, LocalRepositoryModel localRepository, ActorModel currentUser, PullRequestDetailModel model)
         {
             throw new NotImplementedException();
         }

src/GitHub.App/SampleData/ForkRepositoryExecuteViewModelDesigner.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/SampleData/ForkRepositorySelectViewModelDesigner.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;
         }

src/GitHub.App/SampleData/ForkRepositorySwitchViewModelDesigner.cs

@@ -29,9 +29,9 @@ public ForkRepositorySwitchViewModelDesigner()
 
         public IObservable<object> Done => null;
 
-        public IRepositoryModel SourceRepository { get; }
+        public RepositoryModel SourceRepository { get; }
 
-        public IRepositoryModel DestinationRepository { get; }
+        public RepositoryModel DestinationRepository { get; }
 
         public ReactiveCommand<Unit, Unit> SwitchFork => null;
 
@@ -41,7 +41,7 @@ public ForkRepositorySwitchViewModelDesigner()
 
         public bool UpdateOrigin { get; set; } = true;
 
-        public void Initialize(ILocalRepositoryModel sourceRepository, IRemoteRepositoryModel remoteRepository)
+        public void Initialize(LocalRepositoryModel sourceRepository, RemoteRepositoryModel remoteRepository)
         {
         }
     }

src/GitHub.App/SampleData/GitServiceDesigner.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.Services;
 using LibGit2Sharp;
@@ -7,6 +8,8 @@ namespace GitHub.SampleData
 {
     class GitServiceDesigner : IGitService
     {
+        public LocalRepositoryModel CreateLocalRepositoryModel(string localPath) => null;
+        public BranchModel GetBranch(LocalRepositoryModel model) => null;
         public Task<string> GetLatestPushedSha(string path, string remote = "origin") => Task.FromResult<string>(null);
         public UriString GetRemoteUri(IRepository repo, string remote = "origin") => null;
         public IRepository GetRepository(string path) => null;