Skip to content

Commit 4616afc

Browse files
author
TimoPerplex
committed
Merge pull request #1 from umbraco/dev-v7
Update to latest data
2 parents 34510e2 + e85ef38 commit 4616afc

File tree

922 files changed

+44129
-21477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

922 files changed

+44129
-21477
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ _BuildOutput/*
5151
build/UmbracoCms.AllBinaries*zip
5252
build/UmbracoCms.WebPI*zip
5353
build/UmbracoCms*zip
54+
build/UmbracoExamine.PDF*zip
5455
build/*.nupkg
5556
src/Umbraco.Tests/config/applications.config
5657
src/Umbraco.Tests/config/trees.config
@@ -121,3 +122,10 @@ src/Umbraco.Web.UI.Client/bower_components/*
121122
#Ignore Rule for output of generated documentation files from Grunt docserve
122123
src/Umbraco.Web.UI.Client/docs/api
123124
src/*.boltdata/
125+
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
126+
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
127+
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
128+
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
129+
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
130+
src/umbraco.sln.ide/*
131+
build/UmbracoCms.*/

‎build/Build.bat‎

Lines changed: 34 additions & 17 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=alpha
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 (IF [%1] NEQ [] (SET "comment="))
16+
817
SET version=%release%
918

1019
IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
@@ -14,41 +23,49 @@ ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %rel
1423

1524
ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
1625
SET nuGetFolder=%CD%\..\src\packages\
17-
..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/
26+
..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore
27+
..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
1828
..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
29+
..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
30+
..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
1931

2032
ECHO Removing the belle build folder to make sure everything is clean as a whistle
2133
RD ..\src\Umbraco.Web.UI.Client\build /Q /S
2234

2335
ECHO Removing existing built files to make sure everything is clean as a whistle
2436
RMDIR /Q /S _BuildOutput
2537
DEL /F /Q UmbracoCms.*.zip
38+
DEL /F /Q UmbracoExamine.*.zip
2639
DEL /F /Q UmbracoCms.*.nupkg
2740
DEL /F /Q webpihash.txt
2841

42+
ECHO Making sure Git is in the path so that the build can succeed
43+
CALL InstallGit.cmd
2944
ECHO Performing MSBuild and producing Umbraco binaries zip files
3045
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
3146

3247
ECHO Adding dummy files to include in the NuGet package so that empty folders actually get created
33-
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
34-
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
35-
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
36-
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
37-
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
38-
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
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\scripts\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\usercontrols\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\Views\Partials\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\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
4359

4460
ECHO Adding Web.config transform files to the NuGet package
45-
ren .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
46-
ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
47-
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
4864

4965
ECHO Packing the NuGet release files
5066
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
5167
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
68+
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoExamine.PDF.nuspec
5269

5370
IF ERRORLEVEL 1 GOTO :showerror
5471

‎build/Build.proj‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
7777
<BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
7878
<BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
79+
<BuildZipExaminePDFName>UmbracoExamine.PDF.0.6.0.zip</BuildZipExaminePDFName>
7980
<IncludeSymbols>False</IncludeSymbols>
8081
<BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
8182
<BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
@@ -102,7 +103,6 @@
102103
<SystemFolders Include="$(WebAppFolder)Masterpages" />
103104
<SystemFolders Include="$(WebAppFolder)Scripts" />
104105
<SystemFolders Include="$(WebAppFolder)Css" />
105-
<SystemFolders Include="$(WebAppFolder)MacroScripts" />
106106
<SystemFolders Include="$(WebAppFolder)Xslt" />
107107
<SystemFolders Include="$(WebAppFolder)UserControls" />
108108
<SystemFolders Include="$(WebAppFolder)Views" />
@@ -153,14 +153,22 @@
153153
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
154154
</Target>
155155

156-
<Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
156+
<Target Name="ZipWebApp" DependsOnTargets="ZipUmbracoExaminePDF" >
157157
<Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
158158

159-
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
160-
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
159+
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
160+
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
161161

162162
<Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
163163
</Target>
164+
165+
<Target Name="ZipUmbracoExaminePDF" DependsOnTargets="CreateSystemFolders" >
166+
<Message Text="Starting to zip to $(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
167+
168+
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipExaminePDFName)%22 %22$(ExaminePDFPath)*%22" />
169+
170+
<Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
171+
</Target>
164172

165173
<Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
166174
<MakeDir Directories="@(SystemFolders)" />
@@ -223,7 +231,7 @@
223231
<!-- Copy the config files and rename them to *.config.transform -->
224232
<Target Name="CopyTransformedConfig" DependsOnTargets="CopyXmlDocumentation">
225233
<ItemGroup>
226-
<ConfigFiles Include="$(WebAppFolder)config\*.config" />
234+
<ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
227235
<WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
228236
</ItemGroup>
229237

@@ -252,14 +260,11 @@
252260
</Target>
253261

254262
<!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
255-
<!-- Also, it places umbraco.XmlSerializers.dll in the root, even though it's also in the bin folder. Kill! -->
256263
<Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
257264
<ItemGroup>
258265
<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
259-
<XmlSerializersDll Include="$(WebAppFolder)umbraco.XmlSerializers.dll" />
260266
</ItemGroup>
261267
<RemoveDir Directories="@(PresentationFolderToDelete)" />
262-
<Delete Files="@(XmlSerializersDll)" />
263268
</Target>
264269

265270
<Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">

‎build/InstallGit.cmd‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
@ECHO OFF
2+
SET oldPath=%PATH%
3+
4+
git.exe 2> NUL
5+
if %ERRORLEVEL%==9009 GOTO :trydefaultpath
6+
GOTO :EOF
7+
8+
:trydefaultpath
9+
path=C:\Program Files (x86)\Git\cmd;%PATH%
10+
git.exe 2> NUL
11+
if %ERRORLEVEL%==9009 GOTO :showerror
12+
GOTO :EOF
13+
14+
:showerror
15+
path=%oldPath%
16+
ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\bin
17+
set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
18+
if %install%==y (
19+
GOTO :installgit
20+
) else (
21+
GOTO :cantcontinue
22+
)
23+
24+
:cantcontinue
25+
ECHO Can't complete the build without Git being in the path. Please add it to be able to continue.
26+
GOTO :EOF
27+
28+
:installgit
29+
ECHO Installing Chocolatey first
30+
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
31+
ECHO Installing Git through Chocolatey
32+
choco install git
33+
path=C:\Program Files (x86)\Git\cmd;%path%

0 commit comments

Comments
 (0)