yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,425 Commits 4 Branches 7 Tags
c2eb3b048039b03214377c1e17ddda8f17e0af6f
Commit Graph

29385 Commits

Author SHA1 Message Date
Emma Garland
c2eb3b0480 Merge branch 'netcore/dev' of https://github.com/umbraco/Umbraco-CMS into feature/netcore-model-unit-tests-settings 2020-04-22 13:53:41 +01:00
Bjarke Berg
fce1df08f9 Fix test 2020-04-22 10:55:13 +02:00
Bjarke Berg
f76e638f0d Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/logging-fixing 
# Conflicts:
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
 2020-04-22 10:54:54 +02:00
Bjarke Berg
30c877c66b Merge pull request #7982 from umbraco/netcore/feature/ab6232-WebRuntime 
Introduced GenericDictionaryRequestAppCache and eliminated the WebRuntime
 2020-04-22 09:11:41 +02:00
Shannon
18b285f088 Splits profiler so it doesn't have to take a dependency since we don't want to pre-resolve. Adds enrichers to the container. 2020-04-22 15:23:51 +10:00
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
Elitsa Marinovska
062441c650 Passing NoAppCache to CoreRuntime base ctor 2020-04-21 13:48:06 +02:00
Elitsa Marinovska
acad9d1f84 Making class public 2020-04-21 11:03:04 +02:00
Bjarke Berg
fbe6f6cdd2 AB#6232 - Moved EnablePerWebRequestScope from configure to start 2020-04-21 11:00:30 +02:00
Elitsa Marinovska
c185b67ed0 Adding UseStatusCodePages for disabling/enabling status code pages (ex: from IIS) 2020-04-21 10:55:01 +02:00
Elitsa Marinovska
28f5033cb7 Renaming a file for constants. Clarifying the proj for other Constants file 2020-04-21 10:14:03 +02:00
Elitsa Marinovska
16aab7a3cb Refactoring 2020-04-21 09:33:39 +02:00
Elitsa Marinovska
138b8099fc Reimplementing EnsurePartialViewMacroViewContextFilterAttribute and other required classes 2020-04-21 09:28:22 +02:00
Elitsa Marinovska
65b45eb48d Marking classes as moved 2020-04-21 09:25:15 +02:00
Elitsa Marinovska
77a06efa91 Moved filters to Umbraco.Web.Common project 2020-04-21 09:19:18 +02: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
Elitsa Marinovska
d483f2ccbd Marking asp.net action filters as migrated to net core 2020-04-20 22:56:36 +02:00
Elitsa Marinovska
487e3c54a8 Reimplementing action filters to asp.net core 2020-04-20 22:55:40 +02:00
Bjarke Berg
c0ec1bf6ca Introduced GenericDictionaryRequestAppCache, to use the HttpContext.Items from .NET Core 2020-04-20 13:21:09 +02: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
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
Shannon
d5e2c12685 fixes merge issue 2020-04-17 13:20:57 +10: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
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
Emma Garland
8a7a0f65b1 Added new test case to show it working 2020-04-16 14:37:06 +01: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