Skip to content

Commit 5a26a52

Browse files
Merge branch '7.1.9' into 7.2.0
Conflicts: build/Build.bat build/UmbracoVersion.txt
2 parents 31903c8 + 5aa29cc commit 5a26a52

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

build/Build.bat

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@
22
IF NOT EXIST UmbracoVersion.txt (
33
ECHO UmbracoVersion.txt missing!
44
GOTO :showerror
5-
)
6-
SET /p release=<UmbracoVersion.txt
7-
SET comment=beta2
5+
)
6+
7+
REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
8+
SET "release="
9+
SET "comment="
10+
FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
11+
FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED comment SET "comment=%%i"
12+
13+
REM If there's arguments on the command line overrule UmbracoVersion.txt and use that as the version
14+
IF [%1] NEQ [] (SET release=%1)
15+
IF [%2] NEQ [] (SET comment=%2) ELSE (SET "comment=")
16+
817
SET version=%release%
918

1019
IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
@@ -36,20 +45,22 @@ ECHO Performing MSBuild and producing Umbraco binaries zip files
3645
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
3746

3847
ECHO Adding dummy files to include in the NuGet package so that empty folders actually get created
39-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
40-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
41-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
42-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
43-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
44-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
45-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
46-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
47-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
48-
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
48+
SET dummytext=This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete.
49+
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Code\dummy.txt
50+
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Data\dummy.txt
51+
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
52+
ECHO %dummytext% > .\_BuildOutput\WebApp\css\dummy.txt
53+
ECHO %dummytext% > .\_BuildOutput\WebApp\masterpages\dummy.txt
54+
ECHO %dummytext% > .\_BuildOutput\WebApp\media\dummy.txt
55+
ECHO %dummytext% > .\_BuildOutput\WebApp\scripts\dummy.txt
56+
ECHO %dummytext% > .\_BuildOutput\WebApp\usercontrols\dummy.txt
57+
ECHO %dummytext% > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
58+
ECHO %dummytext% > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
4959

5060
ECHO Adding Web.config transform files to the NuGet package
51-
ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
52-
ren .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
61+
REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
62+
REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
63+
REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
5364

5465
ECHO Packing the NuGet release files
5566
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%

build/UmbracoVersion.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
7.2.0
1+
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
2+
7.2.0
3+
beta2

0 commit comments

Comments
 (0)