Skip to content

Commit d06507d

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Merge branch 'main' into js/api-cleanup
2 parents f9528e2 + 02624b8 commit d06507d

File tree

86 files changed

+534
-394
lines changed

Some content is hidden

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

86 files changed

+534
-394
lines changed

‎.editorconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ csharp_style_prefer_primary_constructors = false:none
181181
dotnet_style_prefer_collection_expression = true:error
182182
resharper_use_collection_expression_highlighting =true:error
183183

184-
185-
186184
##########################################
187185
# Unnecessary Code Rules
188186
# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/unnecessary-code-rules
@@ -465,4 +463,4 @@ dotnet_naming_rule.parameters_rule.severity = warning
465463
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
466464
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
467465
# OTHER DEALINGS IN THE SOFTWARE.
468-
##########################################
466+
##########################################

‎.gitattributes

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,13 @@
133133
*.pnm filter=lfs diff=lfs merge=lfs -text
134134
*.wbmp filter=lfs diff=lfs merge=lfs -text
135135
*.exr filter=lfs diff=lfs merge=lfs -text
136+
*.ico filter=lfs diff=lfs merge=lfs -text
137+
*.cur filter=lfs diff=lfs merge=lfs -text
138+
*.ani filter=lfs diff=lfs merge=lfs -text
139+
*.heic filter=lfs diff=lfs merge=lfs -text
140+
*.hif filter=lfs diff=lfs merge=lfs -text
141+
*.avif filter=lfs diff=lfs merge=lfs -text
142+
###############################################################################
143+
# Handle ICC files by git lfs
144+
###############################################################################
145+
*.icc filter=lfs diff=lfs merge=lfs -text

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,4 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
.idea

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "shared-infrastructure"]
2+
path = shared-infrastructure
3+
url = https://github.com/SixLabors/SharedInfrastructure

‎Directory.Build.props

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.props is automatically picked up and imported by
6+
Microsoft.Common.props. This file needs to exist, even if empty so that
7+
files in the parent directory tree, with the same name, are not imported
8+
instead. The import fairly early and only Sdk.props will have been imported
9+
beforehand. We also don't need to add ourselves to MSBuildAllProjects, as
10+
that is done by the file that imports us.
11+
-->
12+
13+
<PropertyGroup>
14+
<!-- This MUST be defined before importing props. -->
15+
<SixLaborsSolutionDirectory>$(MSBuildThisFileDirectory)</SixLaborsSolutionDirectory>
16+
17+
<!-- For some reason Debug-InnerLoop doesn't define DEBUG by default. -->
18+
<DefineConstants Condition="'$(Configuration)' == 'Debug-InnerLoop'">$(DefineConstants);DEBUG</DefineConstants>
19+
</PropertyGroup>
20+
21+
<!-- Import the shared global .props file -->
22+
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
23+
24+
<PropertyGroup>
25+
<LangVersion>12.0</LangVersion>
26+
</PropertyGroup>
27+
28+
<!--
29+
Ensure all custom build configurations based upon "Release" are optimized.
30+
This is easier than setting each project individually.
31+
-->
32+
<PropertyGroup Condition="$(Configuration.StartsWith('Release')) == true">
33+
<Optimize>true</Optimize>
34+
</PropertyGroup>
35+
</Project>

‎Directory.Build.targets

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.targets is automatically picked up and imported by
6+
Microsoft.Common.targets. This file needs to exist, even if empty so that
7+
files in the parent directory tree, with the same name, are not imported
8+
instead. They import fairly late and most other props/targets will have been
9+
imported beforehand. We also don't need to add ourselves to
10+
MSBuildAllProjects, as that is done by the file that imports us.
11+
-->
12+
13+
<!-- Import the shared global .props file -->
14+
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\targets\SixLabors.Global.targets"/>
15+
16+
</Project>

‎PolygonClipper.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--Add common namespaces to implicit global usings if enabled.-->
5+
<ItemGroup Condition="'$(UsePolygonClipper)'=='enable' OR '$(UsePolygonClipper)'=='true'">
6+
<Using Include="PolygonClipper" />
7+
</ItemGroup>
8+
9+
</Project>

‎PolygonClipper.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2323
EndProjectSection
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoJson", "tests\GeoJson\GeoJson.csproj", "{F881441F-D3B6-4B48-8CEF-8DC0746D4578}"
26+
EndProject
2627
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{6F7A3AE6-C7D1-441F-A203-BA6575931CE2}"
2728
EndProject
2829
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EEA3B5E9-3337-42EE-B0BF-FA586A1BC435}"
@@ -33,6 +34,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
3334
EndProject
3435
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonClipper.Benchmarks", "tests\PolygonClipper.Benchmarks\PolygonClipper.Benchmarks.csproj", "{F1965B36-D896-4BC1-8941-7FE6CEB82CD5}"
3536
EndProject
37+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
38+
EndProject
3639
Global
3740
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3841
Debug|Any CPU = Debug|Any CPU
@@ -66,6 +69,7 @@ Global
6669
{6F7A3AE6-C7D1-441F-A203-BA6575931CE2} = {6B327CDE-88A5-4715-A8A3-E9A8C80EA10C}
6770
{EEA3B5E9-3337-42EE-B0BF-FA586A1BC435} = {6F7A3AE6-C7D1-441F-A203-BA6575931CE2}
6871
{F1965B36-D896-4BC1-8941-7FE6CEB82CD5} = {84C4B358-492B-46FC-9F11-FBB76B06BD3F}
72+
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {F0882E95-667C-48FE-B43A-24FC55D9F354}
6973
EndGlobalSection
7074
GlobalSection(ExtensibilityGlobals) = postSolution
7175
SolutionGuid = {2C73BEEC-091B-45E4-A0BD-7D7CD16A8451}

‎codecov.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Documentation: https://docs.codecov.io/docs/codecov-yaml
2+
3+
codecov:
4+
# Avoid "Missing base report"
5+
# https://github.com/codecov/support/issues/363
6+
# https://docs.codecov.io/docs/comparing-commits
7+
allow_coverage_offsets: true
8+
9+
# Avoid Report Expired
10+
# https://docs.codecov.io/docs/codecov-yaml#section-expired-reports
11+
max_report_age: off
12+
13+
coverage:
14+
# Use integer precision
15+
# https://docs.codecov.com/docs/codecovyml-reference#coverageprecision
16+
precision: 0
17+
18+
# Explicitly control coverage status checks
19+
# https://docs.codecov.com/docs/commit-status#disabling-a-status
20+
status:
21+
project: on
22+
patch: off

‎shared-infrastructure

Submodule shared-infrastructure added at d0f141b

0 commit comments

Comments
 (0)