Benjamin Carleski bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev ...

# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs

2020-02-11 16:53:13 -08:00

..

Objects

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files

2019-12-11 09:29:36 +01:00

TestingTests

Replace Current.Services references with DI where possible

2020-01-22 21:43:25 -08:00

ContentBaseExtensions.cs

Cleanup

2019-02-07 12:27:19 +01:00

TestDatabase.cs

Removes the useNativeBulkInsert parameter, it's super old and useless

2019-12-19 17:56:48 +11:00

TestOptionAttributeBase.cs

Totally helpful exception message for test classes that can't be resolved

2019-10-21 23:07:36 +02:00

UmbracoTestAttribute.cs

Cleanup and fix mappers

2019-03-27 09:15:32 +01:00

UmbracoTestBase.cs

Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev

2020-02-11 16:53:13 -08:00

UmbracoTestOptions.cs

Rename PluginManager to TypeLoader in tests

2018-12-19 16:44:35 +01:00