Skip to content

Commit

Permalink
Merge pull request #1 from dotnet/master
Browse files Browse the repository at this point in the history
Synchronization of updates from the original repository
  • Loading branch information
Olina-Zhang authored Aug 13, 2020
2 parents ad01f63 + 1a9cbca commit 6c18a73
Show file tree
Hide file tree
Showing 4,605 changed files with 755,133 additions and 359,312 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
81 changes: 45 additions & 36 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,17 @@ indent_size = 4
[*.json]
indent_size = 2

# C# files
[*.cs]
# C# and VB files
[*.{cs,vb}]
charset = utf-8-bom
insert_final_newline = true
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current
trim_trailing_whitespace = true

# avoid this. unless absolutely necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# only use var when it's obvious what the variable type is
csharp_style_var_for_built_in_types = false:none
csharp_style_var_when_type_is_apparent = false:none
csharp_style_var_elsewhere = false:suggestion

# use language keywords instead of BCL types
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion
Expand All @@ -67,14 +47,7 @@ dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static

dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.capitalization = camel_case

# Comment this group and uncomment out the next group if you don't want _ prefixed fields.

# internal and private fields should be _camelCase
#dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
#dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
#dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
dotnet_naming_style.static_prefix_style.capitalization = camel_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
Expand All @@ -85,12 +58,10 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal

dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case

# Code style defaults
dotnet_sort_system_directives_first = true
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
Expand All @@ -99,6 +70,34 @@ dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion

# C# files
[*.cs]
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

# only use var when it's obvious what the variable type is
csharp_style_var_for_built_in_types = false:none
csharp_style_var_when_type_is_apparent = false:none
csharp_style_var_elsewhere = false:suggestion


# Code style defaults
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

# Expression-bodied members
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
Expand Down Expand Up @@ -140,13 +139,18 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# Visual Basic files
[*.vb]
# Modifier preferences
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
indent_brace_style = Allman

# Xml project files
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
indent_size = 2

# Xml build files
Expand All @@ -170,5 +174,10 @@ insert_final_newline = true
# Shell scripts
[*.sh]
end_of_line = lf
[*.{cmd, bat}]

[*.{cmd,bat}]
end_of_line = crlf


# .NET diagnostic
dotnet_diagnostic.RS0041.severity = none
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
* text=auto

# Collapse XLF files in PRs by default
*.xlf linguist-generated=true
20 changes: 16 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
---
title: ''
labels: ''
assignees: ''

* .NET Core Version: (e.g. 3.0 Preview1, or daily build number, use `dotnet --info`)
* Have you experienced this same bug with .NET Framework?: Yes/No
---

<!-- Read https://github.com/dotnet/winforms/blob/master/Documentation/issue-guide.md -->

* .NET Core Version:
<!-- e.g. 3.0 Preview1, or daily build number, use `dotnet --info` -->

* Have you experienced this same bug with .NET Framework?:
<!-- Yes / No -->

**Problem description:**

**Actual behavior:** <!-- callstack for crashes / exceptions -->
<!--
Describe the current behavior, what is wrong or not working as expected.
Provide as much information as possible, including callstack for crashes/exceptions, screenshots or animations.
-->


**Expected behavior:**


**Minimal repro:**
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
blank_issues_enabled: true
contact_links:
- name: Issue with .NET runtime or core .NET libraries
url: https://github.com/dotnet/runtime/issues/new/choose
about: Please open issues with the .NET runtime or core in their repo
- name: Issue with .NET Core SDK
url: https://github.com/dotnet/sdk/issues/new/choose
about: Please open issues with the .NET Core SDK in their repo
- name: Issue with Entity Framework
url: https://github.com/dotnet/efcore/issues/new/choose
about: Please open issues with Entity Framework in their repo
- name: Issue with Roslyn compiler
url: https://github.com/dotnet/roslyn/issues/new/choose
about: Please open issues with the Roslyn compiler in their repo
- name: Issue with ASP.NET
url: https://github.com/dotnet/aspnetcore/issues/new/choose
about: Please open issues with ASP.NET Core in their repo
- name: Issue with WPF
url: https://github.com/dotnet/wpf/issues/new/choose
about: Please open issues with WPF in their repo
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,40 @@
---
name: Feature / API request
about: Suggest an idea for this project
title: ''
labels: api-suggestion
assignees: ''

---

<!-- Read https://github.com/dotnet/winforms/blob/master/Documentation/issue-guide.md -->

**Is your feature request related to a problem? Please describe.**
<!--
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-->

**Describe the solution you'd like and alternatives you've considered**
<!--
A clear and concise description of what you want to happen. This includes:
- Description of what API need to be added or changed.
- Code that shows the surface area of the API.
- Code that shows real world scenarios, and how they would otherwise be handled.
- Details showing the usage/consumption of the proposed new API, and alternatives (e.g. not having this API).
- Any other context or screenshots about the feature request here.
:exclamation: Read https://github.com/dotnet/winforms/blob/master/Documentation/issue-guide.md for more details
-->


**Will this feature affect UI controls?**
<!--
Yes / No
If yes, describe the following:
- Will VS Designer need to support the feature? If yes, describe how you expect it to funсtion.
- What impact will it have on accessibility?
- Will this feature need to be localized or be localizable?
-->
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/localization-issue-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Localization issue report
about: Report an issue with localization resources
title: "[LOC] "
labels: tenet-localization
assignees: ''

---

**File(s) affected:**
<!--
List affected files
These would likely include files
* https://github.com/dotnet/winforms/search?l=XML&p=1&q=SR.+extension%3Axlf, or
* https://github.com/dotnet/winforms/search?q=extension%3Aresx&unscoped_q=extension%3Aresx
-->

**Language(s) affected:**

<!--
List affected languages
-->

**Suggested translation change(s):**
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/localization_request.md

This file was deleted.

71 changes: 71 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<!-- Please read CONTRIBUTING.md before submitting a pull request -->

Fixes #


## Proposed changes

-
-
-

<!-- We are in TELL-MODE the following section must be completed -->

## Customer Impact

-
-

## Regression?

- Yes / No

## Risk

-

<!-- end TELL-MODE -->


## Screenshots <!-- Remove this section if PR does not change UI -->

### Before

<!-- TODO -->

### After

<!-- TODO -->


## Test methodology <!-- How did you ensure quality? -->

-
-
-

## Accessibility testing <!-- Remove this section if PR does not change UI -->

<!--
Microsoft prioritizes making our products accessible.
WinForms has a key role in allowing developers to create accessible apps.
When submitting a change which impacts UI in any way, including adding new UI or
modifying existing controls the developer needs to run the Accessibility Insights
tool (https://accessibilityinsights.io/) and verify that there are no changes or
regressions.
The developer should run the Fast Pass over the impacted control(s) and provide
a snapshot of the passing results along with before/after snapshots of the UI.
More info: (https://accessibilityinsights.io/docs/en/web/getstarted/fastpass)
-->




## Test environment(s) <!-- Remove any that don't apply -->

- <!-- use `dotnet --info` -->


<!-- Mention language, UI scaling, or anything else that might be relevant -->
7 changes: 0 additions & 7 deletions .vscode/settings.json

This file was deleted.

Loading

0 comments on commit 6c18a73

Please sign in to comment.