From 626ba40e44362a470acfed13c30e2df58591fdc7 Mon Sep 17 00:00:00 2001 From: Martin Benjamins Date: Wed, 20 Feb 2019 16:26:27 +0100 Subject: [PATCH] C#: Always output to same filename as file thats being merged into --- code/C#/DBDefsMerge/Program.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/C#/DBDefsMerge/Program.cs b/code/C#/DBDefsMerge/Program.cs index bc1bcfe0eb..a47a2b5708 100644 --- a/code/C#/DBDefsMerge/Program.cs +++ b/code/C#/DBDefsMerge/Program.cs @@ -39,7 +39,8 @@ namespace DBDefsMerge if (firstDirFilesLC.Contains(file.ToLower())) { // Both directories have this file. Merge! - var firstFile = reader.Read(Path.Combine(firstDir, firstDirFiles.ElementAt(firstDirFilesLC.IndexOf(file.ToLower())))); + var firstFileName = Path.Combine(firstDir, firstDirFiles.ElementAt(firstDirFilesLC.IndexOf(file.ToLower()))); + var firstFile = reader.Read(firstFileName); var secondFile = reader.Read(Path.Combine(secondDir, file)); var newDefinition = firstFile; @@ -341,7 +342,7 @@ namespace DBDefsMerge } } - newDefinitions.Add(dbName, newDefinition); + newDefinitions.Add(Path.GetFileNameWithoutExtension(firstFileName), newDefinition); } else {