Skip to content

Commit 1743f6d

Browse files
Update target framework, infrastructure, and fix build warnings
1 parent 6943275 commit 1743f6d

File tree

166 files changed

+9590
-10044
lines changed

Some content is hidden

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

166 files changed

+9590
-10044
lines changed

.editorconfig

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Version: 2.1.0 (Using https://semver.org/)
2-
# Updated: 2021-03-03
1+
# Version: 4.1.1 (Using https://semver.org/)
2+
# Updated: 2022-05-23
33
# See https://github.com/RehanSaeed/EditorConfig/releases for release notes.
44
# See https://github.com/RehanSaeed/EditorConfig for updates to this file.
55
# See http://EditorConfig.org for more information about .editorconfig files.
@@ -49,11 +49,11 @@ indent_size = 2
4949
indent_size = 2
5050

5151
# Markdown Files
52-
[*.md]
52+
[*.{md,mdx}]
5353
trim_trailing_whitespace = false
5454

5555
# Web Files
56-
[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}]
56+
[*.{htm,html,js,jsm,ts,tsx,cjs,cts,ctsx,mjs,mts,mtsx,css,sass,scss,less,pcss,svg,vue}]
5757
indent_size = 2
5858

5959
# Batch Files
@@ -75,7 +75,7 @@ indent_style = tab
7575

7676
[*.{cs,csx,cake,vb,vbx}]
7777
# Default Severity for all .NET Code Style rules below
78-
dotnet_analyzer_diagnostic.category-style.severity = warning
78+
dotnet_analyzer_diagnostic.severity = warning
7979

8080
##########################################
8181
# Language Rules
@@ -122,20 +122,21 @@ dotnet_style_coalesce_expression = true:warning
122122
dotnet_style_null_propagation = true:warning
123123
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
124124
# File header preferences
125-
file_header_template = Copyright (c) Six Labors.\nLicensed under the Apache License, Version 2.0.
125+
file_header_template = Copyright (c) Six Labors.\nLicensed under the Six Labors Split License.
126126
# SA1636: File header copyright text should match
127127
# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project.
128128
# dotnet_diagnostic.SA1636.severity = none
129129

130130
# Undocumented
131-
dotnet_style_operator_placement_when_wrapping = end_of_line
131+
dotnet_style_operator_placement_when_wrapping = end_of_line:warning
132+
csharp_style_prefer_null_check_over_type_check = true:warning
132133

133134
# C# Style Rules
134135
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/language-rules#c-style-rules
135136
[*.{cs,csx,cake}]
136137
# 'var' preferences
137-
csharp_style_var_for_built_in_types = never
138-
csharp_style_var_when_type_is_apparent = true:warning
138+
csharp_style_var_for_built_in_types = false:warning
139+
csharp_style_var_when_type_is_apparent = false:warning
139140
csharp_style_var_elsewhere = false:warning
140141
# Expression-bodied members
141142
csharp_style_expression_bodied_methods = true:warning
@@ -200,12 +201,15 @@ dotnet_diagnostic.IDE0059.severity = suggestion
200201
# Organize using directives
201202
dotnet_sort_system_directives_first = true
202203
dotnet_separate_import_directive_groups = false
204+
# Dotnet namespace options
205+
dotnet_style_namespace_match_folder = true:suggestion
206+
dotnet_diagnostic.IDE0130.severity = suggestion
203207

204208
# C# formatting rules
205209
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#c-formatting-rules
206210
[*.{cs,csx,cake}]
207211
# Newline options
208-
# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options
212+
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#new-line-options
209213
csharp_new_line_before_open_brace = all
210214
csharp_new_line_before_else = true
211215
csharp_new_line_before_catch = true
@@ -214,15 +218,15 @@ csharp_new_line_before_members_in_object_initializers = true
214218
csharp_new_line_before_members_in_anonymous_types = true
215219
csharp_new_line_between_query_expression_clauses = true
216220
# Indentation options
217-
# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options
221+
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#indentation-options
218222
csharp_indent_case_contents = true
219223
csharp_indent_switch_labels = true
220224
csharp_indent_labels = no_change
221225
csharp_indent_block_contents = true
222226
csharp_indent_braces = false
223227
csharp_indent_case_contents_when_block = false
224228
# Spacing options
225-
# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options
229+
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#spacing-options
226230
csharp_space_after_cast = false
227231
csharp_space_after_keywords_in_control_flow_statements = true
228232
csharp_space_between_parentheses = false
@@ -246,9 +250,12 @@ csharp_space_before_open_square_brackets = false
246250
csharp_space_between_empty_square_brackets = false
247251
csharp_space_between_square_brackets = false
248252
# Wrap options
249-
# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options
253+
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#wrap-options
250254
csharp_preserve_single_line_statements = false
251255
csharp_preserve_single_line_blocks = true
256+
# Namespace options
257+
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#namespace-options
258+
csharp_style_namespace_declarations = file_scoped:warning
252259

