Merge branch 'master' into fixes/1469-indent-heuristic

Author: jcansdale

.github/ISSUE_TEMPLATE/localization_suggestion.md

@@ -0,0 +1,45 @@
+---
+name: Localization suggestion
+about: Suggest an improvement to our localization
+labels: localization, bug
+title: 'Localization: '
+---
+<!-- Hello! Please read the [Contributing Guidelines](https://github.com/github/VisualStudio/blob/master/CONTRIBUTING.md) before submitting an issue regarding the GitHub Extension for Visual Studio. -->
+## Language
+<!-- Czech -->
+<!-- German -->
+<!-- Spanish -->
+<!-- French -->
+<!-- Italian -->
+<!-- Japanese -->
+<!-- Korean -->
+<!-- Polish -->
+<!-- Portuguese (Brazil) -->
+<!-- Russian -->
+<!-- Turkish -->
+<!-- Chinese (Simplified) -->
+<!-- Chinese (Traditional) -->
+
+## English source
+<!-- Translations are made from the English sources, please paste it here. -->
+```
+
+```
+
+## Original Translation
+<!-- Please paste the original translation here. -->
+```
+
+```
+
+## Screenshots
+<!-- Translations are sometimes provided by vendors that do not have access to the UI. Providing screenshots can give them a lot of context. -->
+
+## Notes
+<!-- If you can, please explain what is incorrect about the translation. -->
+
+## Suggested Translation
+<!-- If you can, please suggest an alternate translation. -->
+```
+
+```

Directory.Build.Props

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

GitHubVS.sln

@@ -1,8 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28603.18
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.Vsix", "src\GitHub.VisualStudio.Vsix\GitHub.VisualStudio.Vsix.csproj", "{D26B4B40-0C94-48AD-8019-0B9BE46E0071}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7F5ED78B-74A3-4406-A299-70CFB5885B8B} = {7F5ED78B-74A3-4406-A299-70CFB5885B8B}
@@ -33,7 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F
 	ProjectSection(SolutionItems) = preProject
 		scripts\Modules\BuildUtils.psm1 = scripts\Modules\BuildUtils.psm1
 		scripts\Modules\Debugging.psm1 = scripts\Modules\Debugging.psm1
-		scripts\Modules\Vsix.psm1 = scripts\Modules\Vsix.psm1
+		scripts\modules\Versioning.ps1 = scripts\modules\Versioning.ps1
+		scripts\modules\Vsix.ps1 = scripts\modules\Vsix.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C5F8D-14B3-443D-B044-0E209AE12BDF}"
@@ -141,6 +144,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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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
@@ -149,6 +154,14 @@ Global
 		ReleaseWithoutVsix|Any CPU = ReleaseWithoutVsix|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.DebugWithoutVsix|Any CPU.Build.0 = DebugWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.ReleaseWithoutVsix|Any CPU.ActiveCfg = ReleaseWithoutVsix|Any CPU
+		{D26B4B40-0C94-48AD-8019-0B9BE46E0071}.ReleaseWithoutVsix|Any CPU.Build.0 = ReleaseWithoutVsix|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugWithoutVsix|Any CPU
@@ -493,6 +506,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 +548,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}

README.md

@@ -19,26 +19,18 @@ 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)
 [![Build Status](https://github-editor-tools.visualstudio.com/VisualStudio/_apis/build/status/github.VisualStudio?branchName=master)](https://github-editor-tools.visualstudio.com/VisualStudio/_build/latest?definitionId=4&branchName=master)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio)
 [![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)
+[![Follow GitHub for Visual Studio](https://img.shields.io/twitter/follow/GitHubVS.svg?style=social "Follow GitHubVS")](https://twitter.com/githubvs?ref_src=twsrc%5Etfw) [![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)
 
 ## Documentation
 Visit the [documentation](https://github.com/github/VisualStudio/tree/master/docs) for details on how to use the features in the GitHub Extension for Visual Studio.
 
-## Installing beta versions
-
-Older and pre-release/beta/untested versions are available at [the releases page](https://github.com/github/VisualStudio/releases), and also via a custom gallery feed for Visual Studio.
-
-You can configure the gallery by going to `Tools / Options / Extensions and Updates` and adding a new gallery with the url https://visualstudio.github.com/releases/feed.rss. The gallery will now be available from `Tools / Extensions and Updates`.
-
-Beta releases will have `(beta)` in their title in the gallery, following the version number. You can view the release notes in the gallery by hovering over the description, or by clicking the `Release Notes` link on the right side.
-
 ## Build requirements
 
 * Visual Studio 2017 (15.7.4)+
 * Visual Studio SDK
+* The built VSIX will work with Visual Studio 2015 or newer
 
 ## Build
 

appveyor.yml

@@ -1,9 +1,24 @@
 os: Visual Studio 2017
-version: '2.7.0.{build}'
+version: '2.9.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,43 @@ 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
+      - /releases/(?:(?!-vsinstaller).)*?/
+  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:

crowdin.yml

@@ -2,7 +2,7 @@
 
 After you provide your GitHub or GitHub Enterprise credentials to GitHub for Visual Studio, the extension automatically detects the personal, collaborator and organization repositories you have access to on your account.
 
-## Opening the clone dialog 
+## Opening the clone dialog
 
 ### From **Team Explorer**
 
@@ -17,7 +17,12 @@ Next to the account you want to clone from, click **Clone**.
 
 ### From the **Start Page**
 
-Using Visual Studio 2017, click the `GitHub` button on the `Start Page` to open the clone dialog. 
+Using Visual Studio 2017, click the `GitHub` button on the `Start Page` to open the clone dialog.
+
+
+### From the **Start Window**
+
+Using Visual Studio 2019, on the `Start Window` select `Clone or check out code` and then click the `GitHub` button to open the clone dialog.
 
 
 ### From the **File** menu
@@ -26,14 +31,19 @@ Go to `File > Open > Open From GitHub...`
 
 
 ## Clone repositories
-1. In the list of repositories, scroll until you find the repository you'd like to clone. You can also filter the repository results by using the *Filter* text box.
+1. In the list of repositories, scroll until you find the repository you'd like to clone.
 
-![List of GitHub repositories that can be cloned inside a dialog](images/clone-dialog.png)
+You can also filter the repository results by using the *Filter* text box.
 
-In addition to using the list of personal, collaborator and organization repositories, you can use the URL tab to clone a public repository by its URL or using the repository owner and name.
+In addition to using the list of personal, collaborator and organization repositories, you can enter a repository URL to clone a public repository.
 
-![List of GitHub repositories that can be cloned inside a dialog](images/clone-url-dialog.png)
+![Unified clone and open dialog](images/unified-clone-dialog.png)
 
 2. If desired, change the local path that the repository will be cloned into, or leave the default as-is.
 3. Once a repository is selected and the path is set, Click **Clone**.
 4. In Team Explorer, under the list of solutions, double-click on a solution to open it in Visual Studio.
+
+## Open repositories
+For any repository that you select from the list or provide a URL for that you already have cloned locally, the **Open** button becomes enabled and a message shows that you have already cloned the repository to that location.
+
+![Open option enabled in clone dialog](images/open-cloned-repository.png)