Merge branch 'master' into l10n_master_translated

Author: StanleyGoldman

GitHubVS.sln

@@ -141,6 +141,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL.Core", "sub
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL", "submodules\octokit.graphql.net\Octokit.GraphQL\Octokit.GraphQL.csproj", "{791B408C-0ABC-465B-9EB1-A2422D67F418}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage.UnitTests", "test\GitHub.StartPage.UnitTests\GitHub.StartPage.UnitTests.csproj", "{B467682B-9F0E-42D8-8A20-1DE78F798793}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -493,6 +495,14 @@ Global
 		{791B408C-0ABC-465B-9EB1-A2422D67F418}.Release|Any CPU.Build.0 = Release|Any CPU
 		{791B408C-0ABC-465B-9EB1-A2422D67F418}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
 		{791B408C-0ABC-465B-9EB1-A2422D67F418}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
+		{B467682B-9F0E-42D8-8A20-1DE78F798793}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -527,6 +537,7 @@ Global
 		{65542DEE-D3BE-4810-B85A-08E970413A21} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
 		{3321CE72-26ED-4D1E-A8F5-6901FB783007} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}
 		{791B408C-0ABC-465B-9EB1-A2422D67F418} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}
+		{B467682B-9F0E-42D8-8A20-1DE78F798793} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {556014CF-5B35-4CE5-B3EF-6AB0007001AC}

appveyor.yml

@@ -1,9 +1,24 @@
 os: Visual Studio 2017
 version: '2.8.0.{build}'
 skip_tags: true
+
 install:
+- choco install --no-progress BCC-MSBuildLog
+- choco install --no-progress BCC-Submission
 - ps: |
     $full_build = Test-Path env:GHFVS_KEY
+    $forVSInstaller = $env:BUILD_TYPE -eq "vsinstaller"
+    $forPackage = $env:BUILD_TYPE -eq "package"
+    $package = $full_build -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $forVSInstaller -or $forPackage)
+
+    $message = "Building "
+    if ($package) { $message += "and packaging "}
+    $message += "version " + $env:APPVEYOR_BUILD_NUMBER + " "
+
+    if ($full_build) { $message += "(full build)" } else { $message += "(partial build)" }
+    if ($forVSInstaller) { $message += " for the VS installer" }
+    Write-Host $message
+
     git submodule init
     git submodule sync
 
@@ -18,19 +33,42 @@ 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
+- ps: scripts\build.ps1 -AppVeyor -Package:$package -BuildNumber:$env:APPVEYOR_BUILD_NUMBER -ForVSInstaller:$forVSInstaller
+
 test:
   categories:
     except:
       - Timings
+
 on_success:
 - ps: |
