Skip to content

Commit

Permalink
Merge pull request #1 from Zandario/chore/editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
ProbablePrime authored Nov 7, 2023
2 parents ec971a4 + 2ee2e63 commit 9ab6a0e
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 17 deletions.
61 changes: 61 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Based on: https://github.com/RehanSaeed/EditorConfig
# See http://EditorConfig.org for more information about .editorconfig files.

##########################################
# Common Settings
##########################################

# This file is the top-most EditorConfig file
root = true

# All Files
[*]
charset = utf-8-bom
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

##########################################
# File Extension Settings
##########################################

# Visual Studio Solution Files
[*.sln]
indent_style = tab

# Visual Studio XML Project Files
[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# XML Configuration Files
[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
indent_size = 2

# JSON Files
[*.{json,json5,webmanifest}]
indent_size = 2

# YAML Files
[*.{yml,yaml}]
indent_size = 2

# Markdown Files
[*.{md,mdx}]
trim_trailing_whitespace = false

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

# Batch Files
[*.{cmd,bat}]
end_of_line = crlf

# Bash Files
[*.sh]
end_of_line = lf

# Makefiles
[Makefile]
indent_style = tab
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## Line ending conversions

# Adjusted line endings and converted the repo
94676e7edd246eee2df0881bf643401c83d3bc50
8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###############################################################################
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
Expand All @@ -17,7 +17,7 @@
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
Expand Down Expand Up @@ -46,9 +46,9 @@

###############################################################################
# diff behavior for common document formats
#
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Library
name: Build Library

on:
push:
Expand All @@ -24,4 +24,4 @@ jobs:
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
run: dotnet build --configuration Release --no-restore
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Library
name: Publish Library

# When a release is published
on:
Expand All @@ -24,4 +24,4 @@ jobs:
- name: Pack
run: dotnet pack Patreon.Net --output nupkgs --configuration Release -p:Version=${{ env.VERSION }}
- name: Nuget Publish
run: dotnet nuget push nupkgs\*.nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
run: dotnet nuget push nupkgs\*.nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Ignore Visual Studio temporary files, build results, and
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
Expand Down Expand Up @@ -258,4 +258,4 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MIT License
MIT License

Copyright (c) 2023 Yellow Dog Man Studios s.r.o.

Expand Down
2 changes: 1 addition & 1 deletion Patreon.NET/Patreon.NET.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Company>Yellow Dog Man Studios</Company>
<Authors>Yellow Dog Man Studios</Authors>
Expand Down
4 changes: 2 additions & 2 deletions Patreon.NET/PatreonClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static string GenerateFieldsAndIncludes(Type rootType, HashSet<Type> ignoreField
return str.ToString();
}

static void GenerateFieldsAndIncludes(Type rootType, StringBuilder str, HashSet<Type> generatedTypes,
static void GenerateFieldsAndIncludes(Type rootType, StringBuilder str, HashSet<Type> generatedTypes,
string rootInclude,
HashSet<string> includes,
HashSet<Type> ignoreFields)
Expand Down Expand Up @@ -228,7 +228,7 @@ public async IAsyncEnumerable<Member> GetCampaignMembers()
{
var url = next;

url = AppendQuery(url, GenerateFieldsAndIncludes(typeof(Member),
url = AppendQuery(url, GenerateFieldsAndIncludes(typeof(Member),
new HashSet<Type>() { typeof(Tier) }
));

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Patreon.NET
# Patreon.NET
C# / .NET library for working with the Patreon API

This is a very rudimentary library for fetching data from the Patreon.API, it only contains the bare minimum that I need and isn't very polished, so I'd only recommend using it only if you really need to in its current state or using it as a basis.
2 changes: 1 addition & 1 deletion Testing/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
}
}

Console.Read();
Console.Read();
2 changes: 1 addition & 1 deletion Testing/Testing.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down

0 comments on commit 9ab6a0e

Please sign in to comment.