253260
##########################################
254261
# .NET Naming Rules

.github/workflows/build-and-test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ jobs:
1616
matrix:
1717
options:
1818
- os: ubuntu-latest
19-
framework: net6.0
19+
framework: net7.0
2020
runtime: -x64
2121
codecov: false
2222
- os: macos-latest
23-
framework: net6.0
23+
framework: net7.0
2424
runtime: -x64
2525
codecov: false
2626
- os: windows-latest
27-
framework: net6.0
27+
framework: net7.0
2828
runtime: -x64
2929
codecov: true
3030
- os: ubuntu-latest
31-
framework: netcoreapp3.1
31+
framework: net6.0
3232
runtime: -x64
3333
codecov: false
3434
- os: macos-latest
35-
framework: netcoreapp3.1
35+
framework: net6.0
3636
runtime: -x64
3737
codecov: false
3838
- os: windows-latest
39-
framework: netcoreapp3.1
39+
framework: net6.0
4040
runtime: -x64
4141
codecov: false
4242

@@ -112,8 +112,8 @@ jobs:
112112
uses: actions/setup-dotnet@v3
113113
with:
114114
dotnet-version: |
115+
7.0.x
115116
6.0.x
116-
3.1.x
117117
118118
- name: DotNet Build
119119
shell: pwsh

LICENSE

Lines changed: 29 additions & 187 deletions
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,43 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
1+
Six Labors Split License
2+
Version 1.0, June 2022
3+
Copyright (c) Six Labors
44

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
66

7-
1. Definitions.
7+
1. Definitions.
88

9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
9+
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
1110

12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
11+
"Source" form shall mean the preferred form for making modifications, including but not limited to software source
12+
code, documentation source, and configuration files.
1413

15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
14+
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including
15+
but not limited to compiled object code, generated documentation, and conversions to other media types.
2216

23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
17+
"Work" (or "Works") shall mean any Six Labors software made available under the License, as indicated by a
18+
copyright notice that is included in or attached to the work.
2519

26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
20+
"Direct Package Dependency" shall mean any Work in Source or Object form that is installed directly by You.
2921

30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
22+
"Transitive Package Dependency" shall mean any Work in Object form that is installed indirectly by a third party
23+
dependency unrelated to Six Labors.
3424

35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
25+
2. License
3926

40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
27+
Works in Source or Object form are split licensed and may be licensed under the Apache License, Version 2.0 or a
28+
Six Labors Commercial Use License.
4729

48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
30+
Licenses are granted based upon You meeting the qualified criteria as stated. Once granted,
31+
You must reference the granted license only in all documentation.
6132

62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
33+
Works in Source or Object form are licensed to You under the Apache License, Version 2.0 if.
6534

66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
35+
- You are consuming the Work in for use in software licensed under an Open Source or Source Available license.
36+
- You are consuming the Work as a Transitive Package Dependency.
37+
- You are consuming the Work as a Direct Package Dependency in the capacity of a For-profit company/individual with
38+
less than 1M USD annual gross revenue.
39+
- You are consuming the Work as a Direct Package Dependency in the capacity of a Non-profit organization
40+
or Registered Charity.
7241

73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright (c) Six Labors
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
42+
For all other scenarios, Works in Source or Object form are licensed to You under the Six Labors Commercial License
43+
which may be purchased by visiting https://sixlabors.com/pricing/.

0 commit comments

Comments
 (0)