Commit Graph

142 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
Mole
bf41c2eeaa Netcore: Align namespaces (#9801)
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
2021-02-18 11:06:02 +01:00
Elitsa Marinovska
a2cfd277ce Cleanup 2021-02-18 08:33:49 +01:00
Mole
ce5eaac5a4 Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces
# Conflicts:
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
2021-02-17 15:44:36 +01:00
Mole
738150f5ad Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces
# Conflicts:
#	src/Umbraco.Core/IO/ViewHelper.cs
#	src/Umbraco.Core/Models/ContentModel.cs
#	src/Umbraco.Core/Models/ContentModelOfTContent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs
#	src/Umbraco.Web.Common/Controllers/RenderController.cs
#	src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
#	src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
#	src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
2021-02-17 15:35:44 +01:00
Bjarke Berg
88acb07873 Merge pull request #9821 from umbraco/netcore/task/9716-custom-routes
Custom controller routes within an Umbraco context (i.e. virtual nodes)
2021-02-17 12:29:20 +01:00
Mole
efe4162027 Align Umbraco.Examine.Lucene to Umbraco.Cms.Infrastructure.Examine
The namespace has to be the same as in Infrastructure/Examine otherwise linux build fails.
2021-02-15 14:45:02 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Mole
eb091f8dcd Align namespaces in root of infrastructure 2021-02-15 13:14:18 +01:00
Mole
5bd8e32279 Align namespaces in Persistence
Made everything except for repository interface be in the Umbraco.Cms.Infrastructure.Persistence namespace
2021-02-12 13:36:50 +01:00
Mole
511a04a62c Align namespaces in Examine folder. 2021-02-12 10:57:50 +01:00
Mole
b74abaf3af Align namespaces in DependencyInjection to Umbraco.Cms.Infrastructure.DependencyInjection
Even though Core also has this, then pretty much every project has their own DI namespace, and this one does reference third party dependencies as far as I can see
2021-02-12 10:41:07 +01:00
Mole
9dcd4cb74a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces
# Conflicts:
#	src/Umbraco.Web/Mvc/SurfaceController.cs
2021-02-12 08:40:36 +01:00
Shannon
af42af7425 Simplify UmbracoRouteValues since this is an http request feature which dictates what an Umbraco route is 2021-02-12 16:54:19 +11:00
Shannon
aeae2fcfd2 Removes old classes that merge viewdata and modelstate that are no longer necessary 2021-02-12 16:10:50 +11:00
Mole
eb03671b52 Align namespaces in Umbraco.Web.Website 2021-02-10 14:30:14 +01:00
Mole
55aa2edb72 Align namespaces in Umbraco.Web.Common 2021-02-10 11:42:04 +01:00
Mole
ade00997bc Adjust namespace in Umbraco.ModelsBuilder.Embedded 2021-02-10 10:34:27 +01:00
Mole
34f8766a3c Move extension methods in core project to Umbraco.Extensions 2021-02-09 15:14:56 +01:00
Mole
dd488a15f4 Move extension methods in core project to Umbraco.Extensions 2021-02-09 13:21:17 +01:00
Mole
216fb87c79 Rename Umbraco.Core namespace to Umbraco.Cms.Core 2021-02-09 10:22:42 +01:00
Shannon
967c150180 Merge branch 'netcore/netcore' into netcore/task/Surface-Routing-9717 2021-02-05 13:22:21 +11:00
Shannon
295e4eb118 Merge branch 'netcore/task/Surface-Routing-9717' of https://github.com/umbraco/Umbraco-CMS into netcore/task/Surface-Routing-9717 2021-02-05 13:14:40 +11:00
Shannon
b883ebfd7d Fixing tests, created constants 2021-02-05 13:14:24 +11:00
Shannon Deminick
7aff288ff1 Apply suggestions from code review
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-02-05 12:32:09 +11:00
Shannon
eed8e4dca8 Fixing tests 2021-02-05 12:19:09 +11:00
Shannon
6273c95a90 Gets UmbracoPageResult working with ViewData and TempData 2021-02-04 14:51:55 +11:00
Shannon
eda98aa41f Changes how controllers are discovered, re-uses aspnetcore to do this, rely directly on the resolved ControllerActionDescriptor since this is how routing works anyways and also saves future lookups (perf), gets the UmbracoPageResult 'working' - at least to proxy a controller execution but now we need to do the model state merging, etc... 2021-02-04 13:09:28 +11:00
Shannon
0c26a82489 Changes the umbraco route values to use http features intead of in route values which is much nicer, fixes the redirect to page result, tests a surface controller POST and it works, ensures the routing takes place before the form check, removes a bunch of old code 2021-02-03 15:47:27 +11:00
Shannon
9e43ff8662 linting 2021-02-02 17:32:17 +11:00
Shannon
c024db9d3c gets surface controllers and front-end api controllers auto-routed, adds tests 2021-02-02 14:48:01 +11:00
Bjarke Berg
14284b64c2 Bugfixes..
- ModelsBuilder: Inject PublishedValueFallback into static Mixins
- ModelsBuilder: Throw exception if compiler can't compile the code
- CheckIfUserTicketDataIsStaleAttribute: Scope issue
- Ambiguous Actions: Couldn't determine the action when empty arrays was passed. Fixed by using more v8 like solution. (Still stupid the client not just have different endpoints)
- Fixed issue with reading the body from post requests. Often we where not allowed to seek in the stream.
- UmbracoHelper: Made available on UmbracoViewPage
- Client entity.resource.js: Don't ask server when getByIds has 0 ids.
- Client content.resource.js: Renamed endpoint GetEmptyBlueprint to avoid ambiguous action name
2021-02-01 13:04:45 +01:00
Shannon
d5f595def2 Enables the Action htmlhelperextension for surface controllers 2021-02-01 17:57:15 +11:00
Shannon
a0cbff2868 linting 2021-02-01 17:53:40 +11:00
Shannon
a974ba71fd linting 2021-02-01 17:50:20 +11:00
Shannon
2a41cec263 Ensures the default PublishedModelFactory is always registered. Ensures AddModelsBuilder is done when adding the website (not required for the back office). 2021-02-01 16:53:24 +11:00
Elitsa Marinovska
01c03c19c3 Migrates PublishedContentExtensions.cs, PublishedElementExtensions.cs and PublishedPropertyExtension.cs 2021-01-26 11:17:55 +01:00
Bjarke Berg
132c4f7910 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-21 09:37:44 +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
Shannon
7f1e711481 committing changes, notes, etc... so far 2021-01-14 23:14:35 +11:00
Shannon
d1df6c4719 less allocations with AbsolutePathDecoded. removes more aspx checks, adds UmbracoRouteValueTransformerTests, adds interface for IRoutableDocumentFilter 2021-01-13 11:08:48 +11:00
Shannon
456cb00a2d Add test for UmbracoRouteValuesFactoryTests 2021-01-12 17:06:37 +11:00
Shannon
a83cbc00ef Adding tests for HijackedRouteEvaluator 2021-01-12 16:28:00 +11:00
Shannon
4a8b0f06d1 Merge branch 'netcore/task/9727-published-request' into netcore/task/9733-routabledocumentfilter 2021-01-11 16:44:01 +11:00
Shannon
c2c42ada3b Fixes review notes 2021-01-11 13:55:44 +11:00
Shannon
2feebe7a2c Ensures the routable doc filter is used, adds notes about a small mem leak. 2021-01-08 17:54:21 +11:00
Shannon
0ce90cf359 Moves UrlExtensions methods to new service and reduce the huge amount of allocated strings during routing 2021-01-08 17:21:35 +11:00
Shannon
e1e3200313 Merge branch 'netcore/task/9727-published-request' into netcore/task/9733-routabledocumentfilter 2021-01-08 15:31:20 +11:00
Shannon
b801199e7c missing commit 2021-01-08 15:30:35 +11:00