Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 63964ce

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into move-usage-service-usage
2 parents d36c33e + bc1de12 commit 63964ce

File tree

95 files changed

+1650
-1732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1650
-1732
lines changed

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
[submodule "submodules/akavache"]
1111
path = submodules/akavache
1212
url = https://github.com/editor-tools/Akavache
13-
[submodule "script"]
14-
path = script
15-
url = [email protected]:github/VisualStudioBuildScripts
1613
[submodule "submodules/octokit.graphql.net"]
1714
path = submodules/octokit.graphql.net
1815
url = https://github.com/octokit/octokit.graphql.net

‎Directory.Build.Props

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.10.2.0</Version>
4+
<Version>2.10.8.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
66
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Nerdbank.GitVersioning">
10+
<Version>3.0.26</Version>
11+
<PrivateAssets>all</PrivateAssets>
12+
</PackageReference>
13+
</ItemGroup>
814
</Project>

‎GitHubVS.sln

+1-28
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2
1414
ProjectSection(SolutionItems) = preProject
1515
.editorconfig = .editorconfig
1616
README.md = README.md
17+
version.json = version.json
1718
EndProjectSection
1819
EndProject
1920
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}"
@@ -31,33 +32,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules",
3132
test\UnitTests\Args.cs = test\UnitTests\Args.cs
3233
EndProjectSection
3334
EndProject
34-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
35-
ProjectSection(SolutionItems) = preProject
36-
scripts\Modules\BuildUtils.psm1 = scripts\Modules\BuildUtils.psm1
37-
scripts\Modules\Debugging.psm1 = scripts\Modules\Debugging.psm1
38-
scripts\modules\Versioning.ps1 = scripts\modules\Versioning.ps1
39-
scripts\modules\Vsix.ps1 = scripts\modules\Vsix.ps1
40-
EndProjectSection
41-
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C5F8D-14B3-443D-B044-0E209AE12BDF}"
43-
ProjectSection(SolutionItems) = preProject
44-
.gitattributes = .gitattributes
45-
.gitignore = .gitignore
46-
appveyor.yml = appveyor.yml
47-
scripts\build.ps1 = scripts\build.ps1
48-
scripts\Bump-Version.ps1 = scripts\Bump-Version.ps1
49-
scripts\common.ps1 = scripts\common.ps1
50-
scripts\Get-CheckedOutBranch.ps1 = scripts\Get-CheckedOutBranch.ps1
51-
scripts\Get-HeadSha1.ps1 = scripts\Get-HeadSha1.ps1
52-
scripts\modules.ps1 = scripts\modules.ps1
53-
nuget.config = nuget.config
54-
scripts\Require-CleanWorkTree.ps1 = scripts\Require-CleanWorkTree.ps1
55-
scripts\Run-CodeCoverage.ps1 = scripts\Run-CodeCoverage.ps1
56-
scripts\Run-NUnit.ps1 = scripts\Run-NUnit.ps1
57-
scripts\Run-Tests.ps1 = scripts\Run-Tests.ps1
58-
scripts\Run-XUnit.ps1 = scripts\Run-XUnit.ps1
59-
EndProjectSection
60-
EndProject
6135
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A7DA2E7-262B-4581-807A-1C45CE79CDFD}"
6236
EndProject
6337
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Exports", "src\GitHub.Exports\GitHub.Exports.csproj", "{9AEA02DB-02B5-409C-B0CA-115D05331A6B}"
@@ -519,7 +493,6 @@ Global
519493
HideSolutionNode = FALSE
520494
EndGlobalSection
521495
GlobalSection(NestedProjects) = preSolution
522-
{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1} = {7B6C5F8D-14B3-443D-B044-0E209AE12BDF}
523496
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
524497
{08DD4305-7787-4823-A53F-4D0F725A07F3} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}
525498
{674B69B8-0780-4D54-AE2B-C15821FA51CB} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}

‎Key.snk

596 Bytes
Binary file not shown.

‎README.md

+16-56
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# GitHub Extension for Visual Studio
22

