Merge pull request #1 from umbraco/master-v7

merger umbraco/dev-v7  to my dev-v7

.editorconfig

@@ -0,0 +1,10 @@
+root=true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
+indent_size = 4

.gitignore

@@ -142,5 +142,6 @@ build/ui-docs.zip
 build/csharp-docs.zip
 build/msbuild.log
 .vs/
-
+src/packages/
 build/tools/
+src/PrecompiledWeb/*

appveyor.yml

@@ -2,35 +2,36 @@ version: '{build}'
 shallow_clone: true
 build_script:
 - cmd: >-
-    cd build
+    SET SLN=%CD%
 
-    SET "release="
-
-    FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
+    SET SRC=%SLN%\src
 
-    SET nuGetFolder=C:\Users\appveyor\.nuget\packages
+    SET PACKAGES=%SRC%\packages
 
-    ..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
+    CD build
 
-    ..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+    SET "release="
 
-    IF EXIST ..\src\umbraco.businesslogic\packages.config ..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+    FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
 
-    ..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+    ECHO "Restoring NuGet into %PACKAGES%"
+    
+    %SRC%\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
+    
+    %SRC%\.nuget\NuGet.exe restore %SRC%\umbraco.sln -Verbosity Quiet -NonInteractive -PackagesDirectory %PACKAGES%
 
     ECHO Building Release %release% build%APPVEYOR_BUILD_NUMBER%
     
     SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
     
     SET MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"
 
-    XCOPY "..\src\Umbraco.Tests\unit-test-log4net.CI.config" "..\src\Umbraco.Tests\unit-test-log4net.config" /Y
+    XCOPY "%SRC%\Umbraco.Tests\unit-test-log4net.CI.config" "%SRC%\Umbraco.Tests\unit-test-log4net.config" /Y
     
-    %MSBUILD% "..\src\Umbraco.Tests\Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly
+    %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /p:NugetPackagesDirectory=%PACKAGES%
     
-    build.bat nopause %release% build%APPVEYOR_BUILD_NUMBER%
+    build.bat -integration -release:%release% -comment:build%APPVEYOR_BUILD_NUMBER% -nugetfolder:%PACKAGES%
     
-    ECHO %PATH%
 test:
   assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
 artifacts:

build/Build.bat

@@ -1,31 +1,95 @@
 @ECHO OFF
-IF NOT EXIST UmbracoVersion.txt (
-	ECHO UmbracoVersion.txt missing!
-	GOTO :showerror
-)
 
-REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
-SET "release="
-SET "comment="
-FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
-FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED comment SET "comment=%%i"
+:: UMBRACO BUILD FILE
 
-REM If there's arguments on the command line overrule UmbracoVersion.txt and use that as the version
-IF [%2] NEQ [] (SET release=%2)
-IF [%3] NEQ [] (SET comment=%3) ELSE (IF [%2] NEQ [] (SET "comment="))
 
-REM Get the "is continuous integration" from the parameters
-SET "isci=0"
-IF [%1] NEQ [] (SET isci=1)
+:: ensure we have UmbracoVersion.txt
+IF NOT EXIST UmbracoVersion.txt (
+	ECHO UmbracoVersion.txt is missing!
+	GOTO error
+)
 
-SET version=%release%
-IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
+SET RELEASE=
+SET COMMENT=
+FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED RELEASE SET RELEASE=%%i
+FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED COMMENT SET COMMENT=%%i
+
+REM process args
+
+SET INTEGRATION=0
+SET nuGetFolder=%CD%\..\src\packages
+SET SKIPNUGET=0
+
+:processArgs
+
+:: grab the first parameter as a whole eg "/action:start"
+:: end if no more parameter
+SET SWITCHPARSE=%1
+IF [%SWITCHPARSE%] == [] goto endProcessArgs
+
+:: get switch and value
+SET SWITCH=
+SET VALUE=
+FOR /F "tokens=1,* delims=: " %%a IN ("%SWITCHPARSE%") DO SET SWITCH=%%a& SET VALUE=%%b
+
+:: route arg
+IF '%SWITCH%'=='/release' GOTO argRelease
+IF '%SWITCH%'=='-release' GOTO argRelease
+IF '%SWITCH%'=='/comment' GOTO argComment
+IF '%SWITCH%'=='-comment' GOTO argComment
+IF '%SWITCH%'=='/integration' GOTO argIntegration
+IF '%SWITCH%'=='-integration' GOTO argIntegration
+IF '%SWITCH%'=='/nugetfolder' GOTO argNugetFolder
+IF '%SWITCH%'=='-nugetfolder' GOTO argNugetFolder
+IF '%SWITCH%'=='/skipnuget' GOTO argSkipNuget
+IF '%SWITCH%'=='-skipnuget' GOTO argSkipNuget
+ECHO "Invalid switch %SWITCH%"
+GOTO error
+
+:: handle each arg
+
+:argRelease
+set RELEASE=%VALUE%
+SHIFT
+goto processArgs
+
+:argComment
+SET COMMENT=%VALUE%
+SHIFT
+GOTO processArgs
+
+:argIntegration
+SET INTEGRATION=1
+SHIFT
+GOTO processArgs
+
+:argNugetFolder
+SET nuGetFolder=%VALUE%
+SHIFT
+GOTO processArgs
+
+:argSkipNuget
+SET SKIPNUGET=1
+SHIFT
+GOTO processArgs
+
+:endProcessArgs 
+
+REM run
+
+SET VERSION=%RELEASE%
+IF [%COMMENT%] EQU [] (SET VERSION=%RELEASE%) ELSE (SET VERSION=%RELEASE%-%COMMENT%)
+
+ECHO ################################################################
+ECHO Building Umbraco %VERSION%
+ECHO ################################################################
 
-ECHO.
-ECHO Building Umbraco %version%
-ECHO.
+SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin
+SET MSBUILD="%MSBUILDPATH%\MsBuild.exe"
+SET PATH="%MSBUILDPATH%";%PATH%
 
-ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %RELEASE%
 
 ECHO.
 ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
@@ -35,10 +99,10 @@ RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
 ECHO.
 ECHO Removing existing built files to make sure everything is clean as a whistle
 RMDIR /Q /S _BuildOutput
-DEL /F /Q UmbracoCms.*.zip
-DEL /F /Q UmbracoExamine.*.zip
-DEL /F /Q UmbracoCms.*.nupkg
-DEL /F /Q webpihash.txt
+DEL /F /Q UmbracoCms.*.zip 2>NUL
+DEL /F /Q UmbracoExamine.*.zip 2>NUL
+DEL /F /Q UmbracoCms.*.nupkg 2>NUL
+DEL /F /Q webpihash.txt 2>NUL
 
 ECHO.
 ECHO Making sure Git is in the path so that the build can succeed
@@ -47,7 +111,7 @@ CALL InstallGit.cmd
 REM Adding the default Git path so that if it's installed it can actually be found
 REM This is necessary because SETLOCAL is on in InstallGit.cmd so that one might find Git, 
 REM but the path setting is lost due to SETLOCAL 
-path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
+SET PATH="C:\Program Files (x86)\Git\cmd";"C:\Program Files\Git\cmd";%PATH%
 
 SET toolsFolder=%CD%\tools\
 IF NOT EXIST "%toolsFolder%" (
@@ -79,59 +143,75 @@ MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
 
 FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
 MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
-	
+
 ECHO.
 ECHO Making sure we have a web.config
-IF NOT EXIST %CD%\..\src\Umbraco.Web.UI\web.config COPY %CD%\..\src\Umbraco.Web.UI\web.Template.config %CD%\..\src\Umbraco.Web.UI\web.config
+IF NOT EXIST "%CD%\..\src\Umbraco.Web.UI\web.config" COPY "%CD%\..\src\Umbraco.Web.UI\web.Template.config" "%CD%\..\src\Umbraco.Web.UI\web.config"
 
 for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
   if /i "%%i"=="installationPath" set InstallDir=%%j
 )
 
 SET VSWherePath="%InstallDir%\MSBuild"
+
 ECHO.
 ECHO Visual Studio is installed in: %InstallDir%
 
 SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin
 SET MSBUILD="%MSBUILDPATH%\MsBuild.exe"
 
+ECHO.
+ECHO Reporting NuGet version
+"%nuGetExecutable%" help | findstr "^NuGet Version:"
+
+ECHO.
+ECHO Restoring NuGet packages
+ECHO Into %nuGetFolder%
+"%nuGetExecutable%" restore "%CD%\..\src\umbraco.sln" -Verbosity Quiet -NonInteractive -PackagesDirectory "%nuGetFolder%"
+IF ERRORLEVEL 1 GOTO :error
+
 ECHO.
 ECHO.
 ECHO Performing MSBuild and producing Umbraco binaries zip files
 ECHO This takes a few minutes and logging is set to report warnings
 ECHO and errors only so it might seems like nothing is happening for a while. 
 ECHO You can check the msbuild.log file for progress.
 ECHO.
-%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /p:NugetPackagesDirectory=%nuGetFolder% /p:VSWherePath=%VSWherePath%
-IF ERRORLEVEL 1 GOTO :error
+%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory="%nuGetFolder%" /p:VSWherePath=%VSWherePath% /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
+IF ERRORLEVEL 1 GOTO error
 
 ECHO.
 ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
 attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
 
+IF %SKIPNUGET% EQU 1 GOTO success
+
 ECHO.
 ECHO Adding Web.config transform files to the NuGet package
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
 
 ECHO.
 ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols -Verbosity quiet
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version% -Verbosity quiet
-IF ERRORLEVEL 1 GOTO :error
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %VERSION% -Symbols -Verbosity quiet
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %VERSION% -Verbosity quiet
+IF ERRORLEVEL 1 GOTO error
 
 :success
 ECHO.
 ECHO No errors were detected!
 ECHO There may still be some in the output, which you would need to investigate.
 ECHO Warnings are usually normal.
+ECHO.
+ECHO.
 GOTO :EOF
 
 :error
 
 ECHO.
 ECHO Errors were detected!
+ECHO.
 
 REM don't pause if continuous integration else the build server waits forever
 REM before cancelling the build (and, there is noone to read the output anyways)
-IF isci NEQ 1 PAUSE
+IF %INTEGRATION% NEQ 1 PAUSE