Skip to content

Commit fa7591a

Browse files
hangyhangy
committed
Merge remote-tracking branch 'origin/beta'
2 parents 59b9a69 + 8235d08 commit fa7591a

File tree

123 files changed

+7715
-7296
lines changed

Some content is hidden

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

123 files changed

+7715
-7296
lines changed

‎.config/dotnet-tools.json‎

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

‎.editorconfig‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
# editorconfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Default settings:
7+
# A newline ending every file
8+
# Use 4 spaces as indentation
9+
[*]
10+
insert_final_newline = true
11+
indent_style = space
12+
indent_size = 4
13+
trim_trailing_whitespace = true
14+
15+
# Generated code
16+
[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
17+
generated_code = true
18+
19+
# C# files
20+
[*.cs]
21+
# New line preferences
22+
csharp_new_line_before_open_brace = all
23+
csharp_new_line_before_else = true
24+
csharp_new_line_before_catch = true
25+
csharp_new_line_before_finally = true
26+
csharp_new_line_before_members_in_object_initializers = true
27+
csharp_new_line_before_members_in_anonymous_types = true
28+
csharp_new_line_between_query_expression_clauses = true
29+
30+
# Indentation preferences
31+
csharp_indent_block_contents = true
32+
csharp_indent_braces = false
33+
csharp_indent_case_contents = true
34+
csharp_indent_case_contents_when_block = false
35+
csharp_indent_switch_labels = true
36+
csharp_indent_labels = one_less_than_current
37+
38+
# Modifier preferences
39+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
40+
41+
# avoid this. unless absolutely necessary
42+
dotnet_style_qualification_for_field = false:suggestion
43+
dotnet_style_qualification_for_property = false:suggestion
44+
dotnet_style_qualification_for_method = false:suggestion
45+
dotnet_style_qualification_for_event = false:suggestion
46+
47+
# Types: use keywords instead of BCL types, and permit var only when the type is clear
48+
csharp_style_var_for_built_in_types = false:suggestion
49+
csharp_style_var_when_type_is_apparent = false:none
50+
csharp_style_var_elsewhere = false:suggestion
51+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
52+
dotnet_style_predefined_type_for_member_access = true:suggestion
53+
54+
# name all constant fields using PascalCase
55+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
56+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
57+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
58+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
59+
dotnet_naming_symbols.constant_fields.required_modifiers = const
60+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61+
62+
# static fields should have s_ prefix
63+
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
64+
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
65+
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
66+
dotnet_naming_symbols.static_fields.applicable_kinds = field
67+
dotnet_naming_symbols.static_fields.required_modifiers = static
68+
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
69+
dotnet_naming_style.static_prefix_style.required_prefix = s_
70+
dotnet_naming_style.static_prefix_style.capitalization = camel_case
71+
72+
# internal and private fields should be _camelCase
73+
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
74+
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
75+
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
76+
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
77+
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
78+
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
79+
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
80+
81+
# Code style defaults
82+
csharp_using_directive_placement = outside_namespace:suggestion
83+
dotnet_sort_system_directives_first = true
84+
csharp_prefer_braces = true:silent
85+
csharp_preserve_single_line_blocks = true:none
86+
csharp_preserve_single_line_statements = false:none
87+
csharp_prefer_static_local_function = true:suggestion
88+
csharp_prefer_simple_using_statement = false:none
89+
csharp_style_prefer_switch_expression = true:suggestion
90+
dotnet_style_readonly_field = true:suggestion
91+
92+
# Expression-level preferences
93+
dotnet_style_object_initializer = true:suggestion
94+
dotnet_style_collection_initializer = true:suggestion
95+
dotnet_style_prefer_collection_expression = when_types_exactly_match
96+
dotnet_style_explicit_tuple_names = true:suggestion
97+
dotnet_style_coalesce_expression = true:suggestion
98+
dotnet_style_null_propagation = true:suggestion
99+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
100+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
101+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
102+
dotnet_style_prefer_auto_properties = true:suggestion
103+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
104+
dotnet_style_prefer_conditional_expression_over_return = true:silent
105+
csharp_prefer_simple_default_expression = true:suggestion
106+
107+
# Expression-bodied members
108+
csharp_style_expression_bodied_methods = true:silent
109+
csharp_style_expression_bodied_constructors = true:silent
110+
csharp_style_expression_bodied_operators = true:silent
111+
csharp_style_expression_bodied_properties = true:silent
112+
csharp_style_expression_bodied_indexers = true:silent
113+
csharp_style_expression_bodied_accessors = true:silent
114+
csharp_style_expression_bodied_lambdas = true:silent
115+
csharp_style_expression_bodied_local_functions = true:silent
116+
117+
# Pattern matching
118+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
119+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
120+
csharp_style_inlined_variable_declaration = true:suggestion
121+
122+
# Null checking preferences
123+
csharp_style_throw_expression = true:suggestion
124+
csharp_style_conditional_delegate_call = true:suggestion
125+
126+
# Other features
127+
csharp_style_prefer_index_operator = false:none
128+
csharp_style_prefer_range_operator = false:none
129+
csharp_style_pattern_local_over_anonymous_function = false:none
130+
131+
# Space preferences
132+
csharp_space_after_cast = false
133+
csharp_space_after_colon_in_inheritance_clause = true
134+
csharp_space_after_comma = true
135+
csharp_space_after_dot = false
136+
csharp_space_after_keywords_in_control_flow_statements = true
137+
csharp_space_after_semicolon_in_for_statement = true
138+
csharp_space_around_binary_operators = before_and_after
139+
csharp_space_around_declaration_statements = do_not_ignore
140+
csharp_space_before_colon_in_inheritance_clause = true
141+
csharp_space_before_comma = false
142+
csharp_space_before_dot = false
143+
csharp_space_before_open_square_brackets = false
144+
csharp_space_before_semicolon_in_for_statement = false
145+
csharp_space_between_empty_square_brackets = false
146+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
147+
csharp_space_between_method_call_name_and_opening_parenthesis = false
148+
csharp_space_between_method_call_parameter_list_parentheses = false
149+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
150+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
151+
csharp_space_between_method_declaration_parameter_list_parentheses = false
152+
csharp_space_between_parentheses = false
153+
csharp_space_between_square_brackets = false
154+
155+
# C++ Files
156+
[*.{cpp,h,in}]
157+
curly_bracket_next_line = true
158+
indent_brace_style = Allman
159+
160+
# Xml project files
161+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
162+
indent_size = 2
163+
164+
[*.{csproj,vbproj,proj,nativeproj,locproj}]
165+
charset = utf-8
166+
167+
# Xml build files
168+
[*.builds]
169+
indent_size = 2
170+
171+
# Xml files
172+
[*.{xml,stylecop,resx,ruleset}]
173+
indent_size = 2
174+
175+
# Xml config files
176+
[*.{props,targets,config,nuspec}]
177+
indent_size = 2
178+
179+
# YAML config files
180+
[*.{yml,yaml}]
181+
indent_size = 2
182+
183+
# Shell scripts
184+
[*.sh]
185+
end_of_line = lf
186+
[*.{cmd,bat}]
187+
end_of_line = crlf

‎.github/workflows/dotnet.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,26 @@ jobs:
2626
uses: actions/setup-dotnet@v4
2727
with:
2828
global-json-file: global.json
29+
- name: Restore tools
30+
run: dotnet tool restore
2931
- name: Restore dependencies
3032
run: dotnet restore --locked-mode
3133
- name: Build
3234
run: dotnet build --no-restore
3335
- name: Test
34-
run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage"
36+
run: dotnet test --no-build --verbosity normal -p:TestingPlatformCommandLineArguments="--report-trx --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml"
37+
- name: Convert test results
38+
if: ${{ !cancelled() }}
39+
run: |
40+
find . -name "*.trx" -exec dotnet tool run trx2junit --output TestResults/JUnit {} +
3541
- name: Upload coverage reports to Codecov
3642
uses: codecov/codecov-action@v5.1.2
3743
with:
3844
token: ${{ secrets.CODECOV_TOKEN }}
39-
slug: hangy/AntiXss/hangy/AntiXss
45+
slug: hangy/AntiXss
4046
- name: Upload test results to Codecov
4147
if: ${{ !cancelled() }}
4248
uses: codecov/test-results-action@v1
4349
with:
50+
files: TestResults/JUnit/*.xml
4451
token: ${{ secrets.CODECOV_TOKEN }}

‎.prettierignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
package.json
2-
package-lock.json
2+
package-lock.json
3+
packages.lock.json

‎AntiXSS.sln‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 2012
43
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B911405E-6A46-4BE6-B997-91D85388CA9A}"
54
ProjectSection(SolutionItems) = preProject
65
AntiXssAssemblyInfo.cs = AntiXssAssemblyInfo.cs
7-
CodeAnalysis.ruleset = CodeAnalysis.ruleset
86
FxCopDictionary.xml = FxCopDictionary.xml
97
License.txt = License.txt
108
EndProjectSection

0 commit comments

Comments
 (0)