Commit Graph

65 Commits

Author SHA1 Message Date
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
2020-09-09 19:13:37 +02:00
Sebastiaan Janssen
4313463a94 Switch from the Chrome runner to JSDom (#8800) 2020-09-03 10:36:58 +02:00
Bjarke Berg
31e8acb875 Renamed nuget pacakges to Umbrac.Cms.* 2020-08-24 09:23:37 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
2020-08-12 13:25:24 +02:00
Bjarke Berg
9eee058211 Fix issue with buildscript and verify nuget 2020-08-11 20:31:04 +02:00
Bjarke Berg
2ed8e89d9b Fixes for build script 2020-08-11 12:26:01 +02:00
Bjarke Berg
f0795f63b5 Get the SqlCE dll from the SqlCE project instead of the executeable, now that the executable does not include SqlCE anymore by default 2020-08-11 10:40:37 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591)
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2020-08-11 08:28:16 +02:00
Elitsa Marinovska
0c4959fc99 Merge branch 'netcore/feature/AB4822-nuget-packages-basis' into netcore/feature/AB4827-sqlce-nuget 2020-07-08 09:14:28 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
0a088e4ef4 casing changed
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:48:41 +02:00
Bjarke Berg
8c46eab939 bugfix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:45:10 +02:00
Bjarke Berg
f7c6d1c68c bugfix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:37:14 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 20:40:44 +02:00
Elitsa Marinovska
c03bff4399 Nuget package specifications for SQL CE 2020-07-07 16:10:06 +02:00
Elitsa Marinovska
a2c54018a7 modifying CompileUmbraco() and PreparePackages() functions needed before packaging the nuget packages 2020-06-30 23:10:51 +02:00
Sebastiaan Janssen
3b2d87950c Fix replacement of baseurl in UI docs 2020-06-18 11:28:31 +02:00
Warren Buckley
29f0ba0b37 Merge pull request #5466 from umbraco/v8/api-docs-update
Api documentation functions update
2020-06-08 13:59:42 +00:00
Bjarke Berg
45224a35d0 Initial acceptance test commit 2020-05-13 15:18:40 +02:00
Elitsa Marinovska
64be0c99af Changing the naming in case they are used on the build server 2020-05-12 13:33:30 +02:00
Elitsa Marinovska
3e73888510 Changing path that was causing an error 2020-05-12 12:20:32 +02:00
Elitsa Marinovska
85ff4be55d Merge branch 'v8/dev' into v8/api-docs-update
# Conflicts:
#	build/build.ps1
2020-05-12 12:06:45 +02:00
Jeffrey Schoemaker
ead3de05e4 Added the correct sources to the buildscripts. If you have inte… (#7089) 2020-03-13 13:30:54 +01:00
Warren Buckley
66801f09ab Remove the cleanup code of LESS Source Map files from the ZIP & Nupkg builds - this is done with Niels PR as only gulp dev creates LESS SourceMaps 2019-12-06 09:27:35 +00:00
Warren Buckley
2948d506ea V8: Bye hardcoded colors lets use Variables (#7246)
* Bye bye #fff let's use the variable @white instead

* Update to use @black

* Update canvas-designer file with variables where possible - ALOT was not found (need to see if we have similar matches already)

* Update all hex colour variables or add a TODO comment

* Empty LESS files so lets get rid of them

* Moves the color CSS classes out into own less file to ensure variables contains variables only

* Adds in gulp-sourcemaps to allow us to have LESS sourcemaps - https://www.npmjs.com/package/gulp-less#source-maps

* A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables

* Revert "A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables"

This reverts commit 5ac8080c8b314cd65b1bd735fea88569991736b2.

* Update hard-coded hex values to color variables

* Fix couple typos with LESS variables gray not grey

* Amend build script so we remove the /umbraco/assets/css/maps folder from the build ouput of the ZIP & Nuget Packages

* Removing more hard coded colour values
2019-12-05 13:38:57 +01:00
Niels Lyngsø
aafa314f0e Separate gulp script for docs (#6409) 2019-09-25 10:52:33 +02:00
Warren Buckley
60ed6f6b20 Remove snupkg aka newer Symbol nuget packages 2019-06-24 13:18:20 +01:00
elitsa
1a54cdb583 Functions for the API docs are refactored 2019-05-15 13:54:35 +02:00
Shannon
8fce680430 removes unused line, updates gitignore 2019-05-10 13:07:06 +10:00
elitsa
3d80d511a4 Adding a parameter for enabling docfx into the script. 2019-05-08 14:27:44 +02:00
Elitsa Marinovska
6cd77df1ad Updating the base link 2019-05-01 15:30:58 +02:00
Elitsa Marinovska
adf762bdf8 Integrate docs script with the main build script 2019-05-01 15:25:47 +02:00
Warren Buckley
103c92bc69 Update powershell to use the snupkg format for symbol package to be hosted on nuget.org symbol server
Advisory from Nuget team is to no longer include the C# .cs files in the src folder of a nuget package
2019-04-24 12:31:05 +01:00
Sebastiaan Janssen
ac4c98a7fc Enable direct command execution in build script (#4882) 2019-03-06 10:35:26 +01:00
Chris Houston
193e24afd2 Fixing all the TODO, FIXME & HACK comments so they all follow the same layout. 2019-01-27 11:16:00 +01:00
Callum Whyte
f8b382ea0a Eliminating bower (#4146) 2019-01-20 20:43:47 +01:00
Stephan
a1400d33fd Fixes, version 8.0.0-alpha.58 2019-01-07 19:41:23 +01:00
Aaron Powell
0e56f2035d Using npx for running gulp (#3938) 2018-12-31 14:10:31 +00:00
Stephan
42857ebc2a Simplify version management, SolutionInfo is only the source now 2018-11-15 08:47:47 +01:00
Warren Buckley
e902bb08f6 Removes installing bower from the build powershell 2018-10-11 13:37:20 +01:00
Stephan
ffc7d5ba04 Fix build script 2018-09-04 09:35:39 +02:00
Shannon
09ee58ddad Removes more refs to umbraco_client, fixes up nuspecs 2018-08-29 10:49:55 +10:00
Warren
e626fe3c8f Merge branch 'temp8' into temp8-nuget-pkgs 2018-08-01 10:46:00 +01:00
Stephan
ee5a834ab0 Ensure build respects NUGET_PACKAGES 2018-07-31 15:55:31 +02:00
Warren
05196d5aa0 Add Cms.Web to Nuspecs to Verify in build script 2018-07-31 12:19:11 +01:00
Warren
d2ae7737b6 Update Powershell Build.ps1 to attempt to pack the Web.nuspec 2018-07-31 11:24:07 +01:00
Lotte Pitcher
e920d3f4b2 In build.ps1, use .Path if .Source returns nothing 2018-07-27 11:39:27 +01:00
Stephan
f535f6d324 Cleanup ModelsBuilder merge 2018-05-21 11:49:08 +02:00
Stephan
40f2558a70 Cleanup 2018-05-17 13:03:37 +02:00
Stephan
a6ea270d93 Cleanup build 2018-05-16 21:52:40 +02:00