diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj index 04f8eb14d3..15c6ac263f 100644 --- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj +++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj @@ -18,8 +18,6 @@ <_UnmanagedRegistrationCache Remove="obj\Umbraco.Configuration.csproj.UnmanagedRegistration.cache" /> - <_UnmanagedRegistrationCache Remove="obj\Umbraco.Configuration.csproj.UnmanagedRegistration.cache" /> - <_UnmanagedRegistrationCache Remove="obj\Umbraco.Configuration.csproj.UnmanagedRegistration.cache" /> @@ -30,10 +28,4 @@ - - - C:\Users\Bjarke\AppData\Local\Temp\Temporary ASP.NET Files\root\408beac9\de517473\assembly\dl3\77bf709f\48ac59e4_3595d501\Umbraco.Core.dll - - - diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs index 4ed2fb5b2e..c9fa8d1304 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs @@ -85,7 +85,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions /// private static PackagesRepository CreatePackageRepository(IFactory factory, string packageRepoFileName) => new PackagesRepository( - factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), + factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), packageRepoFileName); private static LocalizedTextServiceFileSources SourcesFactory(IFactory container) diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs index cf4dd923de..533c6cbbe7 100644 --- a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs +++ b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs @@ -29,13 +29,23 @@ namespace Umbraco.Core.Migrations.Install private readonly IKeyValueService _keyValueService; private readonly ILogger _logger; private readonly IIOHelper _ioHelper; + private readonly IUmbracoVersion _umbracoVersion; private DatabaseSchemaResult _databaseSchemaValidationResult; /// /// Initializes a new instance of the class. /// - public DatabaseBuilder(IScopeProvider scopeProvider, IGlobalSettings globalSettings, IUmbracoDatabaseFactory databaseFactory, IRuntimeState runtime, ILogger logger, IMigrationBuilder migrationBuilder, IKeyValueService keyValueService, IIOHelper ioHelper) + public DatabaseBuilder( + IScopeProvider scopeProvider, + IGlobalSettings globalSettings, + IUmbracoDatabaseFactory databaseFactory, + IRuntimeState runtime, + ILogger logger, + IMigrationBuilder migrationBuilder, + IKeyValueService keyValueService, + IIOHelper ioHelper, + IUmbracoVersion umbracoVersion) { _scopeProvider = scopeProvider; _globalSettings = globalSettings; @@ -45,6 +55,7 @@ namespace Umbraco.Core.Migrations.Install _migrationBuilder = migrationBuilder; _keyValueService = keyValueService; _ioHelper = ioHelper; + _umbracoVersion = umbracoVersion; } #region Status @@ -369,7 +380,7 @@ namespace Umbraco.Core.Migrations.Install return _databaseSchemaValidationResult; var database = scope.Database; - var dbSchema = new DatabaseSchemaCreator(database, _logger); + var dbSchema = new DatabaseSchemaCreator(database, _logger, _umbracoVersion); _databaseSchemaValidationResult = dbSchema.ValidateSchema(); scope.Complete(); return _databaseSchemaValidationResult; @@ -419,7 +430,7 @@ namespace Umbraco.Core.Migrations.Install if (_runtime.Level == RuntimeLevel.Run) throw new Exception("Umbraco is already configured!"); - var creator = new DatabaseSchemaCreator(database, _logger); + var creator = new DatabaseSchemaCreator(database, _logger, _umbracoVersion); creator.InitializeDatabaseSchema(); message = message + "

Installation completed!

"; diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs index 94d8cfbc62..5dc937822b 100644 --- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs +++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs @@ -15,11 +15,13 @@ namespace Umbraco.Core.Migrations.Install { private readonly IDatabase _database; private readonly ILogger _logger; + private readonly IUmbracoVersion _umbracoVersion; - public DatabaseDataCreator(IDatabase database, ILogger logger) + public DatabaseDataCreator(IDatabase database, ILogger logger, IUmbracoVersion umbracoVersion) { _database = database; _logger = logger; + _umbracoVersion = umbracoVersion; } /// @@ -324,7 +326,7 @@ namespace Umbraco.Core.Migrations.Install { // on install, initialize the umbraco migration plan with the final state - var upgrader = new Upgrader(new UmbracoPlan()); + var upgrader = new Upgrader(new UmbracoPlan(_umbracoVersion)); var stateValueKey = upgrader.StateValueKey; var finalState = upgrader.Plan.FinalState; diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs index eab7afe308..7181460eeb 100644 --- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs +++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using NPoco; +using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; @@ -18,11 +19,13 @@ namespace Umbraco.Core.Migrations.Install { private readonly IUmbracoDatabase _database; private readonly ILogger _logger; + private readonly IUmbracoVersion _umbracoVersion; - public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger) + public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger, IUmbracoVersion umbracoVersion) { _database = database; _logger = logger; + _umbracoVersion = umbracoVersion; } private ISqlSyntaxProvider SqlSyntax => _database.SqlContext.SqlSyntax; @@ -125,7 +128,7 @@ namespace Umbraco.Core.Migrations.Install if (e.Cancel == false) { - var dataCreation = new DatabaseDataCreator(_database, _logger); + var dataCreation = new DatabaseDataCreator(_database, _logger,_umbracoVersion); foreach (var table in OrderedTables) CreateTable(false, table, dataCreation); } @@ -395,7 +398,7 @@ namespace Umbraco.Core.Migrations.Install where T : new() { var tableType = typeof(T); - CreateTable(overwrite, tableType, new DatabaseDataCreator(_database, _logger)); + CreateTable(overwrite, tableType, new DatabaseDataCreator(_database, _logger, _umbracoVersion)); } /// diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs index 070f4bdf6a..c657d0d9e7 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs @@ -14,16 +14,16 @@ namespace Umbraco.Core.Migrations.Upgrade /// public class UmbracoPlan : MigrationPlan { + private readonly IUmbracoVersion _umbracoVersion; private const string InitPrefix = "{init-"; private const string InitSuffix = "}"; - - private IUmbracoVersion UmbracoVersion => Current.UmbracoVersion; /// /// Initializes a new instance of the class. /// - public UmbracoPlan() + public UmbracoPlan(IUmbracoVersion umbracoVersion) : base(Constants.System.UmbracoUpgradePlanName) { + _umbracoVersion = umbracoVersion; DefinePlan(); } @@ -66,13 +66,13 @@ namespace Umbraco.Core.Migrations.Upgrade throw new InvalidOperationException($"Could not get current version from web.config {Constants.AppSettings.ConfigurationStatus} appSetting."); // cannot go back in time - if (currentVersion > UmbracoVersion.SemanticVersion) - throw new InvalidOperationException($"Version {currentVersion} cannot be downgraded to {UmbracoVersion.SemanticVersion}."); + if (currentVersion > _umbracoVersion.SemanticVersion) + throw new InvalidOperationException($"Version {currentVersion} cannot be downgraded to {_umbracoVersion.SemanticVersion}."); // only from 7.14.0 and above var minVersion = new SemVersion(7, 14); if (currentVersion < minVersion) - throw new InvalidOperationException($"Version {currentVersion} cannot be migrated to {UmbracoVersion.SemanticVersion}." + throw new InvalidOperationException($"Version {currentVersion} cannot be migrated to {_umbracoVersion.SemanticVersion}." + $" Please upgrade first to at least {minVersion}."); // Force versions between 7.14.*-7.15.* into into 7.14 initial state. Because there is no db-changes, @@ -89,7 +89,7 @@ namespace Umbraco.Core.Migrations.Upgrade { if (TryGetInitStateVersion(state, out var initVersion)) { - throw new InvalidOperationException($"Version {UmbracoVersion.SemanticVersion} does not support migrating from {initVersion}." + throw new InvalidOperationException($"Version {_umbracoVersion.SemanticVersion} does not support migrating from {initVersion}." + $" Please verify which versions support migrating from {initVersion}."); } diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs index 26f68c6262..50a8ba6769 100644 --- a/src/Umbraco.Core/Packaging/PackagesRepository.cs +++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs @@ -35,6 +35,7 @@ namespace Umbraco.Core.Packaging private readonly string _packagesFolderPath; private readonly string _tempFolderPath; private readonly PackageDefinitionXmlParser _parser; + private readonly IUmbracoVersion _umbracoVersion; /// /// Constructor @@ -59,6 +60,7 @@ namespace Umbraco.Core.Packaging ILocalizationService languageService, IIOHelper ioHelper, IEntityXmlSerializer serializer, ILogger logger, + IUmbracoVersion umbracoVersion, string packageRepositoryFileName, string tempFolderPath = null, string packagesFolderPath = null, string mediaFolderPath = null) { @@ -79,6 +81,7 @@ namespace Umbraco.Core.Packaging _mediaFolderPath = mediaFolderPath ?? Current.Configs.Global().UmbracoMediaPath + "/created-packages"; _parser = new PackageDefinitionXmlParser(logger); + _umbracoVersion = umbracoVersion; } private string CreatedPackagesFile => _packagesFolderPath.EnsureEndsWith('/') + _packageRepositoryFileName; @@ -169,7 +172,7 @@ namespace Umbraco.Core.Packaging var compiledPackageXml = CreateCompiledPackageXml(out var root, out var filesXml); //Info section - root.Add(GetPackageInfoXml(definition)); + root.Add(GetPackageInfoXml(definition, _umbracoVersion)); PackageDocumentsAndTags(definition, root); PackageDocumentTypes(definition, root); @@ -550,7 +553,7 @@ namespace Umbraco.Core.Packaging dtl.Add(dt); } - private static XElement GetPackageInfoXml(PackageDefinition definition) + private static XElement GetPackageInfoXml(PackageDefinition definition, IUmbracoVersion umbracoVersion) { var info = new XElement("info"); @@ -569,9 +572,9 @@ namespace Umbraco.Core.Packaging var requirements = new XElement("requirements"); - requirements.Add(new XElement("major", definition.UmbracoVersion == null ? Current.UmbracoVersion.SemanticVersion.Major.ToInvariantString() : definition.UmbracoVersion.Major.ToInvariantString())); - requirements.Add(new XElement("minor", definition.UmbracoVersion == null ? Current.UmbracoVersion.SemanticVersion.Minor.ToInvariantString() : definition.UmbracoVersion.Minor.ToInvariantString())); - requirements.Add(new XElement("patch", definition.UmbracoVersion == null ? Current.UmbracoVersion.SemanticVersion.Patch.ToInvariantString() : definition.UmbracoVersion.Build.ToInvariantString())); + requirements.Add(new XElement("major", definition.UmbracoVersion == null ? umbracoVersion.SemanticVersion.Major.ToInvariantString() : definition.UmbracoVersion.Major.ToInvariantString())); + requirements.Add(new XElement("minor", definition.UmbracoVersion == null ? umbracoVersion.SemanticVersion.Minor.ToInvariantString() : definition.UmbracoVersion.Minor.ToInvariantString())); + requirements.Add(new XElement("patch", definition.UmbracoVersion == null ? umbracoVersion.SemanticVersion.Patch.ToInvariantString() : definition.UmbracoVersion.Build.ToInvariantString())); if (definition.UmbracoVersion != null) requirements.Add(new XAttribute("type", RequirementsType.Strict.ToString())); diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs index 9931942de2..868473965a 100644 --- a/src/Umbraco.Core/RuntimeState.cs +++ b/src/Umbraco.Core/RuntimeState.cs @@ -255,7 +255,7 @@ namespace Umbraco.Core protected virtual bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory, ILogger logger) { - var upgrader = new Upgrader(new UmbracoPlan()); + var upgrader = new Upgrader(new UmbracoPlan(_umbracoVersion)); var stateValueKey = upgrader.StateValueKey; // no scope, no service - just directly accessing the database diff --git a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs index dc260c4a3b..aab1528987 100644 --- a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs +++ b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using BenchmarkDotNet.Attributes; using Umbraco.Core; +using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; @@ -51,8 +52,8 @@ namespace Umbraco.Tests.Benchmarks { var logger = new DebugDiagnosticsLogger(new MessageTemplates()); var path = TestHelper.CurrentAssemblyDirectory; - - SetupSqlCe(path, logger); + var umbracoVersion = TestHelper.GetUmbracoVersion(); + SetupSqlCe(path, logger, umbracoVersion); SetupSqlServer(logger); @@ -83,7 +84,7 @@ namespace Umbraco.Tests.Benchmarks )"); } - private void SetupSqlCe(string path, ILogger logger) + private void SetupSqlCe(string path, ILogger logger, IUmbracoVersion umbracoVersion) { var dbName = string.Concat("Umb", Guid.NewGuid(), ".sdf"); AppDomain.CurrentDomain.SetData("DataDirectory", path); @@ -102,7 +103,7 @@ namespace Umbraco.Tests.Benchmarks //use the db to create the initial schema so we can reuse in each bench using (_dbSqlCe = GetSqlCeDatabase(sqlCeConnectionString, logger)) { - var creation = new DatabaseSchemaCreator(_dbSqlCe, logger); + var creation = new DatabaseSchemaCreator(_dbSqlCe, logger, umbracoVersion); creation.InitializeDatabaseSchema(); } _initDbBytes = File.ReadAllBytes(_dbFile); diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs index 65027edc73..fba922b2c4 100644 --- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs +++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs @@ -1,9 +1,7 @@ using Moq; using NUnit.Framework; -using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; -using Umbraco.Core.IO; using Umbraco.Tests.TestHelpers; namespace Umbraco.Tests.Configurations @@ -26,13 +24,6 @@ namespace Umbraco.Tests.Configurations Current.IOHelper.Root = _root; } - [Ignore("fixme - ignored test")] - [Test] - public void Is_Version_From_Assembly_Correct() - { - Assert.That(Current.UmbracoVersion.SemanticVersion, Is.EqualTo("6.0.0")); - } - [TestCase("~/umbraco", "/", "umbraco")] [TestCase("~/umbraco", "/MyVirtualDir", "umbraco")] [TestCase("~/customPath", "/MyVirtualDir/", "custompath")] diff --git a/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs b/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs index 01c93a40ec..82ccd21b80 100644 --- a/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs +++ b/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs @@ -42,7 +42,7 @@ namespace Umbraco.Tests.Migrations upgrader.Execute(ScopeProvider, builder, Mock.Of(), logger); - var helper = new DatabaseSchemaCreator(scope.Database, logger); + var helper = new DatabaseSchemaCreator(scope.Database, logger, UmbracoVersion); var exists = helper.TableExists("umbracoUser"); Assert.IsTrue(exists); diff --git a/src/Umbraco.Tests/Migrations/MigrationPlanTests.cs b/src/Umbraco.Tests/Migrations/MigrationPlanTests.cs index ab065eb0a9..3241f78b62 100644 --- a/src/Umbraco.Tests/Migrations/MigrationPlanTests.cs +++ b/src/Umbraco.Tests/Migrations/MigrationPlanTests.cs @@ -12,6 +12,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; using Umbraco.Core.Services; +using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; namespace Umbraco.Tests.Migrations @@ -137,7 +138,7 @@ namespace Umbraco.Tests.Migrations [Test] public void ValidateUmbracoPlan() { - var plan = new UmbracoPlan(); + var plan = new UmbracoPlan(TestHelper.GetUmbracoVersion()); plan.Validate(); Console.WriteLine(plan.FinalState); Assert.IsFalse(plan.FinalState.IsNullOrWhiteSpace()); diff --git a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs index f2b97b521e..b101f9f7fe 100644 --- a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs @@ -42,6 +42,7 @@ namespace Umbraco.Tests.Packaging ServiceContext.FileService, ServiceContext.MacroService, ServiceContext.LocalizationService, IOHelper, Factory.GetInstance(), Logger, + UmbracoVersion, "createdPackages.config", //temp paths tempFolderPath: "~/" + _testBaseFolder + "/temp", diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs index 7ab9d2e28a..120ec6bc72 100644 --- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs +++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs @@ -7,6 +7,7 @@ using Moq; using NPoco; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; @@ -26,6 +27,7 @@ namespace Umbraco.Tests.Persistence private ILogger _logger; private SqlCeSyntaxProvider _sqlCeSyntaxProvider; private ISqlSyntaxProvider[] _sqlSyntaxProviders; + private IUmbracoVersion _umbracoVersion; [SetUp] public void Setup() @@ -34,6 +36,7 @@ namespace Umbraco.Tests.Persistence _sqlCeSyntaxProvider = new SqlCeSyntaxProvider(); _sqlSyntaxProviders = new[] { (ISqlSyntaxProvider) _sqlCeSyntaxProvider }; _logger = Mock.Of(); + _umbracoVersion = TestHelper.GetUmbracoVersion(); _databaseFactory = new UmbracoDatabaseFactory(_logger, new Lazy(() => Mock.Of()), TestHelper.GetConfigs()); } @@ -88,7 +91,7 @@ namespace Umbraco.Tests.Persistence using (var database = _databaseFactory.CreateDatabase()) using (var transaction = database.GetTransaction()) { - schemaHelper = new DatabaseSchemaCreator(database, _logger); + schemaHelper = new DatabaseSchemaCreator(database, _logger, _umbracoVersion); schemaHelper.InitializeDatabaseSchema(); transaction.Complete(); } diff --git a/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs b/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs index c7118dac79..99254edd77 100644 --- a/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs +++ b/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs @@ -22,7 +22,7 @@ namespace Umbraco.Tests.Persistence using (var scope = ScopeProvider.CreateScope()) { - var schema = new DatabaseSchemaCreator(scope.Database, Logger); + var schema = new DatabaseSchemaCreator(scope.Database, Logger, UmbracoVersion); result = schema.ValidateSchema( //TODO: When we remove the xml cache from tests we can remove this too DatabaseSchemaCreator.OrderedTables.Concat(new []{typeof(ContentXmlDto), typeof(PreviewXmlDto)})); diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs index 2afbdaca8f..660783c784 100644 --- a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs +++ b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs @@ -1,6 +1,7 @@ using Moq; using NPoco; using NUnit.Framework; +using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; @@ -20,7 +21,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -33,7 +34,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -47,7 +48,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -62,7 +63,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -76,7 +77,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -91,7 +92,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -105,7 +106,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -121,7 +122,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -137,7 +138,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -151,7 +152,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -164,7 +165,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -179,7 +180,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -193,7 +194,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -210,7 +211,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -226,7 +227,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -240,7 +241,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -253,7 +254,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -266,7 +267,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -279,7 +280,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -295,7 +296,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -312,7 +313,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -327,7 +328,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -344,7 +345,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -362,7 +363,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -379,7 +380,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -394,7 +395,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -409,20 +410,20 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); scope.Complete(); } } - + [Test] public void Can_Create_cmsTags_Table() { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -435,7 +436,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -456,7 +457,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); @@ -469,7 +470,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -483,7 +484,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -497,7 +498,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); @@ -512,7 +513,7 @@ namespace Umbraco.Tests.Persistence { using (var scope = ScopeProvider.CreateScope()) { - var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of()); + var helper = new DatabaseSchemaCreator(scope.Database, Mock.Of(), UmbracoVersion); helper.CreateTable(); helper.CreateTable(); diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs index ff691c478d..0869e35d51 100644 --- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs +++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs @@ -155,7 +155,7 @@ namespace Umbraco.Tests.Runtimes var scopeProvider = factory.GetInstance(); using (var scope = scopeProvider.CreateScope()) { - var creator = new DatabaseSchemaCreator(scope.Database, logger); + var creator = new DatabaseSchemaCreator(scope.Database, logger, umbracoVersion); creator.InitializeDatabaseSchema(); scope.Complete(); } diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index d06951d3be..1ad0ef63dc 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using Moq; @@ -23,7 +22,6 @@ using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers.Stubs; -using Umbraco.Web.Services; namespace Umbraco.Tests.TestHelpers { @@ -99,6 +97,7 @@ namespace Umbraco.Tests.TestHelpers IEventMessagesFactory eventMessagesFactory, UrlSegmentProviderCollection urlSegmentProviders, TypeLoader typeLoader, + IUmbracoVersion umbracoVersion, IFactory factory = null) { if (scopeProvider == null) throw new ArgumentNullException(nameof(scopeProvider)); @@ -176,9 +175,9 @@ namespace Umbraco.Tests.TestHelpers return new PackagingService( auditService.Value, new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value, ioHelper, - new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, "createdPackages.config"), + new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, umbracoVersion, "createdPackages.config"), new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value, ioHelper, - new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, "installedPackages.config"), + new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, umbracoVersion, "installedPackages.config"), new PackageInstallation( new PackageDataInstallation(logger, fileService.Value, macroService.Value, localizationService.Value, dataTypeService.Value, entityService.Value, contentTypeService.Value, contentService.Value, propertyEditorCollection, scopeProvider), new PackageFileInstallation(compiledPackageXmlParser, ioHelper, new ProfilingLogger(logger, new TestProfiler())), diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index 1defcec889..ac9ec48c6a 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -32,7 +32,6 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence.Repositories; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Tests.Testing.Objects.Accessors; -using Umbraco.Web.Cache; namespace Umbraco.Tests.TestHelpers { @@ -133,7 +132,7 @@ namespace Umbraco.Tests.TestHelpers // ensure the configuration matches the current version for tests var globalSettingsMock = Mock.Get(Factory.GetInstance()); //this will modify the IGlobalSettings instance stored in the container - globalSettingsMock.Setup(x => x.ConfigurationStatus).Returns(Current.UmbracoVersion.Current.ToString(3)); + globalSettingsMock.Setup(x => x.ConfigurationStatus).Returns(UmbracoVersion.Current.ToString(3)); using (ProfilingLogger.TraceDuration("Initialize database.")) { @@ -307,7 +306,7 @@ namespace Umbraco.Tests.TestHelpers { using (var scope = ScopeProvider.CreateScope()) { - var schemaHelper = new DatabaseSchemaCreator(scope.Database, Logger); + var schemaHelper = new DatabaseSchemaCreator(scope.Database, Logger, UmbracoVersion); //Create the umbraco database and its base data schemaHelper.InitializeDatabaseSchema(); diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 2652368819..072e2277b7 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -5309,12 +5309,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5329,17 +5331,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5456,7 +5461,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5468,6 +5474,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5482,6 +5489,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5489,12 +5497,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5513,6 +5523,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5593,7 +5604,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5605,6 +5617,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5726,6 +5739,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml index 2eca580097..f59e70e174 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml @@ -57,7 +57,7 @@ redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice") }); } - @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings) + @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion)