Index: Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs =================================================================== diff -u -r53d1a3d576928ca4a63208f5838a2eec6e5732d2 -raa12af0eac754d1d32412e8c3b5fd780fe32b8e4 --- Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs (.../RingtoetsMigrationToolTest.cs) (revision 53d1a3d576928ca4a63208f5838a2eec6e5732d2) +++ Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs (.../RingtoetsMigrationToolTest.cs) (revision aa12af0eac754d1d32412e8c3b5fd780fe32b8e4) @@ -227,26 +227,28 @@ string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, "Demo164.rtd"); string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, Path.GetRandomFileName()); - string consoleText; - using (var consoleOutput = new ConsoleOutput()) + using (new FileDisposeHelper(targetFilePath)) { - // Event - RingtoetsMigrationTool.Main(new[] + string consoleText; + using (var consoleOutput = new ConsoleOutput()) { - migrateCommand, - sourceFilePath, - newVersion, - targetFilePath - }); + // Event + RingtoetsMigrationTool.Main(new[] + { + migrateCommand, + sourceFilePath, + newVersion, + targetFilePath + }); - consoleText = consoleOutput.GetConsoleOutput(); - } + consoleText = consoleOutput.GetConsoleOutput(); + } - // Result - Assert.AreEqual(string.Empty, consoleText); - var toVersionedFile = new VersionedFile(targetFilePath); - Assert.AreEqual(newVersion, toVersionedFile.GetVersion()); - using (new FileDisposeHelper(targetFilePath)) {} + // Result + Assert.AreEqual(string.Empty, consoleText); + var toVersionedFile = new VersionedFile(targetFilePath); + Assert.AreEqual(newVersion, toVersionedFile.GetVersion()); + } Assert.AreEqual(0, environmentControl.ErrorCodeCalled); } Index: Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs =================================================================== diff -u -r24fff72c73f0e43ad9f9fcf3a616ab0f8f96e077 -raa12af0eac754d1d32412e8c3b5fd780fe32b8e4 --- Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs (.../VersionedFileMigrator.cs) (revision 24fff72c73f0e43ad9f9fcf3a616ab0f8f96e077) +++ Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs (.../VersionedFileMigrator.cs) (revision aa12af0eac754d1d32412e8c3b5fd780fe32b8e4) @@ -109,7 +109,8 @@ { try { - File.Move(upgradedVersionFile.Location, newFileLocation); + File.Copy(upgradedVersionFile.Location, newFileLocation, true); + File.Delete(upgradedVersionFile.Location); } catch (IOException exception) { Index: Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs =================================================================== diff -u -r53d1a3d576928ca4a63208f5838a2eec6e5732d2 -raa12af0eac754d1d32412e8c3b5fd780fe32b8e4 --- Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs (.../VersionedFileMigratorTest.cs) (revision 53d1a3d576928ca4a63208f5838a2eec6e5732d2) +++ Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs (.../VersionedFileMigratorTest.cs) (revision aa12af0eac754d1d32412e8c3b5fd780fe32b8e4) @@ -114,18 +114,15 @@ string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, Path.GetRandomFileName()); var migrator = new VersionedFileMigrator(); - // Call - migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); - - // Assert - if (!File.Exists(targetFilePath)) + using (new FileDisposeHelper(targetFilePath)) { - Assert.Fail($"File was not created at location '{targetFilePath}'"); - } + // Call + migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); - var toVersionedFile = new VersionedFile(targetFilePath); - Assert.AreEqual(newVersion, toVersionedFile.GetVersion()); - using (new FileDisposeHelper(targetFilePath)) {} + // Assert + var toVersionedFile = new VersionedFile(targetFilePath); + Assert.AreEqual(newVersion, toVersionedFile.GetVersion()); + } } [Test]