# Conflicts: # build/templates/UmbracoPackage/.template.config/template.json # build/templates/UmbracoProject/.template.config/template.json # src/Directory.Build.props # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs # src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs # src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs # src/Umbraco.Infrastructure/HostedServices/HealthCheckNotifier.cs # src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs # src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs # src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TrackedReferencesRepository.cs # src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs # tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs # tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
4.6 KiB
4.6 KiB