Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
* release/0.3.0:
  (GH-7) Added Wyam Docs
  (GH-6) Updated project readme
  (GH-6) Added missing packages.config file
  (GH-6) Added GRM config file
  (GH-6) Removed GitVersion Config file
  (GH-6) Added SolutionInfo.cs
  (GH-6) Added folder conventions
  (GH-6) Added setup.cake file
  (GH-6) Updated build.ps1 file
  (GH-6) Updated gitignore file
  (GH-6) Updated AppVeyor File
  (GH-6) Renamed AppVeyor File
  • Loading branch information
gep13 committed Apr 2, 2017
2 parents 1e0625f + 0aea68b commit b5e968e
Show file tree
Hide file tree
Showing 42 changed files with 453 additions and 221 deletions.
26 changes: 26 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#---------------------------------#
# Build Script #
#---------------------------------#
build_script:
- ps: .\build.ps1 -Target AppVeyor

# Tests
test: off

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

#---------------------------------#
# Build Cache #
#---------------------------------#
cache:
- src\packages -> src\**\packages.config
- tools -> setup.cake
35 changes: 26 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

examples/WindowsFormsApplication1/dist/

# Cake and build stuff
tools/
nupkg/
build/
.nugetapikey
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# User-specific files
*.suo
Expand Down Expand Up @@ -48,9 +42,11 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c

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

*_i.c
*_p.c
Expand Down Expand Up @@ -117,6 +113,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover

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

# NCrunch
_NCrunch_*
.*crunch*.local.xml
Expand Down Expand Up @@ -196,6 +196,8 @@ ClientBin/
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs
Expand Down Expand Up @@ -239,6 +241,9 @@ FakesAssemblies/
# 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
Expand All @@ -257,3 +262,15 @@ paket-files/
# 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/
12 changes: 12 additions & 0 deletions GitReleaseManager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
issue-labels-include:
- Breaking change
- Feature
- Bug
- Improvement
- Documentation
issue-labels-exclude:
- Build
issue-labels-alias:
- name: Documentation
header: Documentation
plural: Documentation
4 changes: 0 additions & 4 deletions GitVersion.yml

This file was deleted.

39 changes: 38 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,41 @@

The Cake.Mage addin adds Mage.exe support to Cake

[![Build status](https://ci.appveyor.com/api/projects/status/sqbgtehgqco434g9/branch/master?svg=true)](https://ci.appveyor.com/project/enkafan/cake-mage/branch/master) [![CodeFactor](https://www.codefactor.io/repository/github/enkafan/cake.mage/badge)](https://www.codefactor.io/repository/github/enkafan/cake.mage) [![NuGet version](https://badge.fury.io/nu/cake.mage.svg)](https://badge.fury.io/nu/cake.mage)
[![License](http://img.shields.io/:license-mit-blue.svg)](http://cake-contrib.mit-license.org)

## Information

| | Stable | Pre-release |
|---|---|---|
|GitHub Release|-|[![GitHub release](https://img.shields.io/github/release/cake-contrib/Cake.Mage.svg)](https://github.com/cake-contrib/Cake.Mage/releases/latest)|
|NuGet|[![NuGet](https://img.shields.io/nuget/v/Cake.Mage.svg)](https://www.nuget.org/packages/Cake.Mage)|[![NuGet](https://img.shields.io/nuget/vpre/Cake.Mage.svg)](https://www.nuget.org/packages/Cake.Mage)|

## Build Status

|Develop|Master|
|:--:|:--:|
|[![Build status](https://ci.appveyor.com/api/projects/status/5hl4g2ilm5rmsj84/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-mage/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/5hl4g2ilm5rmsj84/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-mage/branch/master)|

## Code Coverage

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

## Quick Links

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

## Chat Room

Come join in the conversation about Cake.Mage 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)

## Build

To build this package we are using Cake.

On Windows PowerShell run:

```powershell
./build
```
16 changes: 0 additions & 16 deletions appveyor.yml

This file was deleted.

123 changes: 0 additions & 123 deletions build.cake

This file was deleted.

9 changes: 2 additions & 7 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,15 +29,13 @@ Tells Cake to use the Mono scripting engine.
Skips restoring of packages.
.PARAMETER ScriptArgs
Remaining arguments are added here.
.LINK
http://cakebuild.net
#>

[CmdletBinding()]
Param(
[string]$Script = "build.cake",
[string]$Script = "setup.cake",
[string]$Target = "Default",
[ValidateSet("Release", "Debug")]
[string]$Configuration = "Release",
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 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");
20 changes: 20 additions & 0 deletions docs/input/assets/css/override.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Control the margin for bootstrap alert boxes */
.alert > p {
margin-top: 0px;
}

/* Control the look and feel of the copy box applied to code sections */
.btn-copy[disabled] .clippy {
opacity: .3;
}
pre .btn-copy {
-webkit-transition: opacity 0.3s ease-in-out;
-o-transition: opacity 0.3s ease-in-out;
transition: opacity 0.3s ease-in-out;
opacity: 0;
padding: 2px 6px;
float: right;
}
pre:hover .btn-copy {
opacity: 1;
}
3 changes: 3 additions & 0 deletions docs/input/assets/images/clippy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions docs/input/assets/js/anchor.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b5e968e

Please sign in to comment.