From 60a172343f3a071e462c98e1b2f6b9fadfe3902a Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 17 Oct 2016 12:24:35 +0200 Subject: [PATCH] Build TLC --- appveyor.yml | 2 +- build/Build.bat | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c419157625..559793130d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ build_script: XCOPY "%SRC%\Umbraco.Tests\unit-test-log4net.CI.config" "%SRC%\Umbraco.Tests\unit-test-log4net.config" /Y - %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /p:NugetPackagesDirectory=%PACKAGES% + %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly /p:NugetPackagesDirectory=%PACKAGES% build.bat -integration -release:%release% -comment:build%APPVEYOR_BUILD_NUMBER% -nugetfolder:%PACKAGES% diff --git a/build/Build.bat b/build/Build.bat index 1c5d0a80ef..ca52c5aa2f 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -2,8 +2,6 @@ :: UMBRACO BUILD FILE -ECHO. - :: ensure we have UmbracoVersion.txt IF NOT EXIST UmbracoVersion.txt ( ECHO UmbracoVersion.txt is missing! @@ -82,9 +80,9 @@ REM run SET VERSION=%RELEASE% IF [%COMMENT%] EQU [] (SET VERSION=%RELEASE%) ELSE (SET VERSION=%RELEASE%-%COMMENT%) -ECHO. +ECHO ################################################################ ECHO Building Umbraco %VERSION% -ECHO. +ECHO ################################################################ SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin SET MSBUILD="%MSBUILDPATH%\MsBuild.exe" @@ -100,10 +98,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 @@ -135,7 +133,7 @@ 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% /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /fileLogger +%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory=%nuGetFolder% /consoleloggerparameters:Summary;ErrorsOnly /fileLogger IF ERRORLEVEL 1 GOTO error ECHO.