Skip to content

Commit

Permalink
Merge branch 'release/0.6.0'
Browse files Browse the repository at this point in the history
* release/0.6.0:
  (doc) Added release blog post
  (GH-23) Added Wyam Docs
  (GH-13) Added Cake.Recipe
  (GH-22) Added packages.config file
  (GH-21) Corrected cache invalidation
  (GH-20) Remove appveyor regex
  (GH-19) Remove Gitter Configuration
  (GH-18) Added branch configuration
  (GH-17) Changed name of appveyor file
  Upgrade Cake to 0.17.0
  • Loading branch information
gep13 committed Feb 2, 2017
2 parents 4594119 + 1cd09be commit 76179e4
Show file tree
Hide file tree
Showing 16 changed files with 241 additions and 151 deletions.
21 changes: 3 additions & 18 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,12 @@ branches:
only:
- develop
- master

#---------------------------------#
# Notifications Configuration #
#---------------------------------#
notifications:
- provider: Webhook
url: https://webhooks.gitter.im/e/592eec477e12726db2ee
on_build_success: true
on_build_failure: true
on_build_status_changed: true
- /release/.*/
- /hotfix/.*/

#---------------------------------#
# Build Cache #
#---------------------------------#
cache:
- Source\packages -> Source\**\packages.config
- Tools -> build.ps1

#---------------------------------#
# Skip builds for doc changes #
#---------------------------------#
skip_commits:
# Regex for matching commit message
message: /(doc).*/
- tools -> setup.cake
147 changes: 121 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,39 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
build/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

#NUNIT
# NUNIT
*.VisualState.xml
TestResult.xml

Expand All @@ -29,6 +42,12 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c

# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

*_i.c
*_p.c
*_i.h
Expand Down Expand Up @@ -61,14 +80,18 @@ _Chutzpah*
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/
Expand All @@ -81,7 +104,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

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

# TeamCity is a build add-in
Expand All @@ -90,10 +113,14 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
*.ncrunch*
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
Expand Down Expand Up @@ -121,44 +148,70 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml

# NuGet Packages Directory
packages/
## TODO: If the tool you use requires repositories.config uncomment the next line
#!packages/repositories.config

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
!packages/build/

# Windows Azure Build Output
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
tools/xunit.runner.console/
tools/cake/
tools/Cake.AliaSql/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
Expand All @@ -176,6 +229,48 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/

# Build related
tools/
# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
tools/**
!tools/packages.config
BuildArtifacts/
23 changes: 4 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,6 @@ Cake.AliaSql

AliaSql Script Alias for [Cake](https://github.com/cake-build/cake) build system.

### Example usage:
```cake
#tool "AliaSQL"
#addin "Cake.AliaSql"

...

Task("RebuildDatabase")
.Does(() => {
AliaSql("Rebuild", new AliaSqlSettings
{
ToolPath = "./tools/AliaSQL/tools/AliaSQL.exe",
ConnectionString = ".\\sqldb",
DatabaseName = "TestDatabase",
ScriptsFolder = "./src/Database/Scripts",
});
});
```

## Information

||Stable|Pre-release|
Expand All @@ -40,6 +21,10 @@ Task("RebuildDatabase")

[![Coverage Status](https://coveralls.io/repos/github/cake-contrib/Cake.AliaSql/badge.svg?branch=develop)](https://coveralls.io/github/cake-contrib/Cake.AliaSql?branch=develop)

## Quick Links

- [Documentation](https://cake-contrib.github.io/Cake.AliaSql/)

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

Expand Down
10 changes: 1 addition & 9 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@
##########################################################################

<#
.SYNOPSIS
This is a Powershell script to bootstrap a Cake build.
.DESCRIPTION
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
and execute your Cake build script with the parameters you provide.
.PARAMETER Script
The build script to execute.
.PARAMETER Target
Expand All @@ -32,10 +29,8 @@ Tells Cake to use the Mono scripting engine.
Skips restoring of packages.
.PARAMETER ScriptArgs
Remaining arguments are added here.
.LINK
http://cakebuild.net
#>

[CmdletBinding()]
Expand Down Expand Up @@ -165,7 +160,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
}

Write-Verbose -Message "Restoring tools from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -PreRelease -OutputDirectory `"$TOOLS_DIR`" -Source https://www.myget.org/F/cake/api/v3/index.json"

if ($LASTEXITCODE -ne 0) {
Throw "An error occured while restoring NuGet tools."
Expand All @@ -183,9 +178,6 @@ if (!(Test-Path $CAKE_EXE)) {
Throw "Could not find Cake.exe at $CAKE_EXE"
}

# Make sure that re-usable build.cake file exists.
Invoke-Expression "&`"$NUGET_EXE`" install gep13.DefaultBuild -ExcludeVersion -PreRelease -OutputDirectory `"$TOOLS_DIR`" -Source `"https://www.myget.org/F/gep13/api/v3/index.json`""

# Start Cake
Write-Host "Running build script..."
Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
Expand Down
1 change: 1 addition & 0 deletions config.wyam
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-GB");
22 changes: 22 additions & 0 deletions docs/input/blog/new-release-0.6.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
Title: New Release - 0.6.0
Published: 2/2/2017
Category: Release
Author: gep13
---

# Long time, no release

Thanks to a contribution from @devlead, we are releasing 0.6.0 of Cake.AliaSql. This includes the following:

## Improvement

- [__#13__](https://github.com/cake-contrib/Cake.AliaSql/issues/13) Switch away from using gep13.DefaultBuild and use Cake.Recipe instead

## Documentation

- [__#23__](https://github.com/cake-contrib/Cake.AliaSql/issues/23) Add Wyam Documentation generation

It was decided that this was required due to the fact that with the impending release of Cake 0.18.0 all addins need to be at least 0.16.0, so we decided to upload to the latest.

Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin.
Loading

0 comments on commit 76179e4

Please sign in to comment.