Bjarke Berg
ab96e7c17d
fix for linux+mac
2021-11-03 09:11:30 +01:00
Bjarke Berg
c3ebbe23fd
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021
...
# Conflicts:
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
2021-11-03 08:44:12 +01:00
Bjarke Berg
b7d5fd4b26
Cleanup and fixed tests
2021-11-02 09:18:15 +01:00
Bjarke Berg
53631ee48b
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev
...
# Conflicts:
# src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
# src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/ContentEditing/HistoryCleanup.cs
# src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs
# src/Umbraco.Core/Models/ContentType.cs
# src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs
# src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs
# src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Scheduling/SchedulerComponent.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
2021-10-29 15:00:27 +02:00
Bjarke Berg
14fc4b6e25
Unbreak a breaking change :(
2021-10-29 11:08:40 +02:00
Bjarke Berg
bf5f1364fd
Fix build after merge
2021-10-29 10:14:52 +02:00
Shannon Deminick
c77dc5dc00
Migrating tests that depend on Published Cache from the old test project ( #11242 )
...
* starts cleaning up old test project, removing ones we'll never convert, moves new test to where it should be.
* Makes ContentNodeKit immutable properties, moves first nucache tests over
* Gets the Nucache unit tests working and refactors a bit to use builder pattern for models.
* Migrates first xml based cache test to use nucache.
* Migrates a bunch more
* Migrates remaining tests for PublishedContentTests
* Moves PublishedRouterTests
* Moves PublishedContentExtensionTests
* Moves more tests.
* committing wip
* committing wip
* Gets PublishedContentLanguageVariantTests converted and working.
* Fixes DataTable ext method and moves PublishedContentDataTableTests
* Moves PublishedMediaTests
* wip - moving EntityXmlSerializerTests
* Moves more tests
* moves more tests
* moves more tests
* Move another test
* Moves more tests
* Fix test
* move another test
* Moves more tests
* Moves more tests
* Moves more tests
* wip before merge
* More tests
* More tests
* More tests
* More tests
* More tests
* More tests
* Cleanup and moving classes.
* Remove unused code
* Fixed failing tests, due to new null checks, that did not exist in v8
* Avoid breaking changes
* Unbreak more things, even that it the old solution was crazy..
* Fixed bug where ordering of stream readings was changed..
* cleanup
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-10-19 14:11:54 +02:00
Paul Johnson
14e1f7f7fc
V10/feature/content schedule performance ( #11398 )
...
* Nuke Content.ContentSchedule
Can't make an omelette without breaking eggs
* Fix read view models
* Fix Save, Save & Schedule, Save & Publish
* Fix scheduled publish/unpublish
* Fix unit tests
* Fix bugs & integration tests
* Cleanup action result signatures
* Update tests from #11356 , new method for saving contentschedule
2021-10-19 12:29:25 +02:00
Matthew Care
aee9bbbb7d
Merge remote-tracking branch 'upstream/v9/contrib' into temp-11381
2021-10-19 08:44:05 +01:00
Paul Johnson
ad66d61b04
Move new test
2021-10-18 08:32:24 +01:00
Paul Johnson
8be613cad7
Merge branch 'v9/dev' into v9/contrib
2021-10-18 08:31:20 +01:00
Paul Johnson
f214d58f0b
Merge branch 'v9/dev' into v10/dev
2021-10-18 08:20:52 +01:00
Paul Johnson
00133e880d
Move test projects from src/ to tests/ ( #11357 )
...
* Update gitignore
* Move csproj
* Update project references
* Update solutions
* Update build scripts
* Tests used to share editorconfig with projects in src
* Fix broken tests.
* Stop copying around .editorconfig
merged root one with linting
* csharp_style_expression_bodied -> suggestion
* Move StyleCop rulesets to matching directories and update shared build properties
* Remove legacy build files, update NuGet.cofig and solution files
* Restore myget source
* Clean up .gitignore
* Update .gitignore
* Move new test classes to tests after merge
* Gitignore + nuget config
* Move new test
Co-authored-by: Ronald Barendse <ronald@barend.se >
2021-10-18 08:14:04 +01:00