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

Commit f1d3741

Browse files
laurentkempelaurentkempe
committed
Merge branch 'master' into fixes/1666-filter-pr-solution-explorer
2 parents a0c218d + 762d6cf commit f1d3741

File tree

843 files changed

+74158
-17931
lines changed

Some content is hidden

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

843 files changed

+74158
-17931
lines changed

Diff for: ‎.editorconfig

+69-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,73 @@
11
# top-most EditorConfig file
22
root = true
33

4-
[*.cs]
4+
[*.{cs,vb}]
5+
56
indent_style = space
6-
indent_size = 4
7+
indent_size = 4
8+
9+
# Organize usings
10+
dotnet_sort_system_directives_first = true
11+
12+
# this. preferences
13+
dotnet_style_qualification_for_field = false:silent
14+
dotnet_style_qualification_for_property = false:silent
15+
dotnet_style_qualification_for_method = false:silent
16+
dotnet_style_qualification_for_event = false:silent
17+
18+
# Language keywords vs BCL types preferences
19+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
20+
dotnet_style_predefined_type_for_member_access = true:suggestion
21+
22+
# Parentheses preferences
23+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
24+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
25+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
26+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
27+
28+
# Modifier preferences
29+
dotnet_style_require_accessibility_modifiers = never:silent
30+
dotnet_style_readonly_field = true:suggestion
31+
32+
# Expression-level preferences
33+
dotnet_style_object_initializer = true:suggestion
34+
dotnet_style_collection_initializer = true:suggestion
35+
dotnet_style_explicit_tuple_names = true:suggestion
36+
dotnet_style_null_propagation = true:suggestion
37+
dotnet_style_coalesce_expression = true:suggestion
38+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
39+
dotnet_style_prefer_auto_properties = true:silent
40+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
41+
dotnet_style_prefer_conditional_expression_over_return = true:silent
42+
43+
[*.cs]
44+
45+
# var preferences
46+
csharp_style_var_for_built_in_types = true:suggestion
47+
csharp_style_var_when_type_is_apparent = true:suggestion
48+
csharp_style_var_elsewhere = true:suggestion
49+
50+
# Expression-bodied members
51+
csharp_style_expression_bodied_methods = false:none
52+
csharp_style_expression_bodied_constructors = false:none
53+
csharp_style_expression_bodied_operators = false:none
54+
csharp_style_expression_bodied_properties = false:none
55+
csharp_style_expression_bodied_indexers = false:none
56+
csharp_style_expression_bodied_accessors = false:none
57+
58+
# Pattern matching preferences
59+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
60+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
61+
62+
# Null-checking preferences
63+
csharp_style_throw_expression = true:suggestion
64+
csharp_style_conditional_delegate_call = true:suggestion
65+
66+
# Expression-level preferences
67+
csharp_prefer_braces = true:suggestion
68+
csharp_style_deconstructed_variable_declaration = true:suggestion
69+
csharp_prefer_simple_default_expression = true:suggestion
70+
csharp_style_inlined_variable_declaration = true:suggestion
71+
72+
# Spacing options
73+
csharp_space_after_keywords_in_control_flow_statements = true

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve GitHub Extension for Visual Studio
4+
labels:
5+
6+
---
7+
8+
<!-- 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. -->
9+
10+
## Versions
11+
- GitHub Extension for Visual Studio version: ...
12+
- Visual Studio version: ...
13+
14+
## What happened
15+
<!--A clear and concise description of what the bug is.-->
16+
17+
### Steps to Reproduce
18+
Steps to reproduce the behavior:
19+
1. Go to '...'
20+
2. Click on '....'
21+
3. Scroll down to '....'
22+
4. See error
23+
24+
### Expected behavior
25+
<!--A clear and concise description of what you expected to happen.-->
26+
27+
### Screenshots
28+
<!--If applicable, add screenshots to help explain your problem.-->
29+
30+
### Logs
31+
<!--If applicable, add logs. To include log files:
32+
1. Close Visual Studio if it's open
33+
2. Open a Developer Command Prompt for VS2015
34+
3. Run devenv /log
35+
4. Reproduce your issue
36+
5. Close VS
37+
6. Locate the following files on your system and email them to [email protected] or create a gist and link it in the issue report:
38+
- `%appdata%\Microsoft\VisualStudio\14.0\ActivityLog.xml`
39+
- `%localappdata%\temp\extension.log`
40+
- `%localappdata%\GitHubVisualStudio\extension.log`
41+
- Windows Event Viewer
42+
-->
43+
44+
### Additional context
45+
<!--Add any other context about the problem here.-->

Diff for: ‎.github/ISSUE_TEMPLATE/feature_request.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
labels:
5+
6+
---
7+
8+
**Is your feature request related to a problem? Please describe.**
9+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
10+
11+
**Describe the solution you'd like**
12+
A clear and concise description of what you want to happen.
13+
14+
**Describe alternatives you've considered**
15+
A clear and concise description of any alternative solutions or features you've considered.
16+
17+
**Additional context**
18+
Add any other context or screenshots about the feature request here.

