Export in progress

Author: Sébastien Geiser

RegexDialog/RegExToolDialog.xaml

@@ -78,8 +78,6 @@
                         <Image Source="{StaticResource VS}"  />
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="Export C# Code In A New Tab" >
-                </MenuItem>
                 <Separator />
                 <MenuItem Header="_Exit" Click="Exit_MenuItem_Click" >
                     <MenuItem.Icon>

RegexDialog/RegExToolDialog.xaml.cs

@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
@@ -2128,8 +2129,10 @@ private void ExportToVisualStudio_Click(object sender, RoutedEventArgs e)
                 string projectFile = Path.Combine(projectDirectory, $"{projectName}.csproj");
                 string entryFile = Path.Combine(projectDirectory, "Program.cs");
                 string replaceFile = Path.Combine(projectDirectory, "CSharpReplaceContainer.cs");
-                string textSourceFile = Path.Combine(projectDirectory, "TextSourceContainer.cs");
+                string csharpTextSourceFile = Path.Combine(projectDirectory, "TextSourceContainer.cs");
+                string textSourceFile = Path.Combine(projectDirectory, "TextSource.txt");
                 string projectGuid = Guid.NewGuid().ToString();
+                string resourcesForCsProj = string.Empty;
                 string options = regExOptionViewModelsList.Count(option => option.Selected) == 0
                     ? "RegexOptions.None"
                     : string.Join(" | ",
@@ -2145,6 +2148,33 @@ private void ExportToVisualStudio_Click(object sender, RoutedEventArgs e)
 
                 Directory.CreateDirectory(projectDirectory);
 
+                if (Config.Instance.CSharpReplaceMode)
+                {
+                    File.WriteAllText(replaceFile, ReplaceScriptForMatch);
+                }
+
+                // Write text source as specific cs file if in CSharpScript
+                if (Config.Instance.TextSourceOn == RegexTextSource.CSharpScript)
+                {
+                    File.WriteAllText(csharpTextSourceFile, CSharpTextSourceScript);
+                }
+                // Write text source as text file in resources
+                else
+                {
+                    File.WriteAllText(textSourceFile, GetCurrentText());
+                    resourcesForCsProj += Res.TextSourceAsResourceInCsProj;
+                }
+
+                // Write Entry file
+                if (!File.Exists(entryFile)
+                    || MessageBox.Show($"The entry file \"{entryFile}\" already exists.\r\nDo you want to override it ?",
+                        "Entry file override",
+                        MessageBoxButton.YesNo,
+                        MessageBoxImage.Question) == MessageBoxResult.Yes)
+                {
+                    File.WriteAllText(entryFile, programCode);
+                }
+
                 // Write solution file
                 if (!File.Exists(projectFile)
                     || MessageBox.Show($"The solution file \"{solutionFile}\" already exists.\r\nDo you want to override it ?",
@@ -2167,27 +2197,8 @@ private void ExportToVisualStudio_Click(object sender, RoutedEventArgs e)
                         MessageBoxButton.YesNo,
                         MessageBoxImage.Question) == MessageBoxResult.Yes)
                 {
-                    File.WriteAllText(projectFile, Res.VSProject);
-                }
-
-                if (Config.Instance.CSharpReplaceMode)
-                {
-                    File.WriteAllText(replaceFile, ReplaceScriptForMatch);
-                }
-
-                if (Config.Instance.TextSourceOn == RegexTextSource.CSharpScript)
-                {
-                    File.WriteAllText(textSourceFile, CSharpTextSourceScript);
-                }
-
-                // Write Entry file
-                if (!File.Exists(entryFile)
-                    || MessageBox.Show($"The entry file \"{entryFile}\" already exists.\r\nDo you want to override it ?",
-                        "Entry file override",
-                        MessageBoxButton.YesNo,
-                        MessageBoxImage.Question) == MessageBoxResult.Yes)
-                {
-                    File.WriteAllText(entryFile, programCode);
+                    File.WriteAllText(projectFile, Res.VSProject
+                        .Replace("<!-- Resources -->", resourcesForCsProj));
                 }
 
                 Process.Start($"\"{solutionFile}\"");

RegexDialog/RegexDialog.csproj

@@ -412,6 +412,9 @@
   <ItemGroup>
     <Resource Include="Resources\VSProject.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TextSourceAsResourceInCsProj.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

RegexDialog/Res.Designer.cs

@@ -133,6 +133,9 @@
   <data name="Replace_syntax_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\replace_syntax_color.xshd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
+  <data name="TextSourceAsResourceInCsProj" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\textsourceasresourceincsproj.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="TextSourceContainer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\textsourcecontainer.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>

RegexDialog/Res.resx

@@ -0,0 +1,3 @@
+  <ItemGroup>
+    <Resource Include="TextSource.txt" />
+  </ItemGroup>

RegexDialog/Resources/TextSourceAsResourceInCsProj.txt

@@ -5,4 +5,5 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
+<!-- Resources -->
 </Project>