Commit Graph

47 Commits

Author SHA1 Message Date
Bjarke Berg
9d6762fb6a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
2020-03-10 08:25:43 +01:00
Jason Elkin
bad1913e0e update Umbraco.ModelsBuilder.Embedded attributes to match assembly name 2020-03-09 10:19:26 +01:00
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
2020-03-04 10:10:03 +01:00
Bjarke Berg
2d175ffb86 - Moved ModelsBuilder constant into Core under constants
- Move the registration of configs into the factory
- Moved extension methods of ModelsMode into Umbraco.Core
- Removed references to Umbraco.Configuration from Umbraco.Infrastructure and Umbraco.ModelsBuilder.Embedded
2020-03-03 14:15:30 +01: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
04caec842a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
2020-02-25 08:38:15 +01:00
Bjarke Berg
aad8cba039 Updated projects to have C# 8 support 2020-02-24 13:37:27 +01:00
Bjarke Berg
c975162e14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 09:57:27 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
5e79585149 Introduced Umbraco.Web.UI.Backoffice 2020-02-18 08:32:06 +01:00
Bjarke Berg
b850b3c8fe AB4950 - Created new Umbraco.Web.BackOffice project. Moved dashboards into this new project (#7615) 2020-02-10 09:06:29 +01:00
Bjarke Berg
0bc843b06d Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-06 14:09:23 +01:00
Bjarke Berg
a018315404 Removed references from web and Models builder.. Moved some classes to do so 2020-02-06 14:09:16 +01:00
Bjarke Berg
e13c17b02d Updated and aligned nuget package versions 2020-02-05 08:43:23 +01:00
Andy Butland
171fce2ecb Moved PublishedCache from Umbraco.Web into .Net standard project.
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
2020-01-30 20:08:03 +01:00
Bjarke Berg
a1ed2eb135 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/SolutionInfo.cs
2020-01-27 14:22:04 +01:00
Bjarke Berg
7bdf97c431 https://github.com/umbraco/Umbraco-CMS/issues/7469 Unsealed class to allow override 2020-01-24 09:20:16 +01:00
Bjarke Berg
05fe604e22 https://github.com/umbraco/Umbraco-CMS/issues/7469 Renamed extension method to avoid ambiguous signature 2020-01-24 09:19:29 +01:00
Bjarke Berg
0cdd6ba29d AB4635 - Moved CacheRefreshers to abstractions 2020-01-21 13:40:23 +01:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
2020-01-21 10:51:04 +01:00
Bjarke Berg
7fbe482919 Revert "https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue"
This reverts commit baef282b
2020-01-20 14:09:13 +01:00
Benjamin Carleski
94f42c3223 Update package references to fix compilation error 2020-01-17 17:21:50 -08:00
Bjarke Berg
baef282b10 https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue 2020-01-17 13:53:03 +01:00
Bjarke Berg
6637bf520c https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue 2020-01-17 13:22:13 +01:00
Shannon
1b56922213 Fixes threadsafety for settings value 2020-01-17 13:31:22 +11:00
Bjarke Berg
b272a3b791 https://github.com/umbraco/Umbraco-CMS/issues/7466 - Fixes issue with external ModelsBuilder and Dll or LiveDll mode. The issue is because the Mode is determined in the contructor, and not lazy. 2020-01-16 19:39:17 +01:00
Bjarke Berg
ddb04964b5 https://github.com/umbraco/Umbraco-CMS/issues/7457 - We need to register the config no matter what which MB is used. The config is used to avoid execution of methods in the internal MB 2020-01-14 15:54:07 +01:00
Bjarke Berg
c7f60d8312 AB3986 - Wrapped System.Web.Hosting.IRegisteredObject in the AspNetHostingEnvironment. Updated Maindom to use our own new interface and the wrapper and moved to infrastructure. Removed the Umbraco.Core project now that it was empty. 2020-01-08 09:01:58 +01:00
Bjarke Berg
d2443ea4c0 AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff. 2020-01-07 13:08:21 +01:00
Andy Butland
bd5b344a57 Merge branch 'netcore/dev' into feature/7371-short-string-helper
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/TypeExtensions.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web/Editors/CodeFileController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MacroRenderingController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
2019-12-24 09:08:47 +01:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Bjarke Berg
7f9fbe9877 AB4227 - Removed StringExtensions from core.. 2019-12-18 18:55:00 +01:00
Bjarke Berg
becce7800b Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 14:12:06 +01:00
Bjarke Berg
28ecb355dd Let IOHelper use IHostingEnvironment 2019-12-04 21:30:18 +01:00
Bjarke Berg
fc22282a59 Injecting IHostingEnvironment 2019-11-20 15:21:09 +01:00
Bjarke Berg
ed82bd05c6 AB3649 - Abstracted IPropertyType, IProperty and IPropertyValue 2019-11-08 14:27:27 +01:00
Bjarke Berg
13507c0e13 AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭) 2019-11-08 07:51:14 +01:00
Bjarke Berg
9dfa3b55a6 MB need to know abstractions 2019-11-05 09:07:18 +01:00
Bjarke Berg
17e28b6840 AB3389 - Move the stuff from App_Plugins/ModelsBuilder into Umbraco.Web.UI.Client and handle dashboard as code. 2019-10-29 14:28:54 +01:00
Bjarke Berg
eb1a43b6a0 Merge remote-tracking branch 'origin/v8/feature/AB3348-MB-lite-cleanup' into v8/feature/AB3289-MB-allow-legacy
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
#	src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
#	src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
2019-10-29 11:15:45 +01:00
Shannon
df2a65424e notes 2019-10-29 12:16:56 +11:00
Shannon
33cd7f6a98 oops, added the internal visible to attribute to the wrong file 2019-10-29 11:55:16 +11:00
Shannon
0aa8711988 Ensures that the MB version is added to the models hash to ensure that if the MB version changes, the purelive models are regenerated 2019-10-29 11:38:06 +11:00
Shannon
2c9939e516 restores the MB enable flag 2019-10-29 11:02:18 +11:00
Shannon
cd89308711 Ensures embedded MB is enabled on the UI proj, disables embedded MB if the legacy MB is detected 2019-10-29 01:14:10 +11:00
Shannon
3b6abbb936 Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins 2019-10-29 00:25:03 +11:00