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

1473 Commits

Author SHA1 Message Date
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
Chad
388e0283bc Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856) 
(cherry picked from commit a6e1c2e901)
 2021-02-22 09:56:13 +01:00
Chad
a6e1c2e901 Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856) 2021-02-22 09:53:53 +01:00
Sebastiaan Janssen
980acafbeb Merge branch 'v8/contrib' into v8/dev 2021-02-20 17:17:27 +01:00
Sebastiaan Janssen
81f1c2e7d6 Update to latest Examine 2021-02-18 22:08:12 +01:00
Sebastiaan Janssen
02963e7b29 Remove HtmlSanitizer (#9803) 2021-02-18 17:50:00 +01:00
Elitsa Marinovska
a2cfd277ce Cleanup 2021-02-18 08:33:49 +01:00
Mole
0e16528db5 Merge pull request #9827 from umbraco/netcore/bugfix/fixed-build-script-to-use-Directory-build-props 
Netcore: Fixed buildscripts to work with latest Umbraco.Build and Directory.Build.props
 2021-02-16 14:55:26 +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
6fcfcb0003 https://github.com/umbraco/Umbraco-CMS/issues/9811 Copy static files to publish directory in dotnet template 2021-02-16 07:19:47 +01:00
Shannon
08339d444e Merge branch 'v8/dev' into v8/feature/nucache-perf 2021-02-11 12:23:25 +11:00
Bjarke Berg
c876cb3583 Added Views to template and fixed casing issue for linux 2021-02-05 14:41:33 +01:00
Bjarke Berg
c98efe047f Cleanup of duplicate entries in csproj and disabled compiled views as default from template (To work with purelive) 2021-02-05 12:27:30 +01:00
Bjarke Berg
246e29f1a6 Updated template to ignore generated files and added _ViewImports.cshtml 2021-02-05 11:46:50 +01:00
Bjarke Berg
3aadb7af46 Fixed wrong nuget reference in nuspec 2021-02-05 10:40:20 +01:00
Sebastiaan Janssen
e62cef6151 Revert "Fixes wrong dependency in nuspec file" 
This reverts commit 8642b61449.
 2021-01-28 12:05:19 +01:00
Shannon
0688de7767 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/nucache-perf 2021-01-28 15:00:19 +11:00
Shannon
4c31fd176b Merge branch 'v8/dev' into v8/feature/nucache-perf 
# Conflicts:
#	src/Umbraco.Core/Constants-SqlTemplates.cs
 2021-01-21 22:49:33 +11:00
Bjarke Berg
063bb5aa51 Updated dotnet new template to use net5 and prepare for option for net6 in the future 2021-01-21 06:45:21 +01:00
Bjarke Berg
2291162fb3 Fix too many wildcard characters in .net version 2021-01-20 21:32:14 +01:00
Bjarke Berg
362767601c update azure pipeline to use .net 5 2021-01-20 21:26:12 +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
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.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/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
Sebastiaan Janssen
8642b61449 Fixes wrong dependency in nuspec file 
Updates NPoco to the latest v4 version
 2021-01-11 13:19:18 +01:00
Bjarke Berg
cd169fbcce Update version number in umbraco template from azure pipeline in continuous builds 2020-12-17 14:26:17 +01:00
Bjarke Berg
e4857abc57 Added missing package to nuspec 2020-12-17 12:58:15 +01:00
Bjarke Berg
0151c435f1 Netcore: Package support for media + media types (#9547) 
* Add support for media when installing a package

* clean up

* Fix tests

* Add support for media when installing a package

* clean up

* Fix tests

* moved tests + test data

* Migrated package tests + resources

* Fix issue with media picker on package page, was empty after save.

* Added missing files

* Fix casing issue of resources

* Added test for media

* Fix tests for linux

* Fix test

* Fix issue with move media..

* Fix issue with adding files to packages

* Add MediaType permissions.

* Fix test

* Fix test

* Retry flaky tests, and added TODOs to fix those

* new attempt to fix test

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-12-16 22:26:47 +01:00
Paul Johnson
cb84a98b9c Fix indent for MacOS 
Don't split build and test on Windows.
 2020-12-13 12:27:34 +00:00
Paul Johnson
1b9d1428e6 Update ci pipeline build definition 2020-12-11 15:38:35 +00:00
Bjarke Berg
d74cc9d35a Fix wrong version of Smidge in nuspec + Updated to official 3.2.0 2020-12-05 08:55:37 +01:00
Jack Lawry
e772728c9d Fix typo in Upgrade message 
Change recommmend to recommend
 2020-12-04 07:48:49 +10:00
Bjarke Berg
97000590c3 Added "Update Version" step 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 12:21:25 +01:00
Bjarke Berg
3250231e02 Increased timeout for integration tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 10:10:42 +01:00
Bjarke Berg
62771d7c08 added mac os x for unit tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 10:09:30 +01:00
Bjarke Berg
af03b98071 https://github.com/umbraco/Umbraco-CMS/pull/9459 Indentation 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 09:03:45 +01:00
Bjarke Berg
23ac4eb8fb https://github.com/umbraco/Umbraco-CMS/pull/9459 seperate unit tests and build artifacts into two jobs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 08:56:24 +01:00
Bjarke Berg
9f5437a72e https://github.com/umbraco/Umbraco-CMS/pull/9459 seperate unit tests and build artifacts into two jobs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 08:53:49 +01:00
Bjarke Berg
43278183e7 https://github.com/umbraco/Umbraco-CMS/pull/9459 run stages in parallel 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 08:38:50 +01:00
Elitsa Marinovska
8ea2787f08 using again 3.1.x format of .net core sdk verison 2020-12-01 15:30:06 +01:00
Elitsa Marinovska
8d7ec23f69 Reverting back the netcore sdk version 2020-12-01 15:15:34 +01:00
Elitsa Marinovska
55cd83bbac Update azure-pipelines.yml for Azure Pipelines 
Copied over the yaml file as something is acting up
 2020-12-01 15:03:29 +01:00
Elitsa Marinovska
0a6b96e8f5 Publishing artifacts 2020-12-01 11:06:17 +01:00
Elitsa Marinovska
23173b966b Test with .net core sdk version 5.0.x didn't work so reverting back to 3.1.x 2020-12-01 09:31:16 +01:00
Elitsa Marinovska
fe2d407fcb Update the sdk version format 2020-12-01 09:16:09 +01:00
Elitsa Marinovska
5c70ed1e74 Updated .Net Core sdk version 2020-12-01 08:39:05 +01:00
Elitsa Marinovska
10cb685b05 Adding steps for running the Integration Tests 2020-11-26 13:24:05 +01:00
Elitsa Marinovska
e5b3f84371 Fix naming 2020-11-26 13:03:09 +01:00
Elitsa Marinovska
8168667267 adding displayName 2020-11-26 12:59:52 +01:00
Elitsa Marinovska
80379499c3 syntax issue 2020-11-26 12:50:41 +01:00
Elitsa Marinovska
03504399f2 Adding stages 2020-11-26 12:48:38 +01:00