more work on the compiler

glcjr · Mar 12, 2018 · e3aacb8 · e3aacb8
1 parent db7a2d4
commit e3aacb8
Show file tree

Hide file tree

Showing 28 changed files with 219 additions and 58 deletions.
diff --git a/WIXSharpProjectFile/bin/Release/netstandard2.0/WIXSharpHelper.dll b/WIXSharpProjectFile/bin/Release/netstandard2.0/WIXSharpHelper.dll
diff --git a/WIXSharpProjectFile/bin/Release/netstandard2.0/WIXSharpHelper.pdb b/WIXSharpProjectFile/bin/Release/netstandard2.0/WIXSharpHelper.pdb
diff --git a/WixSharpScriptBuilder/bin/Release/netstandard2.0/WIXSharpHelper.dll b/WixSharpScriptBuilder/bin/Release/netstandard2.0/WIXSharpHelper.dll
diff --git a/WixSharpScriptBuilder/bin/Release/netstandard2.0/WIXSharpHelper.pdb b/WixSharpScriptBuilder/bin/Release/netstandard2.0/WIXSharpHelper.pdb
diff --git a/WixSharpScriptBuilder/bin/Release/netstandard2.0/WixSharpScriptBuilder.dll b/WixSharpScriptBuilder/bin/Release/netstandard2.0/WixSharpScriptBuilder.dll
diff --git a/WixSharpScriptBuilder/bin/Release/netstandard2.0/WixSharpScriptBuilder.pdb b/WixSharpScriptBuilder/bin/Release/netstandard2.0/WixSharpScriptBuilder.pdb
diff --git a/Wixard/GUIInterface.cs b/Wixard/GUIInterface.cs
@@ -1730,6 +1730,14 @@ private void Setupworkingdirectory()
             {
                 if (!Directory.Exists(Workingdir))
                     Directory.CreateDirectory(Workingdir);
+
+            }
+            catch
+            { }
+            try
+            {
+                foreach (var f in wixsharplist)
+                    File.Copy(f, $@"{Workingdir}\{f.Remove(0, f.LastIndexOf("\\") + 1)}");
             }
             catch
             { }
@@ -1815,12 +1823,7 @@ private string GetSystemWindowsForms()
         {
             string path = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
             path += @"\Reference Assemblies\Microsoft\Framework\.NETFramework\";
-            string ver = "v"+string.Format("{0}.{1}.{2}", Environment.Version.Major, Environment.Version.MajorRevision, Environment.Version.Build);           
-            string checkpath = path + ver + @"\System.Windows.Forms.dll";
-            if (File.Exists(checkpath))
-                return checkpath;
-            else
-            {
+
                 string[] directories = Directory.GetDirectories(path);
                 foreach (var d in directories)
                 {
@@ -1829,11 +1832,16 @@ private string GetSystemWindowsForms()
                         string test = d + @"\System.Windows.Forms.dll";
                         if (File.Exists(test))
                         {
+                            try
+                            {
+                                File.Copy(test, $@"{Workingdir}\System.Windows.Forms.dll");
+                            }
+                            catch
+                            { }
                             return test;
                         }
                     }
-                }
-            }
+                }            
             return "";
         }
         //private bool triedassemblydirectly = false;
@@ -1877,6 +1885,18 @@ private void Cleanup(string file)
             }
             catch
             { }
+            try
+            {
+                try
+                {
+                    foreach (var f in wixsharplist)
+                        File.Delete($@"{Workingdir}\{f.Remove(0, f.LastIndexOf("\\") + 1)}");
+                }
+                catch
+                { }
+            }
+            catch
+            { }
         }
 
         #endregion
@@ -1908,6 +1928,10 @@ public void Save(string file)
             Filename = file;
             Saved = true;
         }
+        private void sayhello()
+        {
+            MessageBox.Show("Say Hello");
+        }
         #endregion
     }
 }
diff --git a/Wixard/bin/Release/CustomAction.config b/Wixard/bin/Release/CustomAction.config
diff --git a/Wixard/bin/Release/WIXSharpHelper.dll b/Wixard/bin/Release/WIXSharpHelper.dll
diff --git a/Wixard/bin/Release/WIXSharpHelper.pdb b/Wixard/bin/Release/WIXSharpHelper.pdb
diff --git a/Wixard/bin/Release/WixSharp.CA.dll b/Wixard/bin/Release/WixSharp.CA.dll
diff --git a/Wixard/bin/Release/WixSharpScriptBuilder.dll b/Wixard/bin/Release/WixSharpScriptBuilder.dll
diff --git a/Wixard/bin/Release/WixSharpScriptBuilder.pdb b/Wixard/bin/Release/WixSharpScriptBuilder.pdb
diff --git a/Wixard/bin/Release/Wixard.application b/Wixard/bin/Release/Wixard.application
@@ -7,14 +7,14 @@
     <framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="Wixard.exe.manifest" size="37696">
+    <dependentAssembly dependencyType="install" codebase="Wixard.exe.manifest" size="37697">
       <assemblyIdentity name="Wixard.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>cLi8KGqaNDPRuKc8m94bZJDriSqSdRXeHxFBPf+sNX4=</dsig:DigestValue>
+        <dsig:DigestValue>FsN11vbPUMeJMnP3NL8Nm9OC4uDUc+3rE/WtDNNXMj0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Wixard/bin/Release/Wixard.exe b/Wixard/bin/Release/Wixard.exe
diff --git a/Wixard/bin/Release/Wixard.exe.manifest b/Wixard/bin/Release/Wixard.exe.manifest
@@ -3,7 +3,7 @@
   <asmv1:assemblyIdentity name="Wixard.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="Wixard" version="1.0.6644.42380" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="Wixard" version="1.0.6645.25742" language="neutral" processorArchitecture="msil" />
     <commandLine file="Wixard.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -575,26 +575,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Wixard.exe" size="653760">
