yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,528 Commits 4 Branches 7 Tags
48c4c235d2043784cff0af001f8a3af75588a0e8
Commit Graph

78 Commits

Author SHA1 Message Date
Mole
405d0e704d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
 2021-02-22 15:18:04 +01:00
Bjarke Berg
6e89e9a8a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/ApiVersion.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/ModelsGenerator.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/PropertyModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextHeaderWriter.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModelHasher.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/LiveModelsProvider.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsGenerationError.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/OutOfDateModelsStatus.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/RoslynCompiler.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/TypeExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/UmbracoServices.cs
#	src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
#	src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
#	src/Umbraco.Web.Common/ModelsBuilder/RefreshingRazorViewEngine.cs
#	src/Umbraco.Web.Common/ModelsBuilder/UmbracoAssemblyLoadContext.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-02-22 09:00:33 +01:00
Elitsa Marinovska
e74836cb48 Moving classes to Infrastructure proj 2021-02-18 08:14:27 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Mole
9e4f05c0e9 Adjust namespaces in the Cache folder 
I made these Umbraco.Cms.Core even though they have to reside in infrastructure.
 2021-02-12 10:13:56 +01:00
Shannon
624739e697 Streamlines HtmlAgilityPack dependency 2021-02-01 15:39:28 +11:00
Shannon
dd90193365 makes MB event an INotification 2021-02-01 15:37:41 +11:00
Bjarke Berg
5a4a3c760d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-26 08:09:33 +01:00
Bjarke Berg
c79b31ed2e Changed remaining background jobs to be either hosted services or real fire and forget + Cleanup + moved classes to the legacy test project, that is only needed there. (#9700) 2021-01-25 09:26:38 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
Bjarke Berg
2da6c8517a Merge remote-tracking branch 'origin/netcore/netcore' into feature/amend-health-check-notifier-first-run-time-to-crontab 
# Conflicts:
#	src/Umbraco.Core/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-11-03 07:09:15 +01:00
Andy Butland
a0ce44c9fc Changed configuration of first run time for health check notifier from a time string to a cron expression. 2020-10-31 22:49:12 +01:00
Andy Butland
9cb59239d1 Migrated KeepAlive recurring task to hosted service. 2020-10-30 17:19:01 +01:00
Paul Johnson
ec66990e72 NetCore: MSDI refactor phase 2 (#9280) 
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
 2020-10-27 11:53:01 +01:00
Bjarke Berg
c7cdfaa775 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-08 14:49:24 +02:00
Mole
4b5fbf83e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
 2020-09-22 15:24:01 +02:00
Mole
438515fa66 Merge Netcore: Use serilog to log all messages and use appsettings as config into Netcore/feature/migrate logging 2020-09-22 15:09:16 +02:00
Bjarke Berg
35c39623a6 fix merge issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 13:45:20 +02:00
Mole
6cce7ef3f2 Make internals visible to Moq, otherwise we cannot mock ILogger<InternalClass> 
For some reason adding the assembly attribute doesn't work for the test project, I need to look into this.
 2020-09-22 09:27:32 +02:00
Mole
d61b9f54fa Merge options 2020-09-18 12:53:06 +02:00
berg
f11391961f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/use-serilog-to-log-all-messages 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
 2020-09-18 08:31:09 +02:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Elitsa Marinovska
0f9595a5b1 Updates nuget packages versions to latest 2020-09-17 17:58:11 +02:00
Bjarke Berg
8c31a4d6e6 Fix issue with dll not found 2020-09-17 15:16:13 +02:00
Nikolaj
b18f0b2b69 Add csproj files 2020-09-17 14:34:04 +02:00
Bjarke Berg
7d3bc9be1c Moved serilog config to appsettings and configured it to also catch MS logging messages. 
Added Console log for Development
 2020-09-17 09:01:10 +02:00
Bjarke Berg
acb46119be More clean up of old configs 2020-09-14 12:57:47 +02:00
Andy Butland
2f22313ceb Restored Umbraco.Web and added temporary methods for converstion between legacy and new configuration models to maintain build. 2020-08-23 15:58:37 +02:00
Andy Butland
e3a44c6717 Moved configuration setting POCOs into Umbraco.Core and adjusted references. 
Amended injection of some settings to use IOptionsSnapshot.
 2020-08-20 22:18:50 +01:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:15:38 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Shannon
9904dc6cc2 Merge commit '6dcaa986cda8c8bbca06df8030299d5901d31ceb' into netcore/feature/identity-temp 2020-05-28 17:29:35 +10:00
Bjarke Berg
aa63ce5ed9 Merge branch 'netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2020-05-20 12:43:13 +02:00
Elitsa Marinovska
16d805e6f5 Adding Smtp section in appsettings, registering IEmailSender as an email service and ofc the MailKit nuget in Infrastructure proj 2020-05-20 00:24:55 +02:00
Scott Brady
4627627350 Moved .NET standard back office identity code into infrastructure (lowest common dependency) 2020-05-17 08:48:36 +01:00
Bjarke Berg
79e9235338 AB#6233 - Install in .NET Core 2020-04-22 08:17:45 +02:00
Andy Butland
4456a784b0 Migrated user extension tests new project pattern. 2020-04-11 16:41:28 +02:00
Andy Butland
58a1bc0a8f Migrated stylesheet and template tests into new project and builder pattern. 2020-04-04 09:32:23 +02:00
Shannon
32deaa12d2 Removes unneeded methods/properties in abstraction, removes unneeded usages of it, changes everything to pre-defined bundles, fixes cdf implementation and reduces reflection, renames namespace 2020-04-02 17:41:00 +11:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Shannon
1658fced23 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore 
# Conflicts:
#	src/Umbraco.Core/IO/IOHelper.cs
#	src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
#	src/Umbraco.Tests.Common/TestHelperBase.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Program.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-03-23 15:50:01 +11:00
Bjarke Berg
00418959f2 Extracted IConfigManipulator from IConnectionStrings, and implemented a XML (legacy) and JSON version. 2020-03-18 19:17:51 +01:00
Shannon
9ded4c7ddb Wires up DI for cross wiring correctly ensuring that it occurs at the very end of ConfigureServices, updates tests accordingly, fixes a few other things. 2020-03-13 18:44:58 +11:00
Shannon
54727ca0fd Ensures package versions are all streamlined 2020-03-13 12:24:43 +11:00
Shannon
4cc20b06bc updates lightinject, adds method to create an LI container from an MSDI collection, updates a test 2020-03-13 11:13:47 +11:00
elitsa
02fbf0f9e7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5168-migrate-macros 2020-02-25 13:44:48 +01:00
elitsa
65e719cfa6 Migrating more Macro files to Abstractions or Infrastructure 2020-02-25 13:40:22 +01:00
Bjarke Berg
14eb630cc3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
 2020-02-24 16:19:14 +01:00
Bjarke Berg
aad8cba039 Updated projects to have C# 8 support 2020-02-24 13:37:27 +01:00