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

1133 Commits

Author SHA1 Message Date
Bjarke Berg
d0938913e9 Merge pull request #7839 from umbraco/netcore/feature/ab5820-webprofiler-aspnetcore 
NetCore: Implement the WebProfiler for asp.net core.
 2020-03-31 15:10:18 +02:00
Elitsa Marinovska
7e3b3414d5 Merge branch 'netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 2020-03-30 15:26:51 +02:00
Andy Butland
cdb65762f1 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-30 14:17:16 +02:00
Shannon
7617027c49 Moves most of the UserRepositoryTest 2020-03-30 21:53:30 +11:00
Shannon
3757f722a0 Gets first integration test moved, moves the test options to the common project, ensures that the LocalDb pool is updated on each test 2020-03-30 20:55:13 +11:00
Andy Butland
bc05370995 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-28 14:31:23 +01:00
Bjarke Berg
fe88662f48 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 2020-03-27 06:04:06 +01:00
Bjarke Berg
44e9df949d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Property.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2020-03-26 19:22:09 +01:00
Shannon
d40b7087f4 Fixes issue with deep cloning Property 
main problem was that it was duplicating the _pvalue value when it shouldn't have. The real fix is that the Values property solves all these problems with it's setter but that wasn't being used by the DeepClone engine because that explicitly looks for certain collection types and IReadOnlyCollection wasn't one of them. With that included and PropertyValue marked as IDeepCloneable, it all just works. I've added tests.
 2020-03-26 19:56:21 +11:00
Bjarke Berg
86fe83ca16 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-26 07:10:23 +01:00
Shannon Deminick
8b531b7aea Merge pull request #7820 from umbraco/netcore/feature/unit-test-project 
NetCore: Introduces a seperate UnitTest project
 2020-03-26 15:24:19 +11:00
Bjarke Berg
397b25f9ae Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-24 19:38:44 +01:00
Bjarke Berg
9339e1d999 AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:56:45 +01:00
Bjarke Berg
8c8a9764cd Post merge + Added new SmtpSettingsBuilder 2020-03-18 07:42:35 +01:00
Shannon
c9913f45a0 Moves LightInjectValidation to common and validates the container as part of new tests 2020-03-13 15:59:04 +11:00
Shannon
fea65897ba Merge branch 'netcore/dev' into netcore/feature/booting-netcore 2020-03-13 12:50:08 +11:00
Shannon
94c9057119 Moves some stub test objects to the common test lib 2020-03-13 12:44:42 +11:00
Shannon
54727ca0fd Ensures package versions are all streamlined 2020-03-13 12:24:43 +11:00
Shannon
4e4df96140 Creates new Umbraco.Tests.Common netstandard project to host the common testing functionality between netframework and netcore, this will be ongoing work (doesn't need to be done all at once) 2020-03-13 12:08:25 +11:00
Shannon
6c4acfca31 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore 2020-03-13 11:15:28 +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
Andy Butland
8e3967c596 Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes 
# Conflicts:
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-Web.cs
 2020-03-06 07:28:13 +01:00
Andy Butland
e21d0870a7 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 
# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
 2020-03-05 07:36:14 +01:00
Bjarke Berg
e9f7034365 Moved compoenents and composers 2020-03-03 07:29:51 +01:00
Andy Butland
e6a55a215a Replaced nonodes.aspx with MVC controller and view, with configurable view location. 2020-02-29 14:26:35 +01:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +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
Bjarke Berg
683c0b8732 Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 2020-02-24 08:24:19 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
8c0e50ccd6 Fix issue in Test project still referencing Umbraco.Examine 2020-02-20 09:25:26 +01:00
Andy Butland
0bba475533 Amends to key value service/repository to better match existing repository patterns. 2020-02-17 22:12:42 +01:00
Andy Butland
f92b43260a Added unit tests for new KeyValueRepository. 2020-02-15 12:17:48 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2020-02-11 16:53:13 -08:00
Benjamin Carleski
408ee452e1 Code cleanup, added unit tests 2020-02-08 11:05:14 -08:00
Shannon
636d0c9ccd Ensures that we track relations for values on all variant property values 2020-02-07 12:18:27 +11: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
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
c0a59cbad7 Renamed SqlCe Project 2020-02-06 08:49:02 +01:00
Bjarke Berg
e13c17b02d Updated and aligned nuget package versions 2020-02-05 08:43:23 +01:00
Bjarke Berg
a3867d93dd Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) 2020-02-05 08:17:30 +01:00
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +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
Shannon
4183514b52 Renames Examine2 to Examine as the netstandard part 2020-01-28 17:11:43 +11:00
Shannon
69f4ea5484 Renames Umbraco.Examine project to Umbraco.Examine.Lucene for the Lucene implementation part 2020-01-28 17:09:45 +11:00
Shannon
0343b302f3 Moving stuff to Examine2 (temp name) as a netstandard project, updates to latest Examine netstandard, moves constants to separate class. 2020-01-28 16:37:55 +11:00
Shannon
58537ce11a Updates to newer 2.0 version of Examine which has Examine.Core as netstandard 2020-01-28 15:21:58 +11:00
Bjarke Berg
47c211907a AB4635 - Fixed up some of the review comments - Removed static (de)serializers and get the CacheRefresher from the collection 2020-01-22 14:09:20 +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