-    if ($full_build) {
-      script\Sign-Package -AppVeyor
+    if ($package) {
+      Write-Host "Signing and packaging"
+      script\Sign-Package -AppVeyor -ForVSInstaller:$forVSInstaller
     }
-on_finish:
-- 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%
+
+for:
+-
+  branches:
+    except:
+      - /releases/.*-vsinstaller/
+  environment:
+    matrix:
+      - BUILD_TYPE: normal
+-
+  branches:
+    only:
+      - /releases/.*-vsinstaller/
+  environment:
+    matrix:
+      - BUILD_TYPE: package
+      - BUILD_TYPE: vsinstaller
+-
+  branches:
+    only:
+      - master
+  environment:
+    matrix:
+      - BUILD_TYPE: package

azure-pipelines.yml

@@ -48,15 +48,14 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
-# VSTest is hanging. Skip tests for now; we're still running Appveyor which will handle the tests.
-#- task: VSTest@2
-#  inputs:
-#    searchFolder: '$(Build.SourcesDirectory)\test'
-#    testAssemblyVer2: '**\bin\**\*Tests.dll'
-#    platform: '$(buildPlatform)'
-#    configuration: '$(buildConfiguration)'
-#    diagnosticsEnabled: true
-#    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
+- task: VSTest@2
+  inputs:
+    searchFolder: '$(Build.SourcesDirectory)\test'
+    testAssemblyVer2: '**\bin\**\*Tests.dll'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+    diagnosticsEnabled: true
+    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
 
 - task: PublishBuildArtifacts@1
   inputs:

docs/using/publishing-an-existing-project-to-github.md

@@ -10,5 +10,5 @@
 5. Click the **Publish to GitHub** button.
 ![Location of the Publish to GitHub button in the Team Explorer pane](images/publish-to-github.png)
 6. Enter a name and description for the repository on GitHub.
-7. Check the **Private Repository** box if you want to upload the repository as a private repository on GitHub. You must have a [Developer, Team or Business account](https://github.com/pricing) to create private repositories.
+7. Check the **Private Repository** box if you want to upload the repository as a private repository on GitHub.
 8. Click the **Publish** button.

scripts/build.ps1

@@ -38,6 +38,10 @@ Param(
     ,
     [switch]
     $Trace = $false
+    ,
+    [switch]
+    $ForVSInstaller = $false
+
 )
 
 Set-StrictMode -Version Latest
@@ -53,6 +57,10 @@ Vsix | out-null
 
 Push-Location $rootDirectory
 
+if ($Package -and $BuildNumber -gt -1) {
+    $BumpVersion = $true
+}
+
 if ($UpdateSubmodules) {
     Update-Submodules
 }
@@ -61,13 +69,6 @@ if ($Clean) {
 	Clean-WorkingTree
 }
 
-$fullBuild = Test-Path env:GHFVS_KEY
-$publishable = $fullBuild -and $AppVeyor -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $env:APPVEYOR_REPO_BRANCH -eq "master")
-if ($publishable) { #forcing a deploy flag for CI
-    $Package = $true
-    $BumpVersion = $true
-}
-
 if ($BumpVersion) {
     Write-Output "Bumping the version"
     Bump-Version -BumpBuild -BuildNumber:$BuildNumber
@@ -79,6 +80,6 @@ if ($Package) {
     Write-Output "Building GitHub for Visual Studio"
 }
 
-Build-Solution GitHubVs.sln "Build" $config -Deploy:$Package
+Build-Solution GitHubVs.sln "Build" $config -Deploy:$Package -ForVSInstaller:$ForVSInstaller
 
 Pop-Location

scripts/modules.ps1

@@ -114,7 +114,7 @@ New-Module -ScriptBlock {
         $msbuild
     }
 
-    function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller, [bool]$Deploy = $false) {
+    function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller = $false, [bool]$Deploy = $false) {
         $msbuild = Find-MSBuild
 
         Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed -MSBuildPath (Split-Path -parent $msbuild) }
@@ -185,7 +185,7 @@ New-Module -ScriptBlock {
 
 New-Module -ScriptBlock {
     function Write-Manifest([string]$directory) {
-        Add-Type -Path (Join-Path $rootDirectory packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll)
+        Add-Type -Path (Join-Path $rootDirectory build\Release\Newtonsoft.Json.dll)
 
         $manifest = @{
             NewestExtension = @{

scripts/test.ps1

@@ -97,6 +97,12 @@ if (!$?) {
     $exitcode = 11
 }
 
+Write-Output "Running GitHub.StartPage.UnitTests..."
+Run-NUnit test GitHub.StartPage.UnitTests $TimeoutDuration $config
+if (!$?) {
+    $exitcode = 12
+}
+
 if ($exitcode -ne 0) {
     $host.SetShouldExit($exitcode)
 }

src/GitHub.App/Models/PullRequestModel.cs

@@ -110,8 +110,8 @@ public string Title
             }
         }
 
-        PullRequestStateEnum status;
-        public PullRequestStateEnum State
+        PullRequestState status;
+        public PullRequestState State
         {
             get { return status; }
             set
@@ -126,8 +126,8 @@ public PullRequestStateEnum State
         }
 
         // TODO: Remove these property once maintainer workflow has been merged to master.
-        public bool IsOpen => State == PullRequestStateEnum.Open;
-        public bool Merged => State == PullRequestStateEnum.Merged;
+        public bool IsOpen => State == PullRequestState.Open;
+        public bool Merged => State == PullRequestState.Merged;
 
         int commentCount;
         public int CommentCount

src/GitHub.App/Properties/AssemblyInfo.cs

@@ -2,7 +2,9 @@
 
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData.Dialog.Clone")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData.Documents")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog.Clone")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Documents")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.GitHubPane")]

src/GitHub.App/SampleData/CommentViewModelDesigner.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
+using System.Threading.Tasks;
+using GitHub.Models;
 using GitHub.ViewModels;
 using ReactiveUI;
 
@@ -22,7 +24,9 @@ public CommentViewModelDesigner()
         public CommentEditState EditState { get; set; }
         public bool IsReadOnly { get; set; }
         public bool IsSubmitting { get; set; }
+        public bool CanCancel { get; } = true;
         public bool CanDelete { get; } = true;
+        public string CommitCaption { get; set; } = "Comment";
         public ICommentThreadViewModel Thread { get; }
         public DateTimeOffset CreatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
         public IActorViewModel Author { get; set; }
@@ -31,7 +35,12 @@ public CommentViewModelDesigner()
         public ReactiveCommand<Unit, Unit> BeginEdit { get; }
         public ReactiveCommand<Unit, Unit> CancelEdit { get; }
         public ReactiveCommand<Unit, Unit> CommitEdit { get; }
-        public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
+        public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; } = ReactiveCommand.Create(() => { });
         public ReactiveCommand<Unit, Unit> Delete { get; }
+
+        public Task InitializeAsync(ICommentThreadViewModel thread, ActorModel currentUser, CommentModel comment, CommentEditState state)
+        {
+            return Task.CompletedTask;
+        }
     }
 }

src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs

@@ -2,6 +2,7 @@
 using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Models;
+using GitHub.Primitives;
 using GitHub.ViewModels;
 using GitHub.ViewModels.Dialog.Clone;
 using ReactiveUI;
@@ -17,13 +18,13 @@ public RepositoryCloneViewModelDesigner()
         }
 
         public string Path { get; set; }
+        public UriString Url { get; set; }
         public string PathWarning { get; set; }
         public int SelectedTabIndex { get; set; }
         public string Title => null;
         public IObservable<object> Done => null;
         public IRepositorySelectViewModel GitHubTab { get; }
         public IRepositorySelectViewModel EnterpriseTab { get; }
-        public IRepositoryUrlViewModel UrlTab { get; }
         public ReactiveCommand<Unit, Unit> Browse { get; }
         public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
 

src/GitHub.App/SampleData/Documents/IssueishCommentThreadViewModelDesigner.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.ViewModels;
+using GitHub.ViewModels.Documents;
+using ReactiveUI;
+
+namespace GitHub.SampleData.Documents
+{
+    public class IssueishCommentThreadViewModelDesigner : ViewModelBase, IIssueishCommentThreadViewModel
+    {
+        public IActorViewModel CurrentUser { get; } = new ActorViewModelDesigner("grokys");
+        public Task InitializeAsync(ActorModel currentUser, IssueishDetailModel model, bool addPlaceholder) => Task.CompletedTask;
+        public Task DeleteComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task EditComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task PostComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task CloseOrReopen(ICommentViewModel comment) => Task.CompletedTask;
+    }
+}