-
-
Notifications
You must be signed in to change notification settings - Fork 697
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into fix808
- Loading branch information
Showing
587 changed files
with
60,594 additions
and
45,256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| # EditorConfig is awesome:http://EditorConfig.org | ||
|
|
||
| # top-most EditorConfig file | ||
| root = true | ||
|
|
||
| # Don't use tabs for indentation. | ||
| [*] | ||
| indent_style = space | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| # (Please don't specify an indent_size here; that has too many unintended consequences.) | ||
|
|
||
| # Code files | ||
| [*.{cs,csx,vb,vbx,h,cpp,idl}] | ||
| indent_size = 4 | ||
|
|
||
| # Xml project files | ||
| [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] | ||
| indent_size = 2 | ||
|
|
||
| # Xml config files | ||
| [*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] | ||
| indent_size = 2 | ||
|
|
||
| # JSON files | ||
| [*.json] | ||
| indent_size = 2 | ||
|
|
||
| # Dotnet code style settings: | ||
| [*.{cs,vb}] | ||
| # Sort using and Import directives with System.* appearing first | ||
| dotnet_sort_system_directives_first = true | ||
| dotnet_style_qualification_for_field = false:silent | ||
| dotnet_style_qualification_for_property = false:silent | ||
| dotnet_style_qualification_for_method = false:silent | ||
| dotnet_style_qualification_for_event = false:silent | ||
|
|
||
| # Use language keywords instead of framework type names for type references | ||
| dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion | ||
| dotnet_style_predefined_type_for_member_access = true:suggestion | ||
|
|
||
| # Suggest more modern language features when available | ||
| dotnet_style_object_initializer = true:suggestion | ||
| dotnet_style_collection_initializer = true:suggestion | ||
| dotnet_style_coalesce_expression = true:suggestion | ||
| dotnet_style_null_propagation = true:suggestion | ||
| dotnet_style_explicit_tuple_names = true:suggestion | ||
|
|
||
| # Non-private static fields are PascalCase | ||
| dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion | ||
| dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields | ||
| dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style | ||
|
|
||
| dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field | ||
| dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected internal, private protected | ||
| dotnet_naming_symbols.non_private_static_fields.required_modifiers = static | ||
|
|
||
| dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case | ||
|
|
||
| # Constants are PascalCase | ||
| dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion | ||
| dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants | ||
| dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style | ||
|
|
||
| dotnet_naming_symbols.constants.applicable_kinds = field, local | ||
| dotnet_naming_symbols.constants.required_modifiers = const | ||
|
|
||
| dotnet_naming_style.constant_style.capitalization = pascal_case | ||
|
|
||
| # Static fields are camelCase | ||
| dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion | ||
| dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields | ||
| dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style | ||
|
|
||
| dotnet_naming_symbols.static_fields.applicable_kinds = field | ||
| dotnet_naming_symbols.static_fields.required_modifiers = static | ||
|
|
||
| dotnet_naming_style.static_field_style.capitalization = camel_case | ||
|
|
||
| # Instance fields are camelCase | ||
| dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion | ||
| dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields | ||
| dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style | ||
|
|
||
| dotnet_naming_symbols.instance_fields.applicable_kinds = field | ||
|
|
||
| dotnet_naming_style.instance_field_style.capitalization = camel_case | ||
|
|
||
| # Locals and parameters are camelCase | ||
| dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion | ||
| dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters | ||
| dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style | ||
|
|
||
| dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local | ||
|
|
||
| dotnet_naming_style.camel_case_style.capitalization = camel_case | ||
|
|
||
| # Local functions are PascalCase | ||
| dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion | ||
| dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions | ||
| dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style | ||
|
|
||
| dotnet_naming_symbols.local_functions.applicable_kinds = local_function | ||
|
|
||
| dotnet_naming_style.local_function_style.capitalization = pascal_case | ||
|
|
||
| # By default, name items with PascalCase | ||
| dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion | ||
| dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members | ||
| dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style | ||
|
|
||
| dotnet_naming_symbols.all_members.applicable_kinds = * | ||
|
|
||
| dotnet_naming_style.pascal_case_style.capitalization = pascal_case | ||
|
|
||
| # CSharp code style settings: | ||
| [*.cs] | ||
| # Indentation preferences | ||
| csharp_indent_block_contents = true | ||
| csharp_indent_braces = false | ||
| csharp_indent_case_contents = true | ||
| csharp_indent_switch_labels = true | ||
| csharp_indent_labels = flush_left | ||
|
|
||
| # Prefer "var" everywhere | ||
| csharp_style_var_for_built_in_types = true:suggestion | ||
| csharp_style_var_when_type_is_apparent = true:suggestion | ||
| csharp_style_var_elsewhere = true:suggestion | ||
|
|
||
| # Prefer method-like constructs to have a block body | ||
| csharp_style_expression_bodied_methods = false:none | ||
| csharp_style_expression_bodied_constructors = false:none | ||
| csharp_style_expression_bodied_operators = false:none | ||
|
|
||
| # Prefer property-like constructs to have an expression-body | ||
| csharp_style_expression_bodied_properties = true:none | ||
| csharp_style_expression_bodied_indexers = true:none | ||
| csharp_style_expression_bodied_accessors = true:none | ||
|
|
||
| # Suggest more modern language features when available | ||
| csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion | ||
| csharp_style_pattern_matching_over_as_with_null_check = true:suggestion | ||
| csharp_style_inlined_variable_declaration = true:suggestion | ||
| csharp_style_throw_expression = true:suggestion | ||
| csharp_style_conditional_delegate_call = true:suggestion | ||
|
|
||
| # Newline settings | ||
| 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 | ||
|
|
||
| # Blocks are allowed | ||
| csharp_prefer_braces = true:silent |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| --- | ||
| name: Bug report | ||
| about: Create a report to help us improve | ||
|
|
||
| --- | ||
|
|
||
| #### Bug description | ||
|
|
||
| A clear and concise description of what the bug is. | ||
|
|
||
| #### Repro steps | ||
|
|
||
| Code to reproduce the behavior. | ||
|
|
||
| #### Expected behavior | ||
|
|
||
| A clear and concise description of what you expected to happen. | ||
|
|
||
| #### Actual behavior | ||
|
|
||
| What happened instead of what you expected. | ||
|
|
||
| - Version used: | ||
| - Runtime: (e.g. .NET Framework, .NET Core, Unity, mono, etc.) | ||
|
|
||
| #### Additional context | ||
|
|
||
| Add any other context about the problem here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- | ||
| name: Feature request | ||
| about: Suggest an idea for this project | ||
|
|
||
| --- | ||
|
|
||
| #### 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 | ||
|
|
||
| A clear and concise description of what you want to happen. | ||
|
|
||
| #### Describe alternatives you've considered | ||
|
|
||
| A clear and concise description of any alternative solutions or features you've considered. | ||
|
|
||
| #### Additional context | ||
|
|
||
| Add any other context or screenshots about the feature request here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Contributing | ||
|
|
||
| ## Dependencies | ||
|
|
||
| * [Visual Studio 2019](https://visualstudio.microsoft.com/) | ||
| * [Unity Editor](https://unity3d.com/unity/editor) (optional) | ||
| * .NET Core SDK and runtimes (run `init` to install) | ||
|
|
||
| This repo uses the .NET Core SDK and runtimes to build and test the projects. | ||
| You can install the right versions of the SDK and runtimes by running the `init.ps1` script at the root of the repo. | ||
|
|
||
| By default no elevation is required as these toolsets are installed in a per-user directory. Launching `devenv` from the same PowerShell window that you ran the script will lead VS to discover these per-user toolsets. | ||
| To get VS to find the toolsets when launched from the Start Menu, run `init -InstallLocality machine`, which requires elevation for each SDK or runtime installed. | ||
|
|
||
| ## How to Build | ||
|
|
||
| Open `MessagePack.sln` on Visual Studio 2019. | ||
|
|
||
| Alternatively you may build from the command line using `msbuild.exe` or: | ||
|
|
||
| dotnet build /p:platform=NoVSIX | ||
|
|
||
| ## Unity | ||
|
|
||
| Unity Project requires several dependency DLL's. At first, run `copy_assets.bat` under `src\MessagePack.UnityClient`. | ||
| Then open that directory in the Unity Editor. | ||
|
|
||
| ## Where to find our CI feed | ||
|
|
||
| Once a change is in a shipping branch (e.g. `v1.8`, `v2.0`, `master`), our CI will build it and push the built package | ||
| to [our CI feed](https://dev.azure.com/ils0086/MessagePack-CSharp/_packaging?_a=feed&feed=MessagePack-CI). To depend on | ||
| one of the packages that are on our CI feed (but not yet on nuget.org) you can add this to your nuget.config file: | ||
|
|
||
| ```xml | ||
| <add key="MessagePack-CI" value="https://pkgs.dev.azure.com/ils0086/MessagePack-CSharp/_packaging/MessagePack-CI/nuget/v3/index.json" /> | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Yoshifumi Kawai <ils@neue.cc> | ||
| Andrew Arnott <andrewarnott@gmail.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.