Diff for: ‎.github/ISSUE_TEMPLATE/localization_suggestion.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Localization suggestion
3+
about: Suggest an improvement to our localization
4+
labels: localization, bug
5+
title: 'Localization: '
6+
---
7+
<!-- 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. -->
8+
## Language
9+
<!-- Czech -->
10+
<!-- German -->
11+
<!-- Spanish -->
12+
<!-- French -->
13+
<!-- Italian -->
14+
<!-- Japanese -->
15+
<!-- Korean -->
16+
<!-- Polish -->
17+
<!-- Portuguese (Brazil) -->
18+
<!-- Russian -->
19+
<!-- Turkish -->
20+
<!-- Chinese (Simplified) -->
21+
<!-- Chinese (Traditional) -->
22+
23+
## English source
24+
<!-- Translations are made from the English sources, please paste it here. -->
25+
```
26+
27+
```
28+
29+
## Original Translation
30+
<!-- Please paste the original translation here. -->
31+
```
32+
33+
```
34+
35+
## Screenshots
36+
<!-- Translations are sometimes provided by vendors that do not have access to the UI. Providing screenshots can give them a lot of context. -->
37+
38+
## Notes
39+
<!-- If you can, please explain what is incorrect about the translation. -->
40+
41+
## Suggested Translation
42+
<!-- If you can, please suggest an alternate translation. -->
43+
```
44+
45+
```

Diff for: ‎.gitignore

+9-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ build/
2626
[Tt]est[Rr]esult*/
2727
[Bb]uild[Ll]og.*
2828

29-
#NUNIT
29+
# NUnit
3030
*.VisualState.xml
3131
TestResult.xml
32+
nunit-*.xml
3233

3334
# Build Results of an ATL Project
3435
[Dd]ebugPS/
@@ -238,8 +239,14 @@ coverage.xml
238239
#Msbuild binary log output
239240
output.binlog
240241

242+
# KDiff3
243+
*_BACKUP_*
244+
*_BASE_*
245+
*_LOCAL_*
246+
*_REMOTE_*
247+
*.orig
248+
241249
AkavacheSqliteLinkerOverride.cs
242250
NuGetBuild
243251
WiX.Toolset.DummyFile.txt
244-
nunit-*.xml
245252
GitHubVS.sln.DotSettings

Diff for: ‎.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
url = https://github.com/editor-tools/Akavache
1313
[submodule "script"]
1414
path = script
15-
url = [email protected]:github/VisualStudioBuildScripts
15+
url = [email protected]:github/VisualStudioBuildScripts
16+
[submodule "submodules/octokit.graphql.net"]
17+
path = submodules/octokit.graphql.net
18+
url = https://github.com/octokit/octokit.graphql.net

Diff for: ‎.ncrunch/GitHub.App.UnitTests.v3.ncrunchproject

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
</Settings>
5+
</ProjectConfiguration>

Diff for: ‎.ncrunch/GitHub.Exports.UnitTests.v3.ncrunchproject

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
</Settings>
5+
</ProjectConfiguration>

Diff for: ‎CODE_OF_CONDUCT.md

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [email protected]. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

Diff for: ‎CONTRIBUTING.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Hi there! We're thrilled that you'd like to contribute to the __GitHub Extension
99

1010
Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md).
1111

12-
This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
12+
Please note that this project is released with a [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
1313

1414
## Submitting a pull request
1515

@@ -41,6 +41,7 @@ Here are a few helpful tips when reporting a bug:
4141
- Verify that the bug resides in the GitHub for Visual Studio extension
4242
- A lot of functionality provided by this extension resides in the Team Explorer pane, alongside other non-GitHub tools to manage and collaborate on source code, including Visual Studio's Git support, which is owned by Microsoft.
4343
- If this bug not is related to the GitHub extension, visit the [Visual Studio support page](https://www.visualstudio.com/support/support-overview-vs) for help
44+
- To report a bug use the [bug report template](.github/ISSUE_TEMPLATE/bug_report.md).
4445
- Screenshots are very helpful in diagnosing bugs and understanding the state of the extension when it's experiencing problems. Please include them whenever possible.
4546
- A log file is helpful in diagnosing bug issues. To include log files in your issue:
4647

@@ -56,6 +57,7 @@ Here are a few helpful tips when reporting a bug:
5657

5758
### Feature Requests
5859
If you have a feature that you think would be a great addition to the extension, we might already have thought about it too, so be sure to check if your suggestion matches our [roadmap](#roadmap-and-future-feature-ideas) before making a request. Also take a peek at our [pull requests](https://github.com/github/VisualStudio/pulls) to see what we're currently working on. Additionally, someone might have already thought of your idea, so check out Issues labeled as [features](https://github.com/github/VisualStudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) to see if it already exists.
60+
To suggest a feature use the [feature request template](.github/ISSUE_TEMPLATE/feature_request.md).
5961

6062
## Things to improve in the current version
6163

Diff for: ‎Directory.Build.Props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.5.9.0</Version>
4+
<Version>2.10.8.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
66
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>

0 commit comments

Comments
 (0)