Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
nils-a committed Sep 1, 2019
2 parents a04350e + 45bd425 commit 0dac88a
Show file tree
Hide file tree
Showing 34 changed files with 1,082 additions and 352 deletions.
13 changes: 13 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [],
"contributorsPerLine": 7,
"projectName": "Cake.AsciiDoctorJ",
"projectOwner": "cake-contrib",
"repoType": "github",
"repoHost": "https://github.com"
}
51 changes: 12 additions & 39 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,23 @@
#---------------------------------#
# Build Image #
#---------------------------------#
image: Visual Studio 2017
image:
- Visual Studio 2017

#---------------------------------#
# Build Script #
#---------------------------------#
build_script:
- ps: .\build\build.ps1

#---------------------------------#
# Tests
#---------------------------------#
test: off

#---------------------------------#
# Pull Requests #
#---------------------------------#
pull_requests:
do_not_increment_build_number: true

#---------------------------------#
# General #
#---------------------------------#
skip_branch_with_pr: true

#---------------------------------#
# Branches to build #
#---------------------------------#
branches:
# Whitelist
only:
- develop
- master
- /release/.*/
- /hotfix/.*/
- develop
- /release\/.*/
- /hotfix\/.*/

#---------------------------------#
# Build Cache #
#---------------------------------#
cache:
- tools -> build/build.cake, tools/packages.config
test: off
build: off

#---------------------------------#
# Skip builds for doc changes #
#---------------------------------#
skip_commits:
# Regex for matching commit message
message: /(doc).*/
build_script:
- ps: .\build.ps1 -Target AppVeyor

cache:
- "tools -> recipe.cake,tools/packages.config"
38 changes: 38 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
root = true

[*]
charset = utf-8
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

# This may not be needed, but kept for compatibility with VS
[*.{sln,csproj}]
end_of_line = crlf

# Markdown files allows the use of trailing spaces to denote
# a line break
[*.md]
trim_trailing_whitespace = false

# Batch and powershell files requires crlf to be
# used as the line ending.
# Powershell also requires UTF-8 with BOM encoding
# to function if utf8 characters is used (maibe batch files as well)
[*.{bat,ps1}]
charset = utf-8-bom
end_of_line = crlf

# Shell scripts requires the use of lf line endings
# to be able to run.
[*.sh]
end_of_line = lf

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

# The visual studio code file
# requires the use of crlf line endings
[tasks.json]
end_of_line = crlf
21 changes: 21 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

*.cs text diff=csharp

*.ps1 text eol=crlf
*.bat text eol=crlf
*.sln text eol=crlf
*.csproj text eol=crlf
tasks.json text eol=crlf

*.sh text eol=lf

*.md text whitespace=-trailing-space

# Exclude files from exporting

.gitattributes export-ignore
.gitignore export-ignore
57 changes: 52 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,53 @@
bin/
obj/
lib/packages/
# Ignore everything in vscode folder
# except what we want users to
# contribute if there is any
# improvement
.vscode/*
!.vscode/extensions.json
!.vscode/settings.json
!.vscode/tasks.json

# User-specific files in Visual Studio
*.suo
*.user
*.userosscache
*.sln.docstates
.vs/
build/tools
dist

# GhostDoc plugin settings file
*.GhostDoc.xml

# Ignore cake tools directory, except packages.config
tools/*
!tools/packages.config

# Ignore build artifacts
BuildArtifacts/
[Oo]bj/
[Bb]in/

# OS Specific files
*~
.DS_Store
.AppleDouble
.LSOverride

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Windows shortcuts
*.lnk

# Thumbnails
._*

# Cake.Graph related
docs/input/tasks/*

# Wyam related
config.wyam.*
9 changes: 0 additions & 9 deletions .gitlab-ci.yml

This file was deleted.

42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies within all project spaces, and it also applies when
an individual is representing the project or its community in public spaces.
Examples of representing a project or community include using an official
project e-mail address, posting via an official social media account, or acting
as an appointed representative at an online or offline event. Representation of
a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at nils@nils-andresen.de. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
<https://www.contributor-covenant.org/faq>
Loading

0 comments on commit 0dac88a

Please sign in to comment.