Shannon ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 ...

Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj

2015-07-15 14:58:19 +02:00

..

ApiDocs

Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output.

2014-01-24 18:23:37 +11:00

NuSpecs

Merge remote-tracking branch 'origin/master-v7' into dev-v7

2015-07-15 14:58:19 +02:00

Build.bat

Experiment with less verbose logging for the build (so AppVeyor is easier to use)

2015-06-21 14:41:18 +02:00

Build.proj

"+" in the version doesn't work with the current NuGet

2015-07-07 15:20:35 +02:00

BuildBelle.bat

Experiment with less verbose logging for the build (so AppVeyor is easier to use)

2015-06-21 14:41:18 +02:00

BuildDocs.ps1

Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output.

2014-01-24 18:23:37 +11:00

InstallGit.cmd

Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed)

2014-10-19 13:00:54 +02:00

ReplaceIISExpressPortNumber.exe

Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally

2013-06-23 15:13:27 +02:00

RevertToCleanInstall.bat

Add RevertToCleanInstall.bat to 4.11.5 too, it's handy.

2013-02-27 13:51:58 -01:00

RevertToEmptyInstall.bat

Correct path to Courier

2013-04-25 09:02:58 -02:00

UmbracoVersion.txt

updates version

2015-07-08 11:36:50 +02:00