v1.1.1

Further MSI adjustments, added application icon.
snem1216 · Mar 2, 2020 · 2259bab · 2259bab
1 parent 9dc82b6
commit 2259bab
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 73 deletions.
diff --git a/SysInfo/MainWindow.xaml.cs b/SysInfo/MainWindow.xaml.cs
@@ -19,6 +19,7 @@
 using SysInfo_Lib;
 using System.Threading.Tasks;
 using System.Threading;
+using System.Diagnostics;
 
 namespace SysInfo
 {
@@ -32,6 +33,12 @@ public partial class MainWindow : Window
         //Dictionary<string, string> config
         public MainWindow()
         {
+            // Do not run multiple instances
+            if(System.Diagnostics.Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length != 1)
+            {
+                this.Close();
+            }
+
             InitializeComponent();
             //ScreenWrite(Environment.WorkingSet.ToString());
             if(config["RefreshInterval"] != "0")
@@ -46,10 +53,9 @@ public MainWindow()
                     refreshRate = int.Parse(CONFIG_LOADER.GetDefaultConfig()["RefreshInterval"]);
                 }
                 refreshRate *= 1000;
-                var task3 = new Task(() => IncRefresh(refreshRate),
+                var Refresh = new Task(() => IncRefresh(refreshRate),
                     TaskCreationOptions.LongRunning);
-                task3.Start();
-                Console.WriteLine("RR: " + refreshRate.ToString());
+                Refresh.Start();
             }
             WriteScreen(tb);
             ConfigAppearance();

diff --git a/SysInfo/Properties/AssemblyInfo.cs b/SysInfo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/SysInfo/SysInfo.csproj b/SysInfo/SysInfo.csproj
@@ -59,6 +59,9 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>SysInfo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -128,5 +131,8 @@
       <Name>SysInfo_Lib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="SysInfo.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/SysInfo/SysInfo.ico b/SysInfo/SysInfo.ico
diff --git a/SysInfo_Lib/Properties/AssemblyInfo.cs b/SysInfo_Lib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/SysInfo_Setup/MSI-Banner.png b/SysInfo_Setup/MSI-Banner.png