Transform define constants - doesn't handle DefineTrace and DefineDebug

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/VBToCSConversion.cs

@@ -58,6 +58,21 @@ public SyntaxNode GetSurroundedNode(IEnumerable<SyntaxNode> descendantNodes,
             };
         }
 
+        public string PostTransformProjectFile(string s)
+        {
+            // TODO Find API to, or parse project file sections to remove "<DefineDebug>true</DefineDebug>" + "<DefineTrace>true</DefineTrace>"
+            // Then add them to the define constants in the same section, or create one if necessary.
+
+            var defineConstantsStart = s.IndexOf("<DefineConstants>");
+            var defineConstantsEnd = s.IndexOf("</DefineConstants>");
+            if (defineConstantsStart == -1 || defineConstantsEnd == -1)
+                return s;
+
+            return s.Substring(0, defineConstantsStart) +
+                   s.Substring(defineConstantsStart, defineConstantsEnd - defineConstantsStart).Replace(",", ";") +
+                   s.Substring(defineConstantsEnd);
+        }
+
         public string TargetLanguage { get; } = LanguageNames.CSharp;
 
         public bool CanBeContainedByMethod(SyntaxNode node)

ICSharpCode.CodeConverter/ILanguageConversion.cs

@@ -23,5 +23,6 @@ SyntaxNode GetSurroundedNode(IEnumerable<SyntaxNode> descendantNodes,
         IEnumerable<(string, string)> GetProjectFileReplacementRegexes();
         string TargetLanguage { get; }
         void Initialize(Compilation convertedCompilation);
+        string PostTransformProjectFile(string s);
     }
 }

ICSharpCode.CodeConverter/Shared/SolutionConverter.cs

@@ -59,7 +59,7 @@ private IEnumerable<ConversionResult> ConvertProject(IEnumerable<(string, string
             var replacements = _projectReferenceReplacements.Concat(projectFileReplacementRegexes).ToArray();
             _progress.Report($"Converting {project.Name}, this may take a some time...");
             return ProjectConversion.ConvertProjectContents(project, _languageConversion).Concat(new[]
-                {ConversionResultFromReplacements(project.FilePath, replacements)}
+                {ConversionResultFromReplacements(project.FilePath, replacements, s => _languageConversion.PostTransformProjectFile(s))}
             );
         }
 
@@ -100,11 +100,12 @@ private ConversionResult ConvertSolutionFile()
             };
         }
 
-        private static ConversionResult ConversionResultFromReplacements(string filePath, IEnumerable<(string, string)> replacements)
+        private static ConversionResult ConversionResultFromReplacements(string filePath, IEnumerable<(string, string)> replacements, Func<string, string> postReplacementTransform = null)
         {
+            postReplacementTransform = postReplacementTransform ?? (s => s);
             var newProjectText = File.ReadAllText(filePath);
             newProjectText = ApplyReplacements(newProjectText, replacements);
-            return new ConversionResult(newProjectText) {SourcePathOrNull = filePath};
+            return new ConversionResult(postReplacementTransform(newProjectText)) {SourcePathOrNull = filePath};
         }
 
         private static string ApplyReplacements(string originalText, IEnumerable<(string, string)> replacements)

ICSharpCode.CodeConverter/VB/CSToVBConversion.cs

@@ -57,6 +57,19 @@ public SyntaxNode GetSurroundedNode(IEnumerable<SyntaxNode> descendantNodes,
                 (".cs<", ".vb<")
             };
         }
+        public string PostTransformProjectFile(string s)
+        {
+            var startTag = "<DefineConstants>";
+            var endTag = "</DefineConstants>";
+            var defineConstantsStart = s.IndexOf(startTag);
+            var defineConstantsEnd = s.IndexOf(endTag);
+            if (defineConstantsStart == -1 || defineConstantsEnd == -1)
+                return s;
+
+            return s.Substring(0, defineConstantsStart) +
+                   s.Substring(defineConstantsStart, defineConstantsEnd - defineConstantsStart).Replace(";", ",") +
+                   s.Substring(defineConstantsEnd);
+        }
 
         public string TargetLanguage { get; } = LanguageNames.VisualBasic;
 

TestData/CSToVBConversion/ConvertSingleProject/ConsoleApp2/CSharpConsoleApp.vbproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG,TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TestData/CSToVBConversion/ConvertSolution/ConsoleApp2/CSharpConsoleApp.vbproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG,TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>