3-
## Notices
4-
5-
### If you are having issues with the installer, please read
6-
7-
If you need to upgrade, downgrade, or uninstall the extension, and are having problems doing so, refer to this issue: https://github.com/github/VisualStudio/issues/1394 which details common problems and solutions when using the installer.
8-
9-
### The location of the submodules has changed as of 31-01-2017
10-
11-
If you have an existing clone, make sure to run `git submodule sync` to update your local clone with the new locations for the submodules.
12-
133
## About
144

155
The GitHub Extension for Visual Studio provides GitHub integration in Visual Studio 2015 and newer.
166
Most of the extension UI lives in the Team Explorer pane, which is available from the View menu.
177

18-
Official builds of this extension are available at [the official website](https://visualstudio.github.com).
8+
Official builds of this extension are available at the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=GitHub.GitHubExtensionforVisualStudio).
199

20-
[![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
21-
[![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)
22-
[![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
10+
[![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=10&branchName=master)
2311

2412
[![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)
2513

@@ -28,57 +16,29 @@ Visit the [documentation](https://github.com/github/VisualStudio/tree/master/doc
2816

2917
## Build requirements
3018

31-
* Visual Studio 2017 (15.7.4)+
32-
* Visual Studio SDK
33-
* The built VSIX will work with Visual Studio 2015 or newer
19+
* Visual Studio 2019
20+
* `.NET desktop development` workload
21+
* `.NET Core cross platform development` workload
22+
* `Visual Studio extension development` workload
3423

35-
## Build
24+
The built VSIX will work with Visual Studio 2015 or newer
3625

37-
Clone the repository and its submodules in a git GUI client or via the command line:
26+
## Build
3827

39-
```txt
40-
git clone https://github.com/github/VisualStudio
41-
cd VisualStudio
42-
git submodule init
43-
git submodule deinit script
44-
git submodule update
45-
```
28+
Clone the repository and its submodules.
4629

47-
Open the `GitHubVS.sln` solution with Visual Studio 2017+.
4830
To be able to use the GitHub API, you'll need to:
4931

50-
- [Register a new developer application](https://github.com/settings/developers) in your profile.
51-
- Open [src/GitHub.Api/ApiClientConfiguration_User.cs](src/GitHub.Api/ApiClientConfiguration_User.cs) and fill out the clientId/clientSecret fields for your application. **Note this has recently changed location, so you may need to re-do this**
52-
53-
Build using Visual Studio 2017 or:
54-
55-
```txt
56-
build.cmd
57-
```
58-
59-
Install in live (non-Experimental) instances of Visual Studio 2015 and 2017:
60-
61-
```txt
62-
install.cmd
63-
```
32+
- [Register a new developer application](https://github.com/settings/developers) in your profile
33+
- Create an environment variable `GitHubVS_ClientID` with your `Client ID`
34+
- Create an environment variable `GitHubVS_ClientSecret` with your `Client Secret`
6435

65-
Note, the script will only install in one instance of Visual Studio 2017 (Enterprise, Professional or Community).
36+
Execute `build.cmd`
6637

67-
## Build Flavors
38+
## Visual Studio Build
6839

69-
The following can be executed via `cmd.exe`.
40+
Build `GitHubVS.sln` using Visual Studio 2019.
7041

71-
To build and install a `Debug` configuration VSIX:
72-
```txt
73-
build.cmd Debug
74-
install.cmd Debug
75-
```
76-
77-
To build and install a `Release` configuration VSIX:
78-
```txt
79-
build.cmd Release
80-
install.cmd Release
81-
```
8242
## Logs
8343
Logs can be viewed at the following location:
8444

@@ -109,6 +69,6 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
10969

11070
## Copyright
11171

112-
Copyright 2015 - 2018 GitHub, Inc.
72+
Copyright 2015 - 2019 GitHub, Inc.
11373

11474
Licensed under the [MIT License](LICENSE.md)

‎appveyor.yml

-75
This file was deleted.

0 commit comments

Comments
 (0)