Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jericho committed Feb 17, 2021
2 parents 93706f3 + 3bf62a2 commit c7ae92b
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 387 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.4",
"commands": [
"dotnet-cake"
]
}
}
}
19 changes: 11 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Created with the help of https://www.gitignore.io/api/visualstudio
# Edit at https://www.gitignore.io/?templates=visualstudio
# Created with the help of https://www.toptal.com/developers/gitignore/api/visualstudio (formerly https://www.gitignore.io/api/visualstudio)
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio

### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
Expand Down Expand Up @@ -33,6 +33,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down Expand Up @@ -130,9 +131,6 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

Expand All @@ -143,6 +141,9 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json

# Coverlet is a free, cross platform Code Coverage Tool
coverage*[.json, .xml, .info]

# Visual Studio code coverage results
*.coverage
*.coveragexml
Expand Down Expand Up @@ -312,9 +313,8 @@ paket-files/
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
# Cake
tools/**
!tools/packages.config
BuildArtifacts/

# Tabs Studio
Expand Down Expand Up @@ -353,7 +353,10 @@ healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# WinMerge
*.bak

# End of https://www.gitignore.io/api/visualstudio
# End of https://www.toptal.com/developers/gitignore/api/visualstudio
9 changes: 6 additions & 3 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
mode: ContinuousDelivery
branches:
releases?[/-]:
release:
regex: releases?[/-]
mode: ContinuousDeployment
tag: rc
dev(elop)?(ment)?$:
develop:
regex: dev(elop)?(ment)?$
mode: ContinuousDeployment
tag: alpha
hotfix(es)?[/-]:
hotfix:
regex: hotfix(es)?[/-]
mode: ContinuousDeployment
tag: beta
ignore:
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ Cake.Email.Common contains common code used by all "email related" Addin for [Ca
- [Documentation](https://cake-contrib.github.io/Cake.Email.Common/)

## Chat Room
Come join in the conversation about Cake.Email.Common in our Gitter Chat Room

[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Please do not hesitate to reach out in the [GitHub discussions](https://github.com/cake-build/cake/discussions/categories/extension-q-a) if you have any issues using this addin.
18 changes: 13 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,33 @@
init:
- git config --global core.autocrlf true

# Build Script
# Build script
build_script:
- ps: .\build.ps1 -Target AppVeyor
- dotnet --info
- ps: .\build.ps1 --target=CI

# Tests
test: off

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

# Build Cache
# Build cache
cache:
- tools -> recipe.cake, tools\packages.config
- tools -> recipe.cake, .config/dotnet-tools.json

# Environment configuration
image: Visual Studio 2019

#---------------------------------#
# Skip builds for doc changes #
#---------------------------------#
skip_commits:
# Regex for matching commit message
message: /\(doc\).*/
Loading

0 comments on commit c7ae92b

Please sign in to comment.