cleared templating

niilopoutanen · Nov 11, 2022 · d77dde7 · d77dde7
1 parent b5fcd1c
commit d77dde7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 34 deletions.
diff --git a/Package installer/Package installer/App.xaml.cs b/Package installer/Package installer/App.xaml.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace Package_installer
 {

diff --git a/Package installer/Package installer/FileManager.cs b/Package installer/Package installer/FileManager.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Linq;
-using System.IO;
+using IWshRuntimeLibrary;
+using System;
 using System.ComponentModel;
-using System.IO.Compression;
-using IWshRuntimeLibrary;
 using System.Diagnostics;
-using Package_installer.Properties;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
 
 namespace Package_installer
 {
@@ -18,7 +17,7 @@ internal class FileManager
         public readonly static string productName = "Template";
         readonly string productDescription = "Template for app installer";
         public readonly static float appVersion = 0.1f;
-        readonly string exeName = "Template.exe";
+        readonly string exeName = "template.exe";
 
 
         readonly string tempfile = Path.GetTempPath() + "\\temp.zip";
@@ -28,7 +27,7 @@ internal class FileManager
         public void StartInstall(object sender, DoWorkEventArgs e)
         {
             Stream stream = new MemoryStream(Package_installer.Properties.Resources.package);
-            if(stream.Length == 0)
+            if (stream.Length == 0)
             {
                 throw new FileLoadException("Package corrupted");
             }

diff --git a/Package installer/Package installer/MainWindow.xaml.cs b/Package installer/Package installer/MainWindow.xaml.cs
@@ -1,22 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Package_installer
 {
@@ -108,7 +96,7 @@ private void StartProgress()
             Storyboard.SetTargetProperty(fadein, new PropertyPath(OpacityProperty));
             storyboard.Completed += delegate
             {
-                
+
             };
             storyboard.Begin();
 

diff --git a/Package installer/Package installer/Package installer.csproj b/Package installer/Package installer/Package installer.csproj
@@ -18,6 +18,7 @@
     <None Remove="Resources\installer-icon.png" />
     <None Remove="Resources\intermedium.ttf" />
     <None Remove="Resources\intersemibold.ttf" />
+    <None Remove="Resources\package.zip" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,6 +37,12 @@
     <Content Include="Resources\installer-icon-ico.ico" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\package.zip">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Resources\icon.png" />
     <Resource Include="Resources\installer-icon.png" />
@@ -58,10 +65,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Resources\package.zip">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/Package installer/Package installer/Resources/package.zip b/Package installer/Package installer/Resources/package.zip