Commit Graph

1152 Commits

Author SHA1 Message Date
Shannon
3d5d04550a fix broken migration abstraction, fixes restart after upgrade so the runtimestate is correct, fixes sql alter column migration to actually run if its nullable. 2021-06-24 13:35:57 -06:00
Shannon
72671dbca8 Merge commit '94d525d88f713b36419f28bfda4d82ee68637d83' into v9/dev
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
#	src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataModel.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializationResult.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/LazyCompressedString.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
#	src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComposer.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Composing/ModuleInjector.cs
#	src/Umbraco.Web/Editors/NuCacheStatusController.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Runtime/WebRuntime.cs
2021-06-24 09:43:57 -06:00
Bjarke Berg
1775b21591 Updated nuget dependencies 2021-06-22 15:41:24 +02:00
Shannon
a0cc6d904c Updates to latest Examine on nuget 2021-06-21 14:17:17 -06:00
Bjarke Berg
43af29f139 Merge pull request #10393 from umbraco/v9/feature/email-display-name-in-notifiaction
V9: Add new email Model for notifications
2021-06-17 15:39:14 +02:00
Bjarke Berg
575e66b8eb Merge remote-tracking branch 'origin/v9/dev' into netcore/feature/get_rid_of_ICoreComposer
# Conflicts:
#	src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneConfigureIndexes.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneStarting.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
#	src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
2021-06-15 19:13:06 +02:00
Elitsa Marinovska
0c3db013d5 Approve member when created with built-in macros (#10428)
* Allow members created with built-in macros to be approved

* Cleanup

* Newly created members are always approved like in v8.

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-06-15 13:51:39 +02:00
Andy Butland
22de16a691 Added two further notifications to the boot process for custom functionality that may need to run at different stages. (#10471) 2021-06-15 12:43:03 +02:00
Bjarke Berg
e0a9397d92 V9: Fix issue with recurring services that executes too often (#10473)
* Fix exception in ReportSiteTask.cs, when running multiple times..
Also fixes issue with how often the tasks are executed

* Fix timeout
2021-06-15 11:02:55 +02:00
Shannon Deminick
eb70bc313a Implements Examine/Lucene index syncing for use on Azure (#10386)
* Updates to latest examine, ensures indexes are unlocked on startup, adds more info to the diagnostics and allows for the new sync directory factory to work.

* Gets index syncing working correct and fixes reindexing to not overprocess indexes

* fix duplicate package ref

* rebuilds empty indexes and fixes config with enum

* missing file
2021-06-07 14:58:49 +02:00
Shannon
3c3c9a6a47 Merge remote-tracking branch 'origin/v8/contrib' into v9/dev
# Conflicts:
#	src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
#	src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs
#	src/Umbraco.Core/Sync/ISyncBootStateAccessor.cs
#	src/Umbraco.Core/Sync/NonRuntimeLevelBootStateAccessor.cs
#	src/Umbraco.Core/Sync/SyncBootState.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
#	src/Umbraco.Web/HealthCheck/HealthCheckAction.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Search/ExamineFinalComponent.cs
2021-06-04 10:59:52 -07:00
Mole
96f88ac990 Apply suggestions from PR 2021-06-04 15:47:34 +02:00
Mole
a56de298a3 Allow fallback to configured email 2021-06-04 14:18:49 +02:00
Mole
baf13adef8 Don't convert to MimeMessage 2021-06-04 13:10:28 +02:00
Mole
cd284fd263 Include IsBodyHtml in NotificationEmailModel 2021-06-04 11:06:59 +02:00
Mole
d2dae7f35b Add null check when sending SendEmailNotification 2021-06-04 10:57:14 +02:00
Mole
91b59c6c67 Send NotificationEmailModel with notification 2021-06-04 10:42:33 +02:00
Mole
6a79053a9f Move email models into a folder 2021-06-04 09:50:49 +02:00
Matthew-Wise
c341a39306 Add a collection to allow adding CSS and JS to the back office via C# (#10310)
* Added Custom back office collection builder, to allow css / js to be added to the back office using c#

* Added call to the collection

* Added obselete attribute to PropertyEditorAssetAttribute
2021-06-02 12:28:14 +02:00
Mole
40c8bf62f7 Enable email sender to publish an event if smtp is not configured (#10352) 2021-06-01 06:41:56 +02:00
Bjarke Berg
8a0a6e62bf Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs
#	src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
#	src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
2021-05-31 15:10:49 +02:00
Bjarke Berg
7a63e26785 Add missing IMigrationContext to RebuildPublishedSnapshot ctor 2021-05-26 18:31:03 +02:00
Callum Whyte
b07f6519e7 Rename models builder modes (#10272)
* Renaming AppData Models Builder mode

* Renaming PureLive Models Builder mode to Runtime

* ModelsBuilderAssembly attribute flags if models are "Live" or not

* Updated ModelsMode names

* Only add tag if it is not a pull request. Apparently this is not allowed when it is from a fork.

* Revert "Only add tag if it is not a pull request. Apparently this is not allowed when it is from a fork."

This reverts commit 92b33f3c

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-05-26 08:36:21 +02:00
Bjarke Berg
3b8f9d5e33 https://github.com/umbraco/Umbraco-CMS/issues/10295 - Use FileUploadConfigurationEditor in FileUploadPropertyEditor 2021-05-25 08:53:13 +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
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
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
Mole
6596bcf557 Inject notification publisher from CreateScope 2021-05-20 12:36:57 +02:00
Bjarke Berg
025a7aca29 Updated nuget packages 2021-05-19 21:44:33 +02:00
Bjarke Berg
80ee7b398c Acquire the maindom before we do unattended installs 2021-05-19 20:40:06 +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
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
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
01643e494a Removed unecessary second calls to retrieve the file system in TemplateRepository. 2021-05-12 14:53:43 +02:00
Andy Butland
fd9faf5a99 Re-implemented various file service methods from V8 required in Deploy. 2021-05-12 11:58:36 +02:00
Bjarke Berg
de0929762c Fix issue with build number as part of the version 2021-05-12 09:49:41 +02:00
Mole
2bf86acf38 V9: Place notifications in the same namespace (#10231)
* Gather all notifications in Umbraco.Cms.Core.Notifications

* Rename notifications to match convention

* Move and rename missed notifications

* Move the three remaining public notification into Umbraco.Cms.Core.Notifications
2021-05-11 14:33:49 +02:00
Mole
11ca2c5d04 Merge pull request #10262 from umbraco/v9/feature/validate-credentials
Creates a method allowing validation of a user's credentials without actually logging them in.
2021-05-11 13:42:34 +02:00
Bjarke Berg
fe36c80ba0 Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
#	src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Composing/TypeLoaderTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	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/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
2021-05-11 12:33:31 +02:00
Andy Butland
3e19824be2 Creates a method available in V8 allowing validation of a user's credentials without actually logging them in. 2021-05-11 11:29:40 +02:00
Bjarke Berg
145a0fabe7 Fixed issues where RuntimeState.Level was used in ctors. This is not a good idea, as these ctors are executed before the level are determined. 2021-05-07 07:40:08 +02:00
Warren Buckley
cb01e11586 Deterministic Builds for Sourcelink (#10237)
* Remove the properties from each .CSProj

* Move this into Directory.Build.props so all CSProj can get all these extra properties

* Add conditional to only add extra property to get the Deterministic green checkmark when running on Azure Pipleine
2021-05-06 19:56:43 +02:00
Bjarke Berg
205c111dbc https://github.com/umbraco/Umbraco-CMS/issues/10232
Fixes issue with modelsbuilder when doctypes are inheriting from other doc types.
2021-05-06 10:58:45 +02:00
Warren Buckley
0bdeda378a Merge pull request #10205 from umbraco/v9/feature/replace-system-drawing-with-imagesharp
Replaces System.Drawing with ImageSharp, and thereby fix TODO.
2021-05-05 14:57:01 +01:00
Warren Buckley
f43f37dc35 Umbraco V9 Adds SourceLink package from Microsoft for people to debug into the relevent build commit with GitHub source code (#10224)
We had this previously in Umbraco V8
2021-05-04 18:58:50 +02:00
Martin Amsinck Andersen
2bc1c46e57 Casing in appsettings:umbraco:cms:contentMacroErrors and using MacroErrorBehaviour Enum (#10208)
* appsettings "WebRouting:DisableRedirectUrlTracking" should be a bool not a string

* Casing in appsettings "Umbraco:CMS:Content:MacroErrors" + Using MacroErrorBehaviour enum
2021-05-04 13:40:53 +02:00
Elitsa Marinovska
4bdb011b16 V9: Implementing Error Describers for translated error messages (#10216)
* Adding missing keys needed for the translation of the error describers' msgs

* Override all methods from IdentityErrorDescriber in order to provide our own translated error messages using our own translation engine (ILocalizedTextService)

* Fix tests

* Refactoring based on introducing an UmbracoErrorDescriberBase

* Remove unnecessary usings
2021-05-03 14:05:17 +02:00