-      <assemblyIdentity name="Wixard" version="1.0.6644.42380" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Wixard.exe" size="1611712">
+      <assemblyIdentity name="Wixard" version="1.0.6645.25742" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>TsqAjuJ471Y7sORtCzob+6SS1yJVTtXJHiZQN2gXOCg=</dsig:DigestValue>
+        <dsig:DigestValue>oetGg+ldfIB1DJLtrKZ3F9DG9g1eh2w/X5C3/rgqMBo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WIXSharpHelper.dll" size="52224">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WIXSharpHelper.dll" size="52736">
       <assemblyIdentity name="WIXSharpHelper" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>fkcH28v3yjqxT402WIOGXErTNQLXTTOuo5a8htZt4so=</dsig:DigestValue>
+        <dsig:DigestValue>hRct7MiljPYVo/F6C/K/M8VOoCEHAE+GkF6Dt0NasUE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -606,7 +606,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>UbeFriQMUlSPH6f+xmjpiBLOK6NViGvvXclmzZlwSK4=</dsig:DigestValue>
+        <dsig:DigestValue>AWFdhEByv7bSfHQupKpYq7Cy7hKsQgrcuiahNfLnS48=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/Wixard/bin/Release/Wixard.pdb b/Wixard/bin/Release/Wixard.pdb
diff --git a/Wixard/obj/Release/MainWindow.baml b/Wixard/obj/Release/MainWindow.baml
diff --git a/Wixard/obj/Release/MainWindow.g.cs b/Wixard/obj/Release/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "221FFBA71132302F84EA87FA997E9D1E359E35FD"
+#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EA676A1F603DA6C7103DF427BF72622ADA5F4EB2"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -1134,31 +1134,63 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
         #line hidden
 
 
-        #line 1292 "..\..\MainWindow.xaml"
+        #line 1301 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid AboutGrid;
+        internal System.Windows.Controls.Button btnEditorCopy;
+
+        #line default
+        #line hidden
+
+
+        #line 1306 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnEditorPaste;
+
+        #line default
+        #line hidden
+
+
+        #line 1311 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnEditorCut;
 
         #line default
         #line hidden
 
 
         #line 1316 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnEditorSelectAll;
+
+        #line default
+        #line hidden
+
+
+        #line 1324 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Grid AboutGrid;
+
+        #line default
+        #line hidden
+
+
+        #line 1348 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label lblVersion;
 
         #line default
         #line hidden
 
 
-        #line 1325 "..\..\MainWindow.xaml"
+        #line 1357 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnGithub;
 
         #line default
         #line hidden
 
 
-        #line 1328 "..\..\MainWindow.xaml"
+        #line 1360 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnDonate;
 
@@ -2052,26 +2084,68 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             return;
             case 139:
             this.textEditor = ((ICSharpCode.AvalonEdit.TextEditor)(target));
+
+            #line 1288 "..\..\MainWindow.xaml"
+            this.textEditor.MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.textEditor_MouseRightButtonDown);
+
+            #line default
+            #line hidden
             return;
             case 140:
-            this.AboutGrid = ((System.Windows.Controls.Grid)(target));
+            this.btnEditorCopy = ((System.Windows.Controls.Button)(target));
+
+            #line 1301 "..\..\MainWindow.xaml"
+            this.btnEditorCopy.Click += new System.Windows.RoutedEventHandler(this.btnEditorCopy_Click);
+
+            #line default
+            #line hidden
             return;
             case 141:
-            this.lblVersion = ((System.Windows.Controls.Label)(target));
+            this.btnEditorPaste = ((System.Windows.Controls.Button)(target));
+
+            #line 1306 "..\..\MainWindow.xaml"
+            this.btnEditorPaste.Click += new System.Windows.RoutedEventHandler(this.btnEditorPaste_Click);
+
+            #line default
+            #line hidden
             return;
             case 142:
+            this.btnEditorCut = ((System.Windows.Controls.Button)(target));
+
+            #line 1311 "..\..\MainWindow.xaml"
+            this.btnEditorCut.Click += new System.Windows.RoutedEventHandler(this.btnEditorCut_Click);
+
+            #line default
+            #line hidden
+            return;
+            case 143:
+            this.btnEditorSelectAll = ((System.Windows.Controls.Button)(target));
+
+            #line 1316 "..\..\MainWindow.xaml"
+            this.btnEditorSelectAll.Click += new System.Windows.RoutedEventHandler(this.btnEditorSelectAll_Click);
+
+            #line default
+            #line hidden
+            return;
+            case 144:
+            this.AboutGrid = ((System.Windows.Controls.Grid)(target));
+            return;
+            case 145:
+            this.lblVersion = ((System.Windows.Controls.Label)(target));
+            return;
+            case 146:
             this.btnGithub = ((System.Windows.Controls.Button)(target));
 
-            #line 1325 "..\..\MainWindow.xaml"
+            #line 1357 "..\..\MainWindow.xaml"
             this.btnGithub.Click += new System.Windows.RoutedEventHandler(this.btnGithub_Click);
 
             #line default
             #line hidden
             return;
-            case 143:
+            case 147:
             this.btnDonate = ((System.Windows.Controls.Button)(target));
 
-            #line 1328 "..\..\MainWindow.xaml"
+            #line 1360 "..\..\MainWindow.xaml"
             this.btnDonate.Click += new System.Windows.RoutedEventHandler(this.btnDonate_Click);
 
             #line default