Bjarke Berg
379d2e3e4e
Dependency updates ( #12283 )
...
* Upgraded MailKit
* Upgraded Microsoft.* packages
* Upgrades various nuget packages to latest version
* Upgrades various nuget packages related to test
2022-04-22 09:24:30 +02:00
Bjarke Berg
b19dab5f3a
Fix merge issues
2022-04-20 15:42:27 +02:00
Bjarke Berg
23a49161d6
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
...
# Conflicts:
# build/build.ps1
# build/templates/UmbracoPackage/.template.config/template.json
# build/templates/UmbracoProject/.template.config/dotnetcli.host.json
# build/templates/UmbracoProject/.template.config/ide.host.json
# build/templates/UmbracoProject/.template.config/template.json
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
# src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
# src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
# umbraco-netcore-only.sln
2022-04-20 11:09:28 +02:00
Ronald Barendse
2dc9ccda6d
Disable packaging of JsonSchema and test projects
2022-02-24 10:24:27 +01:00
Bjarke Berg
78dc2d5721
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
...
# Conflicts:
# build/azure-pipelines.yml
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# tests/Umbraco.Tests.AcceptanceTest/package-lock.json
# tests/Umbraco.Tests.AcceptanceTest/package.json
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
2021-11-22 19:43:20 +01:00
Elitsa Marinovska
61f459670c
Update to .NET6 and ASP.NET Core 6 ( #11652 )
...
* Changed targetFramework in nuspec file & project files + updated NuGet dependencies
* Updated .net version in pipelines
* Updated .net version in templates
* Update more dependencies
* Fixed ambiguous call to DistinctBy() - part of Umbraco.Extensions and System.Linq
* Disabling the Razor source generators in .NET 6 due to error: "Cannot find the fallback endpoint specified by route values..."
* Fixed unit tests
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-11-18 15:35:42 +01:00
Bjarke Berg
be65f12ed7
Updated nuget dependencies
2021-11-03 14:29:59 +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
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
