Skip to content

Commit e199aa1

Browse files
Merge branch 'openrails:master' into master
2 parents d819ff9 + 4903ade commit e199aa1

File tree

111 files changed

+1900
-26235
lines changed

Some content is hidden

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

111 files changed

+1900
-26235
lines changed

.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-mgfxc": {
6+
"version": "3.8.0.1641",
7+
"commands": [
8+
"mgfxc"
9+
]
10+
}
11+
}
12+
}

.gitattributes

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@
3535
*.svg text
3636
*.eps binary
3737

38-
39-
# https://github.com/Danimoth/gitattributes/blob/master/VisualStudio.gitattributes
40-
# Custom for Visual Studio
41-
*.sln text eol=crlf merge=union
42-
*.csproj merge=union
43-
*.vbproj merge=union
44-
*.fsproj merge=union
45-
*.dbproj merge=union
46-
47-
4838
# https://github.com/Danimoth/gitattributes/blob/master/CSharp.gitattributes
4939
# Custom for C#
5040
*.cs diff=csharp

Source/.editorconfig

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
# BEGIN COPY FROM https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options#example-editorconfig-file
23
###############################
34
# Core EditorConfig Options #
45
###############################
6+
root = true
57
# All files
68
[*]
79
indent_style = space
@@ -58,7 +60,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
5860
###############################
5961
# Style Definitions
6062
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61-
# Use PascalCase for constant fields
63+
# Use PascalCase for constant fields
6264
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
6365
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
6466
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
@@ -92,7 +94,7 @@ csharp_preferred_modifier_order = public,private,protected,internal,static,exter
9294
csharp_prefer_braces = true:silent
9395
csharp_style_deconstructed_variable_declaration = true:suggestion
9496
csharp_prefer_simple_default_expression = true:suggestion
95-
csharp_style_pattern_local_over_anonymous_function = true:suggestion
97+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
9698
csharp_style_inlined_variable_declaration = true:suggestion
9799
###############################
98100
# C# Formatting Rules #
@@ -130,3 +132,29 @@ csharp_preserve_single_line_blocks = true
130132
[*.vb]
131133
# Modifier preferences
132134
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
135+
# END COPY
136+
137+
#################################
138+
# Open Rails Coding Conventions #
139+
#################################
140+
[*.cs]
141+
142+
# .NET analyzers
143+
dotnet_style_require_accessibility_modifiers = omit_if_default:silent
144+
dotnet_naming_symbols.all_fields.applicable_kinds = field
145+
dotnet_naming_symbols.all_fields.applicable_accessibilities = *
146+
dotnet_naming_rule.all_fields_should_be_pascal_case.symbols = all_fields
147+
dotnet_naming_rule.all_fields_should_be_pascal_case.style = pascal_case_style
148+
dotnet_naming_rule.all_fields_should_be_pascal_case.severity = warning
149+
150+
# StyleCop analyzers
151+
dotnet_diagnostic.SA1101.severity = none # Readability: PrefixLocalCallsWithThis
152+
dotnet_diagnostic.SA1200.severity = none # Ordering: UsingDirectivesMustBePlacedCorrectly
153+
dotnet_diagnostic.SA1306.severity = none # Naming: FieldNamesMustBeginWithLowerCaseLetter
154+
dotnet_diagnostic.SA1400.severity = none # Maintainability: AccessModifierMustBeDeclared
155+
dotnet_diagnostic.SA1401.severity = none # Maintainability: FieldsMustBePrivate
156+
dotnet_diagnostic.SA1402.severity = none # Maintainability: FileMayOnlyContainASingleType
157+
dotnet_diagnostic.SA1600.severity = none # Documentation: ElementsMustBeDocumented
158+
dotnet_diagnostic.SA1602.severity = none # Documentation: EnumerationItemsMustBeDocumented
159+
dotnet_diagnostic.SA1633.severity = none # Documentation: FileMustHaveHeader
160+
dotnet_diagnostic.SA1649.severity = none # Documentation: FileNameMustMatchTypeName
-58.5 KB
Binary file not shown.
Binary file not shown.

Source/3rdPartyLibs/MonoGame/MonoGame.Framework.Content.Pipeline.xml

Lines changed: 0 additions & 7294 deletions
This file was deleted.
Binary file not shown.

Source/3rdPartyLibs/MonoGame/MonoGame.Framework.xml

Lines changed: 0 additions & 18061 deletions
This file was deleted.
Binary file not shown.
-137 KB
Binary file not shown.

0 commit comments

Comments
 (0)