Index: Core/Common/src/Core.Common.Version/GlobalAssembly.cs.template =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Core/Common/src/Core.Common.Version/GlobalAssembly.cs.template (.../GlobalAssembly.cs.template) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Core/Common/src/Core.Common.Version/GlobalAssembly.cs.template (.../GlobalAssembly.cs.template) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -35,9 +35,9 @@ [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] -[assembly: AssemblyVersion("18.1.1.1")] -[assembly: AssemblyFileVersion("18.1.1.1")] +[assembly: AssemblyVersion("18.2.1.1")] +[assembly: AssemblyFileVersion("18.2.1.1")] #if DEVELOPMENT -[assembly: AssemblyInformationalVersion("18.1.1.GITHASH")] +[assembly: AssemblyInformationalVersion("18.2.1.GITHASH")] #endif \ No newline at end of file Index: Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs (.../AssemblyUtilsTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs (.../AssemblyUtilsTest.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -74,7 +74,7 @@ Assert.IsEmpty(assemblyInfo.Description); Assert.AreEqual("Core.Common.Util.Test", assemblyInfo.Product); Assert.AreEqual("Core.Common.Util.Test", assemblyInfo.Title); - StringAssert.StartsWith("18.1.1.", assemblyInfo.Version); + StringAssert.StartsWith("18.2.1.", assemblyInfo.Version); } [Test] Index: Ringtoets/Common/src/Ringtoets.Common.Util/RingtoetsVersionHelper.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Common/src/Ringtoets.Common.Util/RingtoetsVersionHelper.cs (.../RingtoetsVersionHelper.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Common/src/Ringtoets.Common.Util/RingtoetsVersionHelper.cs (.../RingtoetsVersionHelper.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -30,7 +30,7 @@ public static class RingtoetsVersionHelper { private const string validDatabaseVersion = "5"; - private const string currentDatabaseVersion = "18.1"; + private const string currentDatabaseVersion = "18.2"; /// /// Gets the current database version. Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/RingtoetsVersionHelperTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Common/test/Ringtoets.Common.Util.Test/RingtoetsVersionHelperTest.cs (.../RingtoetsVersionHelperTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/RingtoetsVersionHelperTest.cs (.../RingtoetsVersionHelperTest.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -29,18 +29,18 @@ public class RingtoetsVersionHelperTest { [Test] - public void GetCurrentDatabaseversion_ReturnsExpectedValue() + public void GetCurrentDatabaseVersion_ReturnsExpectedValue() { // Call string currentVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion(); // Assert - Assert.AreEqual("18.1", currentVersion); + Assert.AreEqual("18.2", currentVersion); } [Test] [TestCase("9000.0")] - [TestCase("18.2")] + [TestCase("18.3")] public void IsNewerThanCurrentString_NewerVersion_ReturnsTrue(string newerVersion) { // Call @@ -65,7 +65,7 @@ [Test] [TestCase("5")] - [TestCase("17.3")] + [TestCase("18.1")] public void IsNewerThanCurrentString_OlderVersion_ReturnsFalse(string olderVersion) { // Call @@ -139,7 +139,8 @@ new TestCaseData("17.1"), new TestCaseData("17.2"), new TestCaseData("17.3"), - new TestCaseData("18.1") + new TestCaseData("18.1"), + new TestCaseData("18.2") }; } Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs (.../RingtoetsSqLiteDatabaseFileMigratorTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs (.../RingtoetsSqLiteDatabaseFileMigratorTest.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -73,7 +73,7 @@ [Test] [TestCase("16.4")] - [TestCase("18.1")] + [TestCase("18.2")] public void IsVersionSupported_UnsupportedVersion_ReturnsFalse(string fromVersion) { // Setup Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs (.../RingtoetsProjectMigrationTestHelperTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil.Test/RingtoetsProjectMigrationTestHelperTest.cs (.../RingtoetsProjectMigrationTestHelperTest.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -95,7 +95,8 @@ "5", "17.1", "17.2", - "17.3" + "17.3", + "18.1" }; CollectionAssert.AreEqual(expectedProjectVersions, returnedProjectVersions); } Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs (.../RingtoetsProjectMigrationTestHelper.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Migration/test/Ringtoets.Migration.Core.TestUtil/RingtoetsProjectMigrationTestHelper.cs (.../RingtoetsProjectMigrationTestHelper.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -71,6 +71,7 @@ yield return "171"; yield return "172"; yield return "173"; + yield return "181"; } /// Index: Ringtoets/Migration/test/Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b --- Ringtoets/Migration/test/Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs (.../RingtoetsProjectMigratorTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Migration/test/Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs (.../RingtoetsProjectMigratorTest.cs) (revision 984647b7cc3bf9a0be50eb5e4a6a1b952a1e9d8b) @@ -517,6 +517,8 @@ migrationLog.AppendLine(" + Toetsspoor: 'Duinafslag'"); migrationLog.AppendLine(" - Alle resultaten voor de gedetailleerde toets van dit toetsspoor konden niet worden omgezet naar een geldig resultaat en zijn verwijderd."); migrationLog.AppendLine(" - Alle resultaten voor de toets op maat van dit toetsspoor konden niet worden omgezet naar een geldig resultaat en zijn verwijderd."); + migrationLog.AppendLine("Gevolgen van de migratie van versie 18.1 naar versie 18.2:"); + migrationLog.AppendLine("* Geen aanpassingen."); Tuple[] expectedLogMessagesAndLevel = {