Commit Graph

38593 Commits

Author SHA1 Message Date
Sebastiaan Janssen
2de635abb0 Merge branch 'v8/dev' into v8/contrib 2021-05-21 15:07:28 +02:00
Sebastiaan Janssen
9f51de5373 Merge branch 'v8/8.14' into v8/dev 2021-05-21 15:06:49 +02:00
Sebastiaan Janssen
0a9325c3d6 Merge branch 'v8/8.13' into v8/8.14
# Conflicts:
#	src/SolutionInfo.cs
2021-05-21 15:06:28 +02:00
Sebastiaan Janssen
008480a17b Can't use optimized version of this method call until 8.14 2021-05-21 15:01:51 +02:00
Andy Butland
12328ba2f7 Fixed issue with data types not being cleared in cache refresh operations.
(cherry picked from commit 71a1817a06)
2021-05-21 14:27:13 +02:00
Andy Butland
71a1817a06 Fixed issue with data types not being cleared in cache refresh operations. 2021-05-21 14:26:33 +02:00
Bjarke Berg
761c7dcfc6 Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Examine/UmbracoExamineIndex.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.TestData/LoadTestController.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	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/Editors/KeepAliveController.cs
#	src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
2021-05-21 12:32:39 +02:00
Bjarke Berg
34519c7233 Merge pull request #10302 from nathanwoulfe/nathanwoulfe-patch-2
Fix getBlueprintScaffold endpoint
2021-05-21 11:11:29 +02:00
Bjarke Berg
3aaf53ce0e Merge pull request #10299 from umbraco/v9/feature/allow-custom-notification-publisher-in-scope
V9: Allow custom notification publisher in scope
2021-05-21 11:07:32 +02:00
Nathan Woulfe
edef73fd39 Fix getBlueprintScaffold endpoint 2021-05-21 11:21:44 +10:00
Bjarke Berg
9aee6919d7 Merge pull request #10286 from umbraco/v9/feature/do_not_restart_doing_simple_installs_without_package_installation
V9: Do not restart doing simple installs without package installation
2021-05-20 21:36:55 +02:00
Bjarke Berg
9b2cf8422d Removed unused ctor (just for tests) + Fixed a couple of handlers that is not intended to execute before runtime level = run. 2021-05-20 13:16:50 +02:00
Mole
ee66455057 Add unit tests for custom scoped notification publisher 2021-05-20 13:00:59 +02:00
Bjarke Berg
0a3b39cc38 Merge remote-tracking branch 'origin/v9/dev' into v9/feature/do_not_restart_doing_simple_installs_without_package_installation 2021-05-20 12:56:41 +02:00
Bjarke Berg
35f439f5c5 Merge pull request #10294 from umbraco/v9/feature/update-nuget-packages
Update nuget packages
2021-05-20 12:55:03 +02:00
Mole
6596bcf557 Inject notification publisher from CreateScope 2021-05-20 12:36:57 +02:00
Sebastiaan Janssen
9bf01741b6 Fix invalid XML 2021-05-20 09:29:45 +02:00
Bjarne Fyrstenborg
710ecf2537 Add option to remove/cancel added crops (#10267)
* Add option to remove/cancel added crops

* Move vm functions to top

* Only show cancel button for empty/new crop
2021-05-20 09:00:23 +10:00
Bjarke Berg
025a7aca29 Updated nuget packages 2021-05-19 21:44:33 +02:00
Bjarke Berg
3af19b43d0 Merge pull request #10291 from umbraco/v9/bugfix/fix_unattended_installs
Bugfix: Acquire the maindom before we do unattended installs
2021-05-19 21:08:37 +02:00
Bjarke Berg
80ee7b398c Acquire the maindom before we do unattended installs 2021-05-19 20:40:06 +02:00
Bjarke Berg
cb6f74774d No not use explicit nuspec file for Examine.Lucene anymore :) 2021-05-19 19:12:13 +02:00
Sebastiaan Janssen
3f596e27cc Bump version to 8.13.1 2021-05-19 16:31:52 +02:00
Bjarke Berg
df6d4a603e Fix lucene reference for linux too 2021-05-19 15:05:30 +02:00
Sebastiaan Janssen
a2c461bcdb Update CONTRIBUTING.md 2021-05-19 13:30:53 +02:00
Sebastiaan Janssen
779c94c66f Update CONTRIBUTING.md 2021-05-19 13:29:02 +02:00
Niels Lyngsø
9730a18c9b #10274 Variant sorting should take into account that there might not be any language (#10278) (#10284)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 017b56eee1)
2021-05-19 12:12:58 +02:00
Sebastiaan Janssen
7b77d21d1b Merge branch 'v8/8.13' into v8/8.14
# Conflicts:
#	src/SolutionInfo.cs
2021-05-19 12:12:35 +02:00
Mike Chambers
7c2f956130 Update ModelsBuilderComposer.cs
issue #10186

typo in IsExternalModelsBuilderInstalled -> Umbraco.ModelsBuider

(cherry picked from commit b783399c5c)
2021-05-19 12:11:51 +02:00
Niels Lyngsø
36c49b0a25 #10274 Variant sorting should take into account that there might not be any language (#10278)
* Variant sorting should take into account that there might not be any language available

* fix languages

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit e19a5989e9)
2021-05-19 12:11:06 +02:00
Niels Lyngsø
017b56eee1 #10274 Variant sorting should take into account that there might not be any language (#10278) (#10284)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
2021-05-19 12:06:17 +02:00
Sebastiaan Janssen
14558aea06 Update CONTRIBUTING.md 2021-05-19 10:21:44 +02:00
Sebastiaan Janssen
92cdf4e6e8 Update CONTRIBUTING.md 2021-05-19 10:20:01 +02:00
Bjarke Berg
972d9d94f4 Fixed tests 2021-05-18 19:49:50 +02:00
Bjarke Berg
8131d1a9c9 Added xml docs 2021-05-18 19:33:54 +02:00
Bjarke Berg
da895ae65b Added RestartAsync to IRuntime instead of cancellation token 2021-05-18 19:30:07 +02:00
Bjarke Berg
4c78702da0 Do not restart after install, instead stop and restart the runtime. Also signin the admin user after install. 2021-05-18 19:19:58 +02:00
Bjarke Berg
f63c85a16c Update version and artifact name generated by azure pipeline (#10277)
* Update version and artifact name generated by azure pipeline

* Fix issue with version

* Add build tags

* test nightly builds

* fix negation + Prefix with Umbraco

* use updatereleasename instead

* test if build number is the issue

* determine releases by tags

* use date and rev instead of build nuber

* build id

* more testing

* more test

* more test

* build without buildId if ResourceTrigger is reason

* more test

* more trials

* determine build type from source branch regex

* test

* test

* test

* test

* test

* test

* test

* use date in nightlies/previews

* use date in nightlies/previews

* addd build id to nightlies
2021-05-18 19:07:17 +02:00
Sebastiaan Janssen
04326364b2 New issue forms 2021-05-18 15:47:27 +02:00
Bjarke Berg
65b20572b7 V9: Resolve virtual view paths from DataEditorAttribute in DataValueEditor (#10279)
* https://github.com/umbraco/Umbraco-CMS/issues/10265
Resolve virtual view paths from DataEditorAttribute in DataValueEditor + Introduced an IDataValueEditorFactory, so we don't need to inject nested dependencies every time we introduce a new dependency in DataValueEditor..

* Cleanup + xml doc
2021-05-18 12:40:24 +02:00
Bjarke Berg
2c10fd7034 update and add mock 2021-05-18 11:38:54 +02:00
Bjarke Berg
15e5e6b339 Remove reference to Umbraco.Tests from Umbraco.Tests.Benchmarks 2021-05-18 11:23:19 +02:00
Niels Lyngsø
e19a5989e9 #10274 Variant sorting should take into account that there might not be any language (#10278)
* Variant sorting should take into account that there might not be any language available

* fix languages

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
2021-05-18 11:08:00 +02:00
Shannon Deminick
eba6373a12 Examine 2.0 integration (#10241)
* Init commit for examine 2.0 work, most old umb examine tests working, probably a lot that doesn't

* Gets Umbraco Examine tests passing and makes some sense out of them, fixes some underlying issues.

* Large refactor, remove TaskHelper, rename Notifications to be consistent, Gets all examine/lucene indexes building and startup ordered in the correct way, removes old files, creates new IUmbracoIndexingHandler for abstracting out all index operations for umbraco data, abstracts out IIndexRebuilder, Fixes Stack overflow with LiveModelsProvider and loading assemblies, ports some changes from v8 for startup handling with cold boots, refactors out LastSyncedFileManager

* fix up issues with rebuilding and management dashboard.

* removes old files, removes NetworkHelper, fixes LastSyncedFileManager implementation to ensure the machine name is used, fix up logging with cold boot state.

* Makes MainDom safer to use and makes PublishedSnapshotService lazily register with MainDom

* lazily acquire application id (fix unit tests)

* Fixes resource casing and missing test file

* Ensures caches when requiring internal services for PublishedSnapshotService, UseNuCache is a separate call, shouldn't be buried in AddWebComponents, was also causing issues in integration tests since nucache was being used for the Id2Key service.

* For UmbracoTestServerTestBase enable nucache services

* Fixing tests

* Fix another test

* Fixes tests, use TestHostingEnvironment, make Tests.Common use net5, remove old Lucene.Net.Contrib ref.

* Fixes up some review notes

* Fixes issue with doubly registering PublishedSnapshotService meanig there could be 2x instances of it

* Checks for parseexception when executing the query

* Use application root instead of duplicating functionality.

* Added Examine project to netcore only solution file

* Fixed casing issue with LazyLoad, that is not lowercase.

* uses cancellationToken instead of bool flag, fixes always reading lastId from the LastSyncedFileManager, fixes RecurringHostedServiceBase so that there isn't an overlapping thread for the same task type

* Fix tests

* remove legacy test project from solution file

* Fix test

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-05-18 10:31:38 +02:00
Andy Butland
9b7b1a7c8e Merge pull request #10275 from umbraco/v9/feature/remove-data-contract-for-deploy-base-class
Updated serialization defaults for ArtifactBase
2021-05-17 13:29:04 +02:00
Andy Butland
130be8b303 Added comment explaining use of ShouldSerialize... method in ArtifactBase. 2021-05-17 12:49:08 +02:00
Andy Butland
63670bbd34 Removed the [DataContract] attribute added on ArtifactBase in the migration from V8 to V9, which has the effect of making all properties on derived artifacts opt-in.
Handled the omission of the checksum value from the serialized string without taking a Json.Net dependency.
2021-05-17 12:09:36 +02:00
Sebastiaan Janssen
df8b2d5580 Bump version to 8.14.0-rc 2021-05-17 10:50:25 +02:00
dependabot[bot]
cce3c49e78 Bump underscore from 1.9.1 to 1.12.1 in /src/Umbraco.Web.UI.Client
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.9.1 to 1.12.1.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.9.1...1.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-17 10:47:40 +02:00
Mario Lopez
69a507e5db V9 - Include models folder in the project (#10250)
* fixes #10213. When models folder is included in project the models have a Build Action of C# Compiler

* models directory comment indicates correct models location

* added PureLive files to App_Data/Temp

* changed PureLive directory

* include generated models in project

* https://github.com/umbraco/Umbraco-CMS/pull/10250/ - Cleanup in csproj file and fix the generated template too

Co-authored-by: Mario Lopez <mario@monkii.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-05-17 09:50:58 +02:00