Commit Graph

33400 Commits

Author SHA1 Message Date
Shannon
2ef8f26b28 removes unneeded extra HostBuilderExtensions 2020-04-22 14:29:01 +10:00
Shannon
46e14f7692 Fixes up all logging. Configures serilog logging to replace MS logging just like serilog does, adds new ILoggerConfiguration so we aren't hard coding things, dynamically adds enrichers when the container is ready to resolve services. 2020-04-22 14:23:56 +10:00
Shannon
d0f1ea0e59 Gets logging working in netcore, removes remaining usages of AppDomain.CurrentDomain.BaseDirectory and reduces more IOHelper usages 2020-04-21 13:31:55 +10:00
Shannon
ee37d3aa7a Fixes up usage of AppDomain.CurrentDomain.BaseDirectory in log viewer which cannot work in netcore since this is inconsistent with net framework, adds notes, starts configuring serilog with UseUmbraco 2020-04-21 13:07:20 +10:00
Warren Buckley
9335f39495 Update Readme.md in netcore branch to see if LGTM.com will analyze C# 2020-04-18 22:01:39 +01:00
Bjarke Berg
bf1784f9d1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
2020-04-17 11:43:04 +02:00
Shannon Deminick
75655fd1ee Merge pull request #7907 from umbraco/v8/bugfix/7868-nucache-null-parent
Fix moving large amounts of content/media
2020-04-17 15:04:40 +10:00
Shannon
d1524cdafe Merge branch 'v8/dev' into v8/bugfix/7868-nucache-null-parent
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
2020-04-17 15:04:10 +10:00
Bjarke Berg
a35b52b46f Merge pull request #7948 from AndyButland/feature/7898-netcore-model-unit-tests-3
Netcore: Further model unit test migrations into new project and builder pattern
2020-04-17 06:17:44 +02:00
Shannon
d5e2c12685 fixes merge issue 2020-04-17 13:20:57 +10:00
Shannon
a3eaccb2b4 Merge remote-tracking branch 'origin/v7/dev' into v8/dev
# Conflicts:
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/umbraco.businesslogic/umbraco.businesslogic.csproj
2020-04-17 10:13:59 +10:00
Bjarke Berg
295d0b73b3 nuget fix 2020-04-16 20:12:06 +02:00
Bjarke Berg
14072b0c21 nuget fix 2020-04-16 19:54:25 +02:00
Bjarke Berg
9f56aa1358 Merge remote-tracking branch 'origin/netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 19:28:05 +02:00
Bjarke Berg
3406bdb40b Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	NuGet.Config
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
2020-04-16 19:00:51 +02:00
Bjarke Berg
d2f361e816 Merge remote-tracking branch 'origin/v8/8.6' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
2020-04-16 18:54:45 +02:00
Shannon Deminick
5efb938785 Merge pull request #7620 from umbraco/v7/bugfix/7574-preview-sql-timeout
loads preview via sql paging instead of one single query
2020-04-17 01:06:16 +10:00
Shannon
ee6d3e0478 Removes the alpha builds of examine from nuget.config 2020-04-17 00:14:05 +10:00
Shannon
52ecd59c11 fixes test 2020-04-17 00:01:26 +10:00
Shannon
94bd9f4a9f Merge branch 'v8/8.6' of https://github.com/umbraco/Umbraco-CMS into v8/8.6 2020-04-16 23:54:09 +10:00
Shannon
3310ef9d8d fix tests 2020-04-16 23:53:52 +10:00
Sebastiaan Janssen
271669581a Merge pull request #7847 from umbraco/v8/bugfix/7773-memory-leak
Fixes Memory Leak in GetCacheItem cache dependency #7773

(cherry picked from commit b8abc04417)
2020-04-16 15:21:54 +02:00
Sebastiaan Janssen
41f98a41fb Added fix from #7832 since the test was somehow cherry picked into 8.6.1 already 2020-04-16 14:58:56 +02:00
Shannon
eabc9583f0 adds more named params 2020-04-16 22:39:32 +10:00
Shannon
153daa9fc5 fixes nameof 2020-04-16 22:35:53 +10:00
Shannon
6a5366469e fixes null checks in ctor 2020-04-16 22:34:15 +10:00
Shannon
0bfb61f1c1 Merge branch 'v8/8.6' of https://github.com/umbraco/Umbraco-CMS into v8/8.6 2020-04-16 22:27:26 +10:00
Shannon
d2c05bf681 Fixes issue with RelationTypeFactory swapping the parent/child 2020-04-16 22:27:05 +10:00
Shannon
6cd7e5d055 removes the extra unneeded variable 2020-04-16 22:04:27 +10:00
Bjarke Berg
b09d736c1b Bump verison to 8.6.1 2020-04-16 13:47:23 +02:00
Andy Butland
2278b0d318 Merge branch 'netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 12:19:04 +02:00
Andy Butland
33853eee43 Added setup method to instantiate clean builder for all model unit tests within the class. 2020-04-16 12:18:06 +02:00
Andy Butland
89a419e4d1 Clarified comment. 2020-04-16 11:46:02 +02:00
Andy Butland
068100cc8e Removed resetting of unit test builders. 2020-04-16 11:39:30 +02:00
Shannon
d9bf7dfa96 changes back isBidrectional spelling in case someone is using it with a named parameter binding :/ 2020-04-16 18:53:45 +10:00
Shannon
53824cac25 fix isBidirectional spelling 2020-04-16 18:46:00 +10:00
Shannon
feeff07d5c Cherry pick - Possible fix for issue #7870 2020-04-16 18:39:02 +10:00
Shannon
b72abd50a0 fixes relation type ctor 2020-04-16 17:47:43 +10:00
Sebastiaan Janssen
0d7b0b9674 Add back ctor to revert a breaking change 2020-04-15 21:11:14 +02:00
Shannon Deminick
4a071f6e05 Nucache NullReferenceException when copying (#7961)
(cherry picked from commit b30db05cc7)

# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
2020-04-15 20:55:11 +02:00
Bjarke Berg
26e16cee7a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-04-15 15:52:22 +02:00
Niels Lyngsø
aab629808d slightly more shadow on content-grid items 2020-04-15 15:08:10 +02:00
Sebastiaan Janssen
055f18d639 Add back ctor to revert a breaking change 2020-04-15 09:52:07 +02:00
Shannon
61c39eea64 Nicer sql template constants 2020-04-15 12:49:38 +10:00
Shannon
3b03d812f8 fixes paging 2020-04-15 11:55:12 +10:00
Shannon Deminick
a96b04e0dd Merge pull request #7890 from umbraco/netcore/feature/ab5819-initialize-composers
NetCore: Initialize more services for .net core
2020-04-15 10:17:20 +10:00
Bjarke Berg
ad4bce3b73 AB#5819 - Cleanup 2020-04-14 16:26:01 +02:00
Rachel Breeze
188d868f55 Updated tinyMCE to 4.9.9 2020-04-14 10:15:43 +02:00
Bjarke Berg
d0135eae2b Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-14 07:29:59 +02:00
Andy Butland
597489fba2 Added missing builder property values when building macro properties. 2020-04-13 19:33:39 +02:00