yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,385 Commits 4 Branches 7 Tags
2cf3be8c10d99dfb7170cbbda1edb8aade2d7b71
Commit Graph

94 Commits

Author SHA1 Message Date
Paul Johnson
7020793235 Restore BelleBuild target (for back-office assets) and use npm ci (#11364) 
Co-authored-by: Ronald Barendse <ronald@barend.se>
 2021-10-19 10:15:07 +01:00
Paul Johnson
00133e880d Move test projects from src/ to tests/ (#11357) 
* Update gitignore

* Move csproj

* Update project references

* Update solutions

* Update build scripts

* Tests used to share editorconfig with projects in src

* Fix broken tests.

* Stop copying around .editorconfig

merged root one with linting

* csharp_style_expression_bodied -> suggestion

* Move StyleCop rulesets to matching directories and update shared build properties

* Remove legacy build files, update NuGet.cofig and solution files

* Restore myget source

* Clean up .gitignore

* Update .gitignore

* Move new test classes to tests after merge

* Gitignore + nuget config

* Move new test

Co-authored-by: Ronald Barendse <ronald@barend.se>
 2021-10-18 08:14:04 +01:00
Paul Johnson
bceebea158 V9 Move sln files to root (#11212) 
* Move sln files to root

* Fix tests

* Misc cleanup - remove unused helper

* Document the esoteric nature of UmbracoWebApplicationFactory

* Avoid unnecessary change to TestHelper WorkingDirectory
 2021-09-29 11:51:28 +01:00
Warren Buckley
b8316d151e Commit missing update to ensure gitignore file is packed in Umbraco.Templates 2021-09-09 14:36:34 +01:00
Bjarke Berg
56d8e0e684 Merge remote-tracking branch 'origin/v8/8.16' into v9/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/build.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Diagnostics/MiniDump.cs
#	src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
#	src/Umbraco.Infrastructure/Persistence/LocalDb.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyHandler.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2021-08-26 12:13:04 +02:00
Sebastiaan Janssen
3030269bde Create a cloud-specific zip that includes necessary config transforms for cloud 2021-08-20 14:21:36 +02:00
Sebastiaan Janssen
d566d42c4b Remove unintentional change from 15 months ago that causes you to end up in your windows users folder after each build 2021-08-20 14:20:46 +02:00
Elitsa Marinovska
5f4ddf86ab Renaming proj ref in build script and azure pipelines file 2021-08-18 11:13:58 +02:00
Elitsa Marinovska
490c09b81e Remove old references of Umbraco.Web.UI 2021-08-18 10:58:23 +02:00
Bjarke Berg
6ef2deb3cb Fix base url for js docs 2021-08-09 07:48:37 +02:00
Shannon
5549c446f7 try to fix build 2021-07-15 15:20:49 -06:00
Bjarke Berg
7449bf2947 Clean up 2021-06-25 10:56:49 +02:00
Bjarke Berg
c170123f3a Clean up and fix for xml docs for forms (at least locally) 2021-06-25 09:35:39 +02:00
Warren Buckley
b0f55bab69 Specify the outputFile argument in powershell build as path is relative to the build folder when run from there 2021-06-24 14:33:33 +01:00
Warren Buckley
8bc3425910 Update Powershell build script 
Runs dotnet run on the console app to genetate the schema & default location
 2021-06-24 13:34:42 +01:00
Warren Buckley
8d3434d7d8 dotnet new template - Escape JSON special characters for password & connection string (#10467) 
* Fix sourceName to match UmbracoProject and use a generated symbol to replace the Umbraco.Cms.Web.UI.NetCore in Program and Startup files

* Update template.json

* Run `npm update caniuse-lite`

* Regex replacement for Password & Connection strings that gets placed into AppSettings.Development.json So escaping \ and " for JSON strings

* Escaping input and handle namespace replacing. + Updated to beta004

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-06-15 09:42:52 +02:00
Bjarke Berg
cb6f74774d No not use explicit nuspec file for Examine.Lucene anymore :) 2021-05-19 19:12:13 +02:00
Warren Buckley
473bc53c66 dotnet new template - Support unattended (#10107) 
* Remove trailing comma

* Remove duplicate property

* Logo is now transparent & not on a solid a white BG

* Adds in auto Nuget Restore with an option to skip auto restore if you wish to

https://github.com/dotnet/dotnet-template-samples/tree/master/08-restore-on-create

* Fix typo

* Rename from UmbracoSolution to UmbracoProject

Bit misleading as it only ever creates a CSProj & not a SLN

* Couple extra places that needed a rename

* Adds support for HTTP & HTTPS port that will autogenerate an available free port number

https://github.com/dotnet/templating/wiki/Available-Symbols-Generators#port

* Update build/templates/UmbracoProject/.template.config/template.json

Co-authored-by: Bjarke Berg <mail@bergmania.dk>

* Update build/templates/UmbracoProject/.template.config/template.json

Co-authored-by: Bjarke Berg <mail@bergmania.dk>

* Rather than COPY appsettings from Umbraco.Web.UI.NetCore we use these specific ones so we can add logic to them

* Support for unattended install with new CLI args

* Change order so all the long textboxes that are optional are together

* Apply suggestions from code review from Elitsa

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

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2021-04-22 13:22:01 +02:00
Bjarke Berg
f668bf060a move static assets and the target+props file to a seperate nuget. Now the root package is only referencing other packages 2021-03-19 08:08:00 +01:00
Bjarke Berg
d777d7dded Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 13:48:14 +01:00
Bjarke Berg
89cc2d31d5 Fix build script after removale of old nuspec files 2021-03-11 13:29:31 +01:00
Bjarke Berg
2b89839724 Netcore: Get rid of default files in config folder (#9966) 
* TourController now uses the core tours from embedded resources

* Moved tinyMceConfig.*.config to IOptions

* Embedded the default grid.editors.config.js

* Fixed issue when saving grid with an empty media cell

* Logviewer now uses sql as database instead of file.

* Remove config folder from build script and nuget pacakges.

* Removing auto-generated Id added to appsettings.json

* Update src/Umbraco.Web.BackOffice/Controllers/TourController.cs

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2021-03-11 13:20:46 +01:00
Mole
f5df05d685 Add metadata to all packages and rename UmbracoCms.Lucene.nuspec to UmbracoCms.Examine.Lucene.nuspec 2021-03-05 13:56:41 +01:00
Mole
a3c8638636 Create nuspec for Examine.Lucene 
Need to do this to be able to add the Examine/Lucene dlls.

You can actually create and run a site with the template \o/
 2021-03-05 10:03:32 +01:00
Mole
390cf6ca66 Pack all projects as individual packages and add them as dependency 
Only have to add Umbraco.Cms.Web.Website and Umbraco.Cms.Web.BackOffice, rest will be indirect dependencies.
 2021-03-04 14:10:55 +01:00
Elitsa Marinovska
a2cfd277ce Cleanup 2021-02-18 08:33:49 +01:00
Bjarke Berg
02ac81d53f Fixed buildscripts to work with latest Umbraco.Build (0.2.17) and Directory.Build.props. Also updates the port (Now located in launchSettings.json) number if SetUmbracoVersion is called. 2021-02-16 12:28:37 +01:00
Bjarke Berg
c876cb3583 Added Views to template and fixed casing issue for linux 2021-02-05 14:41:33 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
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