Commit Graph

7 Commits

Author SHA1 Message Date
Bjarke Berg
354225452a Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-05 08:14:23 +02:00
Bjarke Berg
58d7fc1817 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
2020-06-05 08:05:50 +02:00
Bjarke Berg
64dfa009f5 #6233 - version in config removed 2020-04-28 12:31:15 +02:00
Bjarke Berg
56b94b53b1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Core/Services/UserServiceExtensions.cs
#	src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Infrastructure/Search/ExamineComposer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
2020-04-24 08:34:48 +02:00
Bjarke Berg
53953338d8 Merged Umbraco.Abstractions into Umbraco.Core 2020-03-03 13:42:07 +01:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Bjarke Berg
d147b182ee Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. 2020-02-06 14:40:46